gentoo resync : 13.01.2018

2069 files changed, 22110 insertions, 20983 deletions

diff --git a/Manifest b/Manifest
index 283ea0c8ad66..b232591ac92f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28847 BLAKE2B ed413033ebd167e58dd6b676144b94b928391fdc86ef88f6b3be64919c7419b3bedceab4c73335f4165e4eb49d308375c601759469b74b78897a5a416bf0ff2d SHA512 770b3c0ae27f69454c26dd3736913db4f7217825be8f2a8dfef477174c2908664d71433a5e2667fdf98f680d2fa88f62430c56bd378d2d0175c4166bb682655b
-TIMESTAMP 2018-01-11T08:09:32Z
+MANIFEST Manifest.files.gz 28802 BLAKE2B 2513cdb86b9f8f739c9a0b8e6150330df6f74754b488a7bbfcf0bb167b9f6c84ece7959b809456b9959da2a22c06325c1e6d3cc94e2bd0215d4a7e880311e4f0 SHA512 a30c94922408f7a3850878e5fd8036da975a33e05f70f818c524973c406511382c3256e1f2ff22fbaf36066ee9ccb027edff4955e5570d121e7ad8e7e30a1f0d
+TIMESTAMP 2018-01-13T05:38:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpXG7xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpZm3JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAvoRAAnyrOPQE9x2hzRmwPyB2iOu9wrxAbVbEKhrZI/UhPc2NW4fZtY+cOBXsr
-qqum9Xlg20cf7nqZ/zDymoxj0NCd2nMiUwFL2s/SCuz9dUJl3W9w2RKsBE+9i4d+
-56cPMSQiARBkMPlumNEE5UCxc60LzLHjaeE0Hl0yyCz9LkXi67VbaKdrT9Lvlwmh
-0DsefllZRSpx1WCith1Z61YGMgPg1nr9IJyLSelvj5/fOHeG/z9o4xOR79BgP+as
-SEdbO2pf0OmwyII2xW8TMc0xAMsWq85E16xiTW2euZM3wdc0iy2xIpqNteJiYfSP
-YIzOTgl1r8GFO8/SWKxdBhJQmyPsp9x2sqSTPLlq1UAv73IH+pR0x1Te8HSR5TCP
-UW4TkPex1d/ZCgg/kg7oynX2z65MutbdYeFJs+IBzrD4C8aeGfHMlR9p4TdFLIWN
-8HwN1W3VVtH1jeKMhat6Y4Fvyhn4kJxJNLEx4fBQ8/jBpQ75kfRGqkv6Wx+CjMSv
-YMzSBgVFQa2LxTfiECCvyBqtbL9iz0Lk6UUBIi+uA7IGwLHylgGnNUkVji2c+vOS
-QbMJTkpmqrnQh9I6eNQ9BJfJjLGcrybOHIV6iBon/cDSLBaXeDJhIAhcws31ETr0
-Nw0m1Uav6QWhEyxA3qwcxy0J6LcOAIT9Y7pmQ2sZEgIeyCh/v+k=
-=YAfo
+klDGjxAAtnnPZx+XrbXmyKDd0IHkBfVeo4UsFZYEjsLbb9YoXTYOPaCjyg+iZqdt
+4/3X3kqRoj36znF8rZy8UNClhky2uo3iVUcVdtiGZwdzB1Qsiqs/30NRBSBjgrNp
+w3U21QHECyuI2E9lD1HOcsNIB84qDFISklipt4UxRdaeFHqXKinjNbzUxL3cdzCH
+Q2Hvw0Kk6iB+Kfp6reFVTKlN0bxOOnscrMLFkH+N22IUAGUoPEfacucRblEaIEIp
+nmGeJfhxUzMbfzPF/g6cyhQFUDx7nrDLCFj7RnwlagNnPHwgnLRCpqlqA4b6ZkzQ
+g60W9p5jvZbdVZfl5dsjJRQeHzs1uVt3h2dOxMA7f927rpRKvAZS8A6feVjZSqZX
+3SVdZ2mUr7Yoluzql8hJFeBXUqxJUe/IAqaGKOS9FXpyDEwNbbkKhUKSDjX4Q4/N
+dF21EA20Sxw38NNeuz6uGeQ9T6xgDiI0e8HXmZTOMAlsGJh4sQq4fJqsAeWx8ABB
+nF27SYZeZoveCVJ5Qz1h6IHj+YGiwvd8OwZQMNADTmFyVJPEV/pUm1F9EyMxiJbG
+mhOrPK4I17lQoa4rSakX2hDQG18xvGYcRjwDqvCXfoHP6t/8ioQ444XPTGwWeGZZ
+gpQhrZuNoPWbLj+PcM4obfSbHExxNlpKeB8U0kVtxJI4r+q9WYM=
+=68kw
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 11a33e7f689a..2ba9e85ecce4 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index fba90632d127..52f40d3ba774 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 946b1ed300c6..e0d3551a9fd9 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -2,6 +2,6 @@ AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45d
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
 DIST KeePass-2.37-Source.zip 5080663 BLAKE2B bf74c93eb732d607fe87dc29d3e429b37f1052b258e980127ce1f687423a790bfe298f06c1c459888c60b066a45053447fbaed730e3d38cd6b6dd48d53fbdc34 SHA512 d094793a3216181ae375fb1343a809a20c358786bdf369c0171e5b7ca17a74bada314875cf410d84efaa4fa2b13e199de9be3c60f5f4e2c189241e4fffec8ad8
 DIST KeePass-2.38-Source.zip 5091900 BLAKE2B 22e3f7046984204a3e0c4a1c6d8303661048bc0fee4bcdb7999b521d0ed6e5463d89044d2897cfec0c932349cc80a7b43d4c8dfbceb4f2e88041c642e0c0d231 SHA512 42fa7274874d4858da360a6772eb25adbf3a6dafe375093459d9a25903d8c159360ea722e969fe8b330bccf62ee5d381e131bd0ba075445932d8019eee19bf20
-EBUILD keepass-2.37.ebuild 3036 BLAKE2B a1abedf46c4471659192b6b0aea80799ecc5318230305ca3a50721907a5366a2b5c52c5f6ec4ca4f08fdafe091bc648ac10f3099632238daee9dee619429ae57 SHA512 d4320aae524fe146ece9b319d5e94382197012e3f38f18a7213c5b6b82ff4d68f0bb36a1eb57cb978c7d6ce04339cefdb4e751127c53d470ed27c086e8389174
-EBUILD keepass-2.38.ebuild 3038 BLAKE2B 4c2c5cd80283d80b0ece5cfc8cb44703c9cae8c0677864d48a8c39816c26c5d4821157ef6625901dccb307195b9fa06e36a7c5dfdbad1bfb053b0abcc3143b0c SHA512 ea268f6f27b0d224de6bcbc002f0006702fe8cf30ba4e4d50a6c2d66ba4dbbdcf689232705662683dd620639a76201757e6bcd71e5069ed716767bc31167ed2f
+EBUILD keepass-2.37.ebuild 3037 BLAKE2B 3fe5b971d8336ffdc3f9b520ac3c4530cdee3555c3e20cf7658ddb6fc874b28d1ee5710d76de2282128e83c84f05b5b2435db657e9be278ce4ed7ea107b6829a SHA512 f2f473c7fcde5e11711c3519c72ad78f2853ac6e7c242da2be9aa34e74e8d7962e2416e48a827b5a6d6e9b6f91314b426e662cbdc2e01e9c2d8e9331120f10a7
+EBUILD keepass-2.38.ebuild 3039 BLAKE2B 56adc392b5ef836fa8fbc8a13632fa74ae2d02e71e1da37b8c0d07aff1e77c7240d14517a11de6fb5a75dec4b03a9c58518bea03ad63178bccf777731f708d14 SHA512 9291806ddc3129b52b3b3107cdc9d94aff9a258ea3d2a6a8e0d2103f66231a70ef47a9b6a6ec646bc017cc8ae8edd7d387998ff5617ceefa53a9b3d602397316
 MISC metadata.xml 791 BLAKE2B 5372f9ae70aaca07a660beeddb0a6a07f8fcc2f7a5d0d66ac4ed6b05a1f4ee0e21f14a29b2b3adf548e91d6187ec2ccf8047b307aaef03ec3d3a6936b0120d60 SHA512 fb4fe73e3a2f4d36f36ecae7b9c13dc48db967cced94f0741bd6a2ae91d2a1d502ef9d2c9ace534c866268829d430f91a79f1e7ead89d03cbdfd4a94b89df861
diff --git a/app-admin/keepass/keepass-2.37.ebuild b/app-admin/keepass/keepass-2.37.ebuild
index 6f098aaf79a0..4b997c59a7eb 100644
--- a/app-admin/keepass/keepass-2.37.ebuild
+++ b/app-admin/keepass/keepass-2.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils gnome2-utils xdg-utils
 
 MY_PN="KeePass"
 DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="http://keepass.info/"
+HOMEPAGE="https://keepass.info/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
diff --git a/app-admin/keepass/keepass-2.38.ebuild b/app-admin/keepass/keepass-2.38.ebuild
index 03c01b537dff..741800f82fde 100644
--- a/app-admin/keepass/keepass-2.38.ebuild
+++ b/app-admin/keepass/keepass-2.38.ebuild
@@ -7,7 +7,7 @@ inherit eutils gnome2-utils xdg-utils
 
 MY_PN="KeePass"
 DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="http://keepass.info/"
+HOMEPAGE="https://keepass.info/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index cfd751d31b52..51092101d2b0 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -4,5 +4,5 @@ AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac6
 AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-3-r2.ebuild 1488 BLAKE2B 5240b4290bc4df6738312a9c0474ca114b658fc9c55e371dd69c4ce1b680293d3d92899a7aa39a7dfd35db5eb583365fa539f75f203b912000b542dccd1ecbc3 SHA512 c116056aa22037bbfd20d6e53e55b60972821ebec8f0693dfbce8f928401a2cadac3dee4a2520527348b5d7c4174d2cd9e8937306e4a1550fa74d571d0e6e607
+EBUILD metalog-3-r2.ebuild 1483 BLAKE2B d5f308a9cc2f07a33e808b289eada00b20f60588f58572e78a5c23e406dc6965a8e86cffb846ccfa0774475051231d27b894d81e996143cc4afa60c65a1a7be1 SHA512 94dc6013f6bfc417353e76005e66e972bd7f837e56a444ed4dd72b0e6a49822659a5e92a22414666e99825071b2056be9c1a04dadb45ca0d6a9dcea55dddb2dd
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index 4988c910ee2e..657afdf1224f 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 5f3294eb28cd..5331976d303d 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -6,7 +6,7 @@ DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983eb
 DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
 DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
 DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
-DIST mongo-tools-3.6.1.tar.gz 4693844 BLAKE2B 1c6a600abf41a32cbac37cbcef540957e39b6e4574413ecedacdafc761e62b7bb45c285db985bbae01936fddbde0e8d10aa16cd512bd28ae3b60d072ac18b09e SHA512 15a073e92281b515d16c778ef3f540939dfaeaeb92afb303899ea3a7bbecd2782efa0ba05b9ed271660e9000c6108c05a28e2dec826880867c625d06ac65a0be
+DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
 EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
 EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
 EBUILD mongo-tools-3.2.12.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
@@ -14,5 +14,5 @@ EBUILD mongo-tools-3.2.13.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8
 EBUILD mongo-tools-3.2.16.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.17.ebuild 1222 BLAKE2B 9fa9d1407e44dfd3b41f13b828aed85dc7174e6c84634312000065ef0c8c8537005e6b76ee6028df02258333ccf13f7b87d713c96f35798ce9ce072de0ed87dc SHA512 fc34ecd308d0c22832afa41b51f1cfcc2fdd447e7c0269ca434ea01057b3d99366636fb94c86be7336a58f27ff69fd7427f2b15dc62965709fc656a2fc7594a1
 EBUILD mongo-tools-3.4.10.ebuild 1238 BLAKE2B cefa920eea7240d51bf726c4717c7400556e76e63534566825625a842373a72a80e0a843f92574964199710fbc2c1b4522e52bdbc9bd1324288570aa318aac86 SHA512 c37664f0902b8a763181af85dbc2e20a0f2e0d63610fb83cb7f75fe3892b7ef265c2be8341635e052aa723de741872c5dc880672f8b3d1216e7ea5917e1cb13e
-EBUILD mongo-tools-3.6.1.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
+EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
index f8c4a23a746a..f8c4a23a746a 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
index 18fc58d38375..db018bec5d46 100644
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@@ -1,3 +1,5 @@
 DIST PackageKit-Qt-0.9.6.tar.xz 43288 BLAKE2B 7f00595ae91163346b1bd5b80da0f243388cb9a5ff64520a2574b96b3e6f240bc270b1083d24d4075960474d55720736c47cb84033d26f2ae5fce3ab6f062a23 SHA512 67d025e4e5b9860ec188518c11b3941b9a26cf9dce65665ea56307731721dac57dbb4e8726eb253f9fb39022aa3d0b0c7b9765532fa12b014fe9357028ece8aa
+DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4
 EBUILD packagekit-qt-0.9.6.ebuild 600 BLAKE2B 08678d739d7dcfc84ed766939393c14121248c9533bc80d327081060b0c5aa0f0fbe912090036aed39d754652ddb6544e0c6e31944e78cf0de248d4a7ed07816 SHA512 314156c2fea244321fe3e4dec1e3d4e85654562865ebea6932b8ce559a7e31c485ef6a1719faae0dfc4651dd9cc6998151c936bc2e36f447f79a38f4b96f747f
-MISC metadata.xml 553 BLAKE2B 12ad6e2e51c465df9a59056676d7cd8cecc303250446b6735e8714983adc03af92665494cbabad37b56758aaae8098b4e94cd2dc3501ab656ee4ac45703f6faa SHA512 e015748fdf05964d1aec529b5be35ecd8c24f495bb334b3b8fbe8ea5119e327e430769ab71972db1c6958706d2021663af18d95d701af6cf5f114b95edf6f487
+EBUILD packagekit-qt-1.0.0.ebuild 573 BLAKE2B 00cfe9c488622ff84ef1dd979ef3c0475105a86348eca5d72ff862ef8c5fcee233b78a8f037a55e3b2e4c03d9a900619cacdfc33c5ef9766f1684567752db719 SHA512 73cbce3de7c9f7cef8ab4e08dcb1b70bd7f01ae79609caa9606ac42ac3de7aa3c8ddd67ab0464ad3302ccd3bf4e669248188ace3c5eefc70a786e011ae17f544
+MISC metadata.xml 639 BLAKE2B c2e5c7f55db2799af90ce6d5ab185cce6684b04d5c1e4bccb3d43364c5e66cb473efba10be1d0112b8e0fab0e0ce42c07133d5e8836c5e2f68f6fa5dd406bab4 SHA512 eee84ab696e063e425c3f17c2ea4b205e30d7fe549d54e4e69dca4e0b9630df5ed991090f52dbc55912cfa7ba22702aecd9522f2c817619b101070fa583691f3
diff --git a/app-admin/packagekit-qt/metadata.xml b/app-admin/packagekit-qt/metadata.xml
index 42bda2de62d9..5db9ab8a16e7 100644
--- a/app-admin/packagekit-qt/metadata.xml
+++ b/app-admin/packagekit-qt/metadata.xml
@@ -15,4 +15,7 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hughsie/PackageKit-Qt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
new file mode 100644
index 000000000000..eabede432017
--- /dev/null
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+inherit cmake-utils
+
+DESCRIPTION="Qt PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-admin/packagekit-base-0.9
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index b0abcd05c66c..92c00fde9da5 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,6 +7,7 @@ AUX 8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
 AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 BLAKE2B b8a7d1ccb3854f91a676b57332d4a944f5c781b82451b2d36f19e4237226da44cb41fc220260b1fd8bb2b46b62cbb81a4d392a1f116d31d50224ca781bb3b10f SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc
 AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4
 AUX 8-stable/rsyslog-8.30.0-fix-kerberos.patch 736 BLAKE2B fb404b5435d861934c70677baec2c552ba576c989996431650df1f55d1a172d9e78fda6d74fc59c32c918a43affc4dec991a8e2808d41bc37f898ae7bdd08615 SHA512 8d72cad0106afdf953ce0cf8a5dd0ecfb7daf63c3e274c26e3283ac486de1fc4ce10a450019f1a11f067d320d299dc2b350e4cd5eda283c3b514864e924465a9
+AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch 2348 BLAKE2B ba570065c25253ead7e0a166fa897a9df38dc1f7030f00da2bb59105ed65c3a591fc6fd34286ce73e24b6b97698fd21acdf3cd5362f512206f85056349c780fe SHA512 19c4b36cde7fe3be3b98efd1a9dce34516c84349ac5c23d21394e1b0486f8e140fac3f7c0aa4627615657d6f030855d34e6f71c865dd228d80470330edf2dca9
 AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
@@ -20,6 +21,7 @@ DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d8
 DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
 DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
 DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
+DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
@@ -29,6 +31,7 @@ DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bb
 DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
 DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
 DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
+DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
 EBUILD rsyslog-8.19.0.ebuild 12240 BLAKE2B c5de14a1f8dd0b12bb2e2b90707d86647766fcb3df54bc1a8c7428781248a5a1617b57990953037c3e6c8bc24751cc245e7a6faae520571a0fbef40b30828ce0 SHA512 7363c435c65394abda4a4f576e8433d8038a6e420534f3bb0419477ab3b4e3ab179f53bae016b372522884ac12eab467d3ece7db15303b3cc33d954f963fda8b
 EBUILD rsyslog-8.24.0-r2.ebuild 12396 BLAKE2B 0c0456e8d54b24a02e0d07e0672f81156afce8deff1094e9644bcc3dcee3aab0bd7c43ea70957504308563bb51419c9a24436fff36a1be450e1e0078ec23d739 SHA512 2acbc370ca468dcfc021b66a31b2617dc5093b518c5c486487e306548445c1bb472dd48458a3171a99f1bc82276bed39ccaff5be31603191d261d11c2cd521c9
 EBUILD rsyslog-8.25.0-r2.ebuild 12487 BLAKE2B 3e2715a63afe272a18b172ac7d67d2ad738d18d3c6f469cbc8642e4f75a5679f627f1dd768fb7301e1a37be4434f8f51fb1709217a5165dff99fbe218b3d84f5 SHA512 1a73a37139e8af1017f7cc53bbd35238130cfa30a7e3236f304a4d079931d0304fbde4f026254a951253c4060bcb6e774b6643f42ad14ef431b697833450f521
@@ -38,4 +41,5 @@ EBUILD rsyslog-8.28.0.ebuild 12504 BLAKE2B 7fbd8ed2298fce7926f40963571d4b38c03a3
 EBUILD rsyslog-8.29.0.ebuild 12527 BLAKE2B c992fcb0783af6c15d89f8455ff47dc11248f5245b1a682f62b468150d814c672715d853acf31d3f551cb8c97dec1a02f9a676737033fe3e128d39a4b7412d71 SHA512 8f7593cca44eaa50929e03978dd9f066cc73aa9f725ce36585d274da925e0cc9a6a8791ab199c38b496e857335b8359c8cf19cc9ea3fae2ced4267ae69b05ef8
 EBUILD rsyslog-8.30.0.ebuild 12518 BLAKE2B d50e7a8dbeb492e8339d2b6f6fc237554059db89b0b9593bfc34111d1ffbef1cc518282f0b1b3c90dd04828fba7639dffab49c50e2ba779b4e4009886d5a2ce1 SHA512 aade46a36a893585f63d11a6030f6ad1ec0529e6cd79650ed96278a1a12f943d1710a1c853bcf54d528cff34dc8a706ab6d69823cab861f8a5c3f2f58b8f588f
 EBUILD rsyslog-8.31.0.ebuild 12565 BLAKE2B 29ca871aa60781bacec26e4809b8b3710958120011a5b3c7f31867c992faaab2f6b66707e013e855563e875104bb7e9fb93dac60836903c1a2f031600f2083fc SHA512 cb044ac578f29e7332191af95113882b2973870e37994b216eeb54b816e05cb42dae6e492c53b18d54dcac7425f6228aa1ac805f267dd6bf4fa344019c2b121f
-MISC metadata.xml 3335 BLAKE2B 329673f518b01762c932716aa569de4c2e0521000d8b9fa122b0ce659f31640316c126732043b11bf4a8f11e981810f7cf4f335b119ce5bedf508edf99f46e9b SHA512 bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1
+EBUILD rsyslog-8.32.0-r1.ebuild 12705 BLAKE2B eb7ef755e3bfda708d4f6668ad187b92fab410dc9d12781f64ab4cccd3af0c3a9caeb8081f3debd9a27f7c7db7f4df7d3f2c87b311123d438e369bb82933aba5 SHA512 60d7b0c6801502f6bd4e6def6f737226626c1eac04c12d7d7961bfa31da4b88786a62e5e1cd2088966c3033ca6c980cba62e66c1428b47b80926e9182e1223c1
+MISC metadata.xml 3397 BLAKE2B 368cc15a6a51952b0aeed7314e0d8cf4be6a82f0bb5275f87f09b8707353543d26d839be016e7ae9523e8594e2ddf85f2f26e36ce2332b95131729f4da959a90 SHA512 8d5f78dafe981b3874fe60a54d3f041ab163e3e94a5f3ceb943bfe075e55dbdc260aa2dd035c7d241708f21b8f8f1f9d268ffd65538b0fc5b36c43a59f5a0f27
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
new file mode 100644
index 000000000000..2706b4b581a0
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
@@ -0,0 +1,90 @@
+https://github.com/rsyslog/rsyslog/pull/2378
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then
+ 	)
+ fi
+ 
++AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes")
++
+ # klog
+ AC_ARG_ENABLE(klog,
+         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
+--- a/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -1935,6 +1935,7 @@ done:
+ 	return(estr);
+ }
+ 
++#ifdef HAVE_LIBCURL
+ /* curl callback for doFunc_http_request */
+ static size_t
+ curlResult(void *ptr, size_t size, size_t nmemb, void *userdata)
+@@ -2010,6 +2011,7 @@ finalize_it:
+ 	}
+ 	RETiRet;
+ }
++#endif
+ 
+ static int ATTR_NONNULL(1,3,4)
+ doFunc_is_time(const char *__restrict__ const str,
+@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
+ 		if(bMustFree2) free(str2);
+ 		break;
+ 	case CNFFUNC_HTTP_REQUEST:
++#ifdef HAVE_LIBCURL
+ 		cnfexprEval(func->expr[0], &r[0], usrptr, pWti);
+ 		str = (char*) var2CString(&r[0], &bMustFree);
+ 		doFunc_http_request(func, ret, str);
+ 		if(bMustFree) free(str);
+ 		varFreeMembers(&r[0]);
++#else
++		LogError(0, RS_RET_INTERNAL_ERROR,
++			"rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support");
++#endif
+ 		break;
+ 	default:
+ 		if(Debug) {
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -226,7 +226,6 @@ TESTS +=  \
+ 	rscript_contains.sh \
+ 	rscript_bare_var_root.sh \
+ 	rscript_bare_var_root-empty.sh \
+-	rscript_http_request.sh \
+ 	rscript_ipv42num.sh \
+ 	rscript_field.sh \
+ 	rscript_stop.sh \
+@@ -305,7 +304,11 @@ TESTS +=  \
+ 	lookup_table_rscript_reload.sh \
+ 	lookup_table_rscript_reload_without_stub.sh \
+ 	multiple_lookup_tables.sh
+-endif
++if ENABLE_LIBCURL
++TESTS +=  \
++	rscript_http_request.sh
++endif # ENABLE_LIBCURL
++endif # ENABLE_TESTBENCH2
+ 
+ if HAVE_VALGRIND
+ TESTS +=  \
+@@ -313,7 +316,6 @@ TESTS +=  \
+ 	mmexternal-InvldProg-vg.sh \
+ 	internal-errmsg-memleak-vg.sh \
+ 	rscript_set_memleak-vg.sh \
+-	rscript_http_request-vg.sh \
+ 	no-parser-vg.sh \
+ 	discard-rptdmsg-vg.sh \
+ 	discard-allmark-vg.sh \
+@@ -338,6 +340,10 @@ TESTS +=  \
+ 	multiple_lookup_tables-vg.sh \
+ 	fac_local0-vg.sh \
+ 	rscript_trim-vg.sh
++if ENABLE_LIBCURL
++TESTS +=  \
++	rscript_http_request-vg.sh
++endif # ENABLE_LIBCURL
+ endif # HAVE_VALGRIND
+ 
+ if ENABLE_ROOT_TESTS
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 855ee265e268..2b738f08d63d 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -4,9 +4,9 @@
 	<maintainer type="person">
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
-		<description>Primary Maintainer</description>
 	</maintainer>
 	<use>
+		<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
new file mode 100644
index 000000000000..3dc7a42ded17
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	fi
+
+	SRC_URI="
+		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r1.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/mysql )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		$(use_enable curl libcurl)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 859d567f3957..1bc02e624930 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,7 +1,7 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
 DIST sudo-1.8.22b3.tar.gz 3021539 BLAKE2B 8e6c207fe2e56e76b46040ce7a468089a1ecdbc02c1fc514926c2b129c1d7869d307be79d8567d42d38eb2a3df9abae0864a14954fb8da4fb880f9fc223ad9f7 SHA512 e80c7a0f10aaacfb875503e35b7f16c8fe5c019848338e6d8a4c354a42f5613a23713a12ec7a5ceba78bc428223c3d9ccfc285703f8cd04d0c34658d4a21f45e
-EBUILD sudo-1.8.20_p2.ebuild 5753 BLAKE2B 4c8b048a045082c5d6218d3e0a5d39e5017da924b5cab5d05f3e1b0cfeea64c9bc315d5f0217f58f37e7889e04fb311c122fe0f6cd8399f6fa078458cfafe9f3 SHA512 dac3f07f7c4a6ad493535fa9a753424ff9bd03777cc4330eb5575cf7c0a862b5b2c60e5229a9634e80dd001f8498b4effd5c3ef5b33b4e9723d919657162904e
+EBUILD sudo-1.8.20_p2.ebuild 5749 BLAKE2B 123169c823e490ae3a5f1dbf43521bc3603cf34488e4a5bd87ed02a2e816de3555a8c58aa3ec52fb83230ab3e32f4da8220a0c8cdba4ff81bd149e64f5b2b7f9 SHA512 89c82af30974c8f44abb6a01a01ce31309c9c0d5d8d47ce67160e91d05e4bdda7fdc3d82c5171fe994f00faff3c51f65f7909972e8017a403adf0451f3d935a3
 EBUILD sudo-1.8.21_p2.ebuild 5819 BLAKE2B f41a745952896b5b3a6b1cd07808af308402db5cc7405fa040f205755e333fdddd0f6195b664c4db630fad8d011e9e613bae08c3bb955a819a5ba454c5d29612 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0
 EBUILD sudo-1.8.22_beta3.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
 EBUILD sudo-9999.ebuild 5959 BLAKE2B 5b11f68280f6ce261b9579101726164a38c9bf68e67a1df47562ea356dbe68a80e10d30af1332092731c59e7f33bb0df6ac8731970dff2b200e080c0904ab98c SHA512 ea1939a94dda5eb85ba5bcb963c76c54da6ca0f5eb8785964cfcf700391049b57d18a6397556d9213f988d3d7292dd9a6c76d2531fef2c6e319c63e2b26cc33c
diff --git a/app-admin/sudo/sudo-1.8.20_p2.ebuild b/app-admin/sudo/sudo-1.8.20_p2.ebuild
index 621ff50e219c..08ea19d2a3bf 100644
--- a/app-admin/sudo/sudo-1.8.20_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.20_p2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://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 ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl selinux skey +sendmail"
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 20b03e9bf5eb..f36c832ad2d6 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -22,7 +22,7 @@ AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e
 DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
-EBUILD syslog-ng-3.12.1.ebuild 4392 BLAKE2B 34e8dc5ea99bf60d155229ae71938efd748f2e2003b03351d42fa8f2f42783a99c26176f6274451b58553cffb5dca1b31a7ea6b38d49f827a1adb43738c7247d SHA512 1658ad695798f020a24c571a0f924bfdae14528adb3b85f189669887350144102855daf042f4c4440b79049faee3f6989ac054c816e2ae11701db71139fbd1ed
-EBUILD syslog-ng-3.13.2.ebuild 4914 BLAKE2B 066accdc2db5ed70aa505ec415e84ec3a60a1db16918b010c011eec59d363f95ab7b296b5f95f2db7452174ec2481a2ed23d7540b31466e2e342ffbd8cdd05b1 SHA512 863f48b1c0940193a718bf5bd52c6ca6e55ed239034a7ed7942aea86affe5172465c62968b8a4b69199c2c60e6554352ab2426c65da004e30dc4e15eb7a8c098
+EBUILD syslog-ng-3.12.1.ebuild 4376 BLAKE2B 2d746d6733b9da5cc81684254743769c5c769fed298c852d71e8a5cc8b51380a90fd4e43f88c9fa236e7189dde850266cf244fac30a7df04650ac0d38918ec78 SHA512 f110f4d7f66cc910c845490e7f61aa094a83ff95d8d886d3a807eb1bc9ccb20fc3c6cf0ef335ffa7d08ed673918edf30362f964cd349516074b14f26438a52e2
+EBUILD syslog-ng-3.13.2.ebuild 4898 BLAKE2B 73b03f440f3b1c30dae4c8edb3ae4f7468df0d9098ea470e90f469586cebcfd4727aa62ccc0a5c72ce72aff1e874821f6f5466e2478551125601b8fa136fda4e SHA512 7a8821b3cad5c8e4c72e1342e290d425bf7c5c6cc2442e4f84d2bac01d653962813b87071a2408badfb6e53cc92430075335a9341da78ce8b19fcdbff0cf4b10
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
-MISC metadata.xml 880 BLAKE2B 9b7990fb5e4a4e373237b06d8468e958d98a60f52cba20d4018e1e0d39272525d503bf60206d8361798921e9c1da6b2fc8427ecf309cf2cdb8d2a39cdcd2da72 SHA512 84c16673492dbd6157c8f71810aa1377adce2855374485b1de57069f8516ba73893904b9ac22beb636eb9d04c7b3fcc49eebe7de9b219dfe8939f3f41136eb96
+MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index 90774e400b05..42f30628ff47 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="amqp">Enable support for AMQP destinations</flag>
 		<flag name="http">Enable support for HTTP destinations</flag>
diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
index b608df786967..4dd8f23a9bfc 100644
--- a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools python-single-r1 eutils multilib systemd versionator
 
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index ddb99e5c2c89..fc965332d85e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools python-single-r1 eutils multilib systemd versionator
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 537e50ef194e..1b507d7eacc2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 62e58d738dbf..561442d8c7c6 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,5 @@
 AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757055dfb07b37f4933eacaf78973e14a7a861b0e7eb43a1980e889ee7c6988926fae9c31af90f962f502f17be416f6 SHA512 5da97caa16a910aebd4ce85e0805809dd97b6f36cd71636c72f284e6550bcff1a5f614a902d5363c35be2b46e8986dc74beb93f3fc6158a29f719e49d68a83c0
 DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
-EBUILD brotli-1.0.2.ebuild 1408 BLAKE2B 784683bdd78e8dc69ad30b56af0fec90a3894eee1541150b43c4c42f3496d9a0870027cfc0a6e4d2f07de71c72ec31925e3123c29fcfa0fe863a9190f528ccd5 SHA512 0e92fcd3b5c1d920eeb03d7e1330e8aaf1e868f6eec471154ca0836d6489469a3c733c6c8fd6de928a9e6fea56f7aa28aed84a34a2da6d358713b4e01ecc0dc7
+EBUILD brotli-1.0.2.ebuild 1420 BLAKE2B d928c16e36c1183cd42f9e5a6b375e61931d429fbad02d43e9007abd32d2e5f5933492a726878ca35bf6c6aedc15c788644c0addcf94de87d1f3f02fe2a0bdc4 SHA512 f7d429e82d077820840451c47054357abd348cdc309e8ba7bb34590672451fdd62947e57e4675709dc59faf2c2f92b61ac6f19b1e57e1fb5ef6cec1f1a0d2ce3
 EBUILD brotli-9999.ebuild 1336 BLAKE2B 920c9159f284dcbf0246e52d28048aad22c4803c0950a101093afeabf45bc7b109216ac8bd54676a27ec579cfa49e4ed791cb944c7a9d4ce9e376e85f22cdebc SHA512 2686041468cf95c7dafa9571c6c4997f5ddc9440593e35f6d8526af7df8a2cd249af9e5b0ddf04a272cc8f6497db5de77c628641d2867e47cce6b099e3b187af
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild
index 6b6d09ddf192..fbd8dea6a1aa 100644
--- a/app-arch/brotli/brotli-1.0.2.ebuild
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
-	KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 3addf3306eb8..14d1cc0432ca 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -4,9 +4,11 @@ DIST zstd-1.1.3.tar.gz 845902 BLAKE2B f8896d467c255dd0dfd348aee0d8b8a13b1551ee0e
 DIST zstd-1.2.0.tar.gz 1300584 BLAKE2B 3bde619cde6a6cf6ea83c86ba8ad2c7aa0cfecbf606aec0695ae809f438712fc0114d8a245deaf153faf130564d31522a15d1fef96357c5a90728b963399e4de SHA512 b21910c6bdcfad3199c07b9f70f7c049062ebd1cce9249dd33c36153e29f24dd9e796ddbc2f37846b9f508c14b0d0f67651fd8d2bdce558128f20bdfff50a7df
 DIST zstd-1.3.0.tar.gz 1469911 BLAKE2B c62e467c1ba2b6a13aca79f939bf0c63e25eb1168ba3b8908720cad245f2f61e39c214edecaafa6201af4f9c8d1875d24f08b8aa6df6f42ba083dce7cc2e94c0 SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30
 DIST zstd-1.3.2.tar.gz 1618939 BLAKE2B 1bb8c9ac0a521230e1507380afd5346e9cbd5b850c9a6516ef2fcf3e339e90ad1dc6adda13b7eb2d75630a788903ed12732a41fde065601ad879cca36c677125 SHA512 e2848d08b38d2fe98cd327611044bdac2f948547124321c8d63d5bdc2e6694d623c40c7bcc7d499fa83531f9cb92ddcb8be67614a49f855a9103f0ee6af0985c
+DIST zstd-1.3.3.tar.gz 1857232 BLAKE2B 45b737b8798fa6982b22163553e38fbe77143d5562032a8f5f5593225ea07fee277b27c06c00670196b59030a4919d819d562bf9e1e185aadc755d0563b251bb SHA512 72b63f96f65ca987cdc82c24354f7665c7dc3b2563cb0646f355c34bf8f090d8a0759729f8beaba8317272bdab34749f934055707b25cfd69c98a9fdcfbc59ae
 EBUILD zstd-1.1.0.ebuild 928 BLAKE2B 7ede914553f0b418dbaebcca524d85215edd2a9786f22915493561f0a75b2c170539c8f9217276cc32b8e855622e37eb0809aede8e8ab75a2b34df8e6271c7c9 SHA512 46c64fe1cbdbb0d4cc6233517253e7ea9d098b7ae355aa93fd972f9b10fb07fb7ad19b6dd7bb1bcba36c24c3be4fc3ed14d06f96ab547f428d60f5115bc0d971
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
 EBUILD zstd-1.2.0.ebuild 911 BLAKE2B 1d05c3c40bd2508433ff818a7b53bdce10bbc2567660ca5a45228a661836b0a5662610a50afc33803d75d070bb0ad0871a26e6b586d73db9b438c7fbee22d73f SHA512 1df5717823ff075a56edc7ddd0d5c43087226560720cf48fdcd6084f4ba5ac2ae215865a9cb69549b61785ef78f689b9b7c15f934d4d29b9dce40f20ed8f3ae0
 EBUILD zstd-1.3.0.ebuild 1246 BLAKE2B 79cbdd3c8eeb485eebeabe7864f2a7815e1f7587ba656bc63c2679b4a4d4671f62696484dce5eba875f40974fa232bac3a37ce95e01b04048e0caa2bcd68154f SHA512 ae39d6c828fd7a3f1a9473a9028f5656bc5914aa0b1a149305ba13718e0482c12fe2f710bca4cbe73a746d9cab5cef2afcab327fe95cadeacbd699bbb32d6027
 EBUILD zstd-1.3.2.ebuild 1263 BLAKE2B 3b16a1041f9885888ed72705f1b60980cb7c1cda8f602d4766c15c21d73e647b4c71c800755ffca72bc67766e82cbcd316fb53cdb9a07aebc1481d2f212c2830 SHA512 ebd70dc0ca1b6448c0eab4946ff07d4db3913142fe25c3f9b1d3d3066860e272a355bbb540910b0fa71a2141ba96cc8540dbcce070ffc212294d3824c6257fc0
+EBUILD zstd-1.3.3.ebuild 1265 BLAKE2B e9da8358390dd7b4adca3b888a41df1b9fac29921808d95c9c48e39573f442061099f85ae7afd4a690bb4ca9f9f26bcd6e8616239433b8843cd56ca0e58cd2d7 SHA512 7ebaf93981548ea4dae08d69b316cb47a44a8580ecfb5c01dc6b23987cfb9c929e2b30a72e69033bfaa7c10b8e0ad96f59b01cb2c2756b2e8f60c5e687f8bb24
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.3.3.ebuild b/app-arch/zstd/zstd-1.3.3.ebuild
new file mode 100644
index 000000000000..6ecde2a7ad62
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+	emake -C contrib/pzstd \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	emake -C contrib/pzstd \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5ce7b72d7208..080ef986b9e0 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 1c3463436e8b..3911cc8290f9 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,11 +1,11 @@
 AUX fix_libressl_check.patch 1623 BLAKE2B da42629b930ecb956f8cc48b60ccbf4fe2f250cbd66a6cc93e0bf88bbd634c3d7bb8be40f1c9f19d011aadebc5cba60f3ca6fcbbaf2a7312d7daaa0e56e9c302 SHA512 0d834c62623e312b37e5908dbe6738efc726ae036bb7576cd25cb88156519dee17e35711ae4d583aeb4ea17e7220ff3210334c78d1e314fa0b972025250194fd
 AUX gtk_not_required_4_2.patch 3247 BLAKE2B d96e525bb14de06231e9bf5f124c52bf7db21ebef272d20356e7160940a168e35db241fb2ecbe97e49a550c455dfe8827d80f151934e8a3c6a4e27d0385aab3c SHA512 32e2da278c1fc8fdaf479a575daf65a1a3ed49475568556fba91cdca081b39fe6e7533f98aba4774f7eb00a04911fec3cf55fb2a75c57465d992801d3a4ee11f
 AUX gtk_not_required_4_2_5.patch 3495 BLAKE2B fa99e1ad8695795dd1c8d1a1fc0041fa7138d82fee98d98ef359141dc03d18cbeeaae4f1ad151f19b15ed1de37c387aeadcb3d69b6f79791a650e243faf2710d SHA512 9c5e1b614bb4230b67e1c11fed3693c1aae0b982ca7c5a26678ee6af7da48d0ef2eef479335d498ea5f75408a2a957763a611367aa39585c50ed2556aa09232b
-DIST eid-mw-4.2.0.tar.gz 8508064 BLAKE2B bccca84b2ec08e4237816f61c0f2416325f4c34c66756f87c72208f5b79ebafffe91062f9fd3109562f0150793c1b849a5b57bd08533fbf4a8d0e78441131435 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f SHA512 bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
-EBUILD eid-mw-4.2.0.ebuild 2490 BLAKE2B 0ab93c439d494ff10765ad22bf5ea3e81a6d6999ecd3ed8b70dd5a6dc8088181edcb6324e4344b3191fc39292926f5b0db6289f1de7e2ce6bf9ca55f1cd0b74a SHA512 77e4b91adaae7953444ad2d6ec196978d29c06261ff0ab0a29eba330986adfb77e11fc48e826b3e35b928b60e46d24f93f1907692f80573a22b1e57c14ecbf5e
+DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c SHA512 336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
 EBUILD eid-mw-4.2.5.ebuild 2492 BLAKE2B 0db010e2fd0b62aac2d65baa55c3d83f1e4e2f59ddf7905f6b0ffb199c345c94119161d15947637439479b274e859d5e21e926ccb1745bcb37b1f554a489ad0f SHA512 6b8c30204dccfed98dcbd77d914503691579788b86d45803a8c43b18c77a3aea71cb41f320db344cb054d3ea02b11d356d59199f79d1b38ff303c054693c041a
 EBUILD eid-mw-4.2.8.ebuild 2433 BLAKE2B e0aeb4a498db7c2cc7c4644506a4f1dba21ce1c459f7ed1f0ad698927a437e7284cde130e26539b12e1ede36785b749280f38ba0ee89ca80a62e7001580dbac7 SHA512 b1157739db92af6d0b69fd373104578e4e40b13713e37f24600113fcb6ad710e151450a1207c4a18b7c1dfaaccb4317171d2fc1ea02c4b3042a37adc9a0ca589
-EBUILD eid-mw-9999.ebuild 2386 BLAKE2B 84563d7efffcda2b6d9eb7d4cce5ae1c9110f294413bcde7bb9ae6715d7cacde275ecb7e3f5acc32f9a17d74f25be19ffd8e254f82401a535bd11a7b7ab81b0f SHA512 5874bbc8ada17f8e0e6a5a48e9af15c56274fcc544fddb9ca3180bda83f72b0931309f12be6faa8ed670baf14b40d518a5b7d3b45ffa6df6e95dd426cfad90c9
+EBUILD eid-mw-4.3.6.ebuild 2386 BLAKE2B fabacdb4f311a8772f59a3475ad77df9ebe17ab741d5edeffb4ff25d6525cf302b98dbd47d2334d4e88c055e5d88fd0e3d8663d0b94483326c33ed2014f00256 SHA512 e8076f40b1a448d375287f9532aa2ce76783e72666272971c0b83e3f2aee2c826b9f15d4d67813a440137d5a6a1022dc942061459a1df37d5051a16e87efc402
+EBUILD eid-mw-9999.ebuild 2510 BLAKE2B 225ad487b6b273c71c6d1e2696c91b297655b3ed673a64840eea24e65cb702438c852fef822a5146609e1c587268daeb8e189f60bda9e5f0bcc87457b43e530f SHA512 6c936aff892d9e25ca4d0aef462a446599e63663a033c82b703a7f0c1ae5f4bd2205c74681923589964fc5bb51b3ad6b09d4a81b3e5831697115238ac7582cf1
 MISC metadata.xml 1464 BLAKE2B 6f179b170658fc6b084e4ef8c6a89443b1dc39307b9d52083214d75fdb386ec3c3c9f0a6522e6a52eb6c33c792216db27115f017eff6ad922254d1ffcb671c0b SHA512 ed78298a9b246f9f8f9591dbb9fe54ab311d525db86166bcf66574c9e365f1476234d5bac3180226dfbdb5c4014dd5dae4598b670cd7c6c9538282940a0fa9eb
diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
deleted file mode 100644
index 3ca653162f92..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools mozextension
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
-	${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="https://eid.belgium.be"
-
-IUSE="+dialogs +gtk p11-kit +xpi"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? (
-		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:*
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		!app-misc/eid-viewer-bin
-	)
-	>=sys-apps/pcsc-lite-1.2.9
-	p11-kit? ( app-crypt/p11-kit )
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-
-	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# hardcoded lsb_info
-	sed -i \
-		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
-		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
-		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
-		plugins_tools/aboutmw/gtk/about-main.c || die
-
-	if [[ ${PV} == "9999" ]] ; then
-		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
-	else
-		use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11-kit p11kit) \
-		--with-gnu-ld \
-		--disable-static \
-		--disable-signed
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
-	use gtk || rm -r "${D}/usr/include/eid-util" || die
-}
-
-pkg_postinst()
-{
-	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
-}
diff --git a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
new file mode 100644
index 000000000000..b75d2070e209
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools mozextension gnome2-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	default
+
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	else
+		rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+	fi
+	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use gtk; then
+		rm -r "${ED}/usr/include/eid-util" || die
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 4b7c9eadb75d..2b7c0eb2f88f 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools mozextension multilib
+inherit autotools mozextension gnome2-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
 else
-	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
-	${P}.tar.gz"
+	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="~x86 ~amd64 ~arm"
 fi
 
-SLOT="0"
-LICENSE="LGPL-3"
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
 HOMEPAGE="https://eid.belgium.be"
 
+LICENSE="LGPL-3"
+SLOT="0"
 IUSE="+dialogs +gtk p11-kit +xpi"
 
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? (
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
 		x11-libs/gdk-pixbuf[jpeg]
 		x11-libs/gtk+:*
 		dev-libs/libxml2
@@ -34,7 +30,6 @@ RDEPEND="gtk? (
 		net-libs/libproxy
 		!app-misc/eid-viewer-bin
 	)
-	>=sys-apps/pcsc-lite-1.2.9
 	p11-kit? ( app-crypt/p11-kit )
 	xpi? ( || ( >=www-client/firefox-bin-3.6.24
 		>=www-client/firefox-3.6.20 ) )"
@@ -42,8 +37,10 @@ RDEPEND="gtk? (
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+REQUIRED_USE="dialogs? ( gtk )"
+
 src_prepare() {
-	eapply_user
+	default
 
 	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
 	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
@@ -62,31 +59,45 @@ src_configure() {
 	econf \
 		$(use_enable dialogs) \
 		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers)$(use gtk && echo =detect) \
+		$(use_with gtk gtkvers 'detect') \
 		--with-gnu-ld \
 		--disable-static \
 		--disable-signed
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if use xpi; then
 		declare MOZILLA_FIVE_HOME
 		if has_version '>=www-client/firefox-3.6.20'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 		if has_version '>=www-client/firefox-bin-3.6.24'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
+	else
+		rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+	fi
+	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use gtk; then
+		rm -r "${ED}/usr/include/eid-util" || die
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
 	fi
-	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
-	use gtk || rm -r "${D}/usr/include/eid-util" || die
 }
 
-pkg_postinst()
-{
-	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
 }
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 1540a847231f..6d22571fa0cc 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1453 BLAKE2B de1750e032668783f4431a4cb9f8c0d31f43891dc5f8fcec927a519782f172d5d8d1f944cf2ca933f2f6baeb954374b6e1d873fcfcfb2c3c1a7e2dd9f7513f3e SHA512 dd8fc19c9504c1e61b25593c9c428a4562bfca7b4a129bdfe0ec541b9f1a5967a354db34336ad5a93587a0bf1e9cc6d1e6237dc093e967403c2e2fa8c3d5a6cd
+EBUILD mhash-0.9.9.9-r2.ebuild 1450 BLAKE2B d1508ad41772d5a810359de3dff95d908ce95c86ac56fb6b08a97030deab83b04f583ba3ea6606323ff737a39f4f468f44458f3547c1be8c9ffc9d72819a045a SHA512 ad0a19964ab7f9552c6ffd288577be8b717d094046a0dc4ea60449ec78743ff01e7fe9ae46244644fd27956aa73c7289220d42f1ec3904846b1fdbddda749daa
 MISC metadata.xml 325 BLAKE2B 07d8e2f3ec1adec0b16be91a853079e875a3d318fb47ec60e43a6ea87fbbdbbf5f22ec364af47ae311070081235752cebac0fbca30785731cc4b924a9a14edba SHA512 32c365b53e7c9d2a3c6dcef43cc33163a690a0e2f3401e275d3511faa388149ade4b9f5c583307f5b94e6df005796b4ec935ecf35c6cda8d236e46ed0ab7336c
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index e719837a52ad..10bc239c95b1 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 7f432c780cfc..a57ca7c66567 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,6 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r2.ebuild 910 BLAKE2B cb52075c0dcf4439bf67fb94a3e11843b1b176f6a2565fa9fb70cdbc0c52987b060616f321014fc1a18d457037c5f9f3b0cb7ed68bcbe906ff4595068715a9a5 SHA512 6857f630ff743ea28e65675aacc8d3cc72cac84d9c3c2ab0695c4b151c469fbac19e0d1e287517dd2075d8f7b79cb275d214c6ff80ff68d52bbe749791fc9ae1
+EBUILD shash-0.2.6-r2.ebuild 907 BLAKE2B 9545c0daface9b30fd991087ec9a90fef82d02d43dcf68db05eedd8b6ae18fb2de9d7efa6e18f92416df3a0973b6dc7acd9d74aeea9d6b8779645bbce65099d0 SHA512 2d6bba56beb9065d1e213ac8175792461007869aee551a875759d65c51b719927a1b2d136206c22a8199a80d862143b65db25288b55c5aeb9f1050e9f278c010
 EBUILD shash-0.2.6-r3.ebuild 935 BLAKE2B 9bee662dd576e56e0a119a15f59d554e9e050e2930dfaa235490cbad0dfa713059428b3818e01f15b95c51e35c11a1a30ce48268c81b229e3ecca07ab7a69b45 SHA512 631a3f5eeb582c67b32568a9628bc2f7c2379d1ca91ec3f42719dc286ab2fa949a22a8cd6953655b55d852f90c56f0e7fa7e4a262553d80e7e7b417215e6746a
 MISC metadata.xml 437 BLAKE2B e63ebd159e39421a74ce18c4623827dc34092a226ffe079becd58894f8397d111a6e7425e3b91a52a406d38acf81aa6dc9c799e88cda229900e5c85a19bcc745 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index a94cb91d0add..c8774700c9c6 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 73b3c55f397e..b66714d33f75 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 3fa413f482e6..4a5b7e7faa99 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,5 +1,5 @@
 AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8522c5e311220d6dd76b12df5c138693582f26a9d09ab33ca5e10a1e9d8dd6bb7b668d6bee09785b163dee6048a39af SHA512 6f72dc45c91da43a27bb66f7a81f33f810eef45711e6d84675bf761dda3a296aca7931e955526504c53a173a6ef65ef4712f378f8d4a1fbdd2437829aa2f49e6
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
-EBUILD qhexedit2-0.8.4.ebuild 1823 BLAKE2B 290507913c6189cba96885eb1105bdba20c629ea50a92df395607f29c81d9960bac52aa9e8b77cce7323dd359234de6dea901047671be4154202ffa21de81f62 SHA512 37b647971a9f64cb6878753716a3139abc4a59249192831dae5ef9b49d0d15eff01517cfaec7422b43e964ad965226162a8fbdfbe5200a47fc0aa499b9e9ba22
+EBUILD qhexedit2-0.8.4.ebuild 1824 BLAKE2B bf51b60fa58333b2fa727adadd3bb35b0215a77773b51d856dafc1cda3702834e074735dc5a908dadd41134d767e81e8ec6f7fb83cad2de139dd9023df890fb1 SHA512 610257b125661932965e7f6a2a4e6db53bb552382b0f34eca35729da9179d3668629d30e70f07a6c29b6aadcf45c123a28b05c066603079f6669f9ae6e52b5b4
 MISC metadata.xml 1188 BLAKE2B c77c4946d1d0b30cb98d1aa5043ffdd97511687eac48a014d5393e4fb9728ec5e56a2e7e8616369ac2b13bb12439b66f963d48aa31a9d4d84120d98b2cd23250 SHA512 399c8e332a7eebad8a7eccaa555eadd29b2e8cf2a3fc5423eee9bcdda472581d341a683eef186519eb07c88305a6943687569e2ba2343d4b2bfeaaf3767064cd
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
index 07dccd9847e6..1de535b4cde6 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gui python"
+IUSE="doc +gui python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 468a5bb5a8ef..a25fa55d4e44 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 94e1056d1fb7..7afda73b57a4 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-mode-2.69.ebuild 548 BLAKE2B 11c365fc4c89d3923485ea1ad49916afce635c17c57adc2831be0d3744cff82a011022760874424a3451e214f745e9f5fa4c4214e2b03f0c0435eca86a09024b SHA512 cca1a8392f107338d1403992226fc97c5cb4371ce10403b9de32711df4ba2ba39d7ca1c5848a6fc521cf887aad0b1c75a6df9b63b1c0170dff3279a5c7d73153
+EBUILD autoconf-mode-2.69.ebuild 554 BLAKE2B fa3a4ede29844a297d7bef4685922073d32ca727574764d24d903ede381545b63c20633c567962ba3ccd682f9251c16461ab59ecdc3c239aa96351388ed2a553 SHA512 11f7a68fe829fb5a87b05f1a6c23d5f698aef3c7c302d5e74e73bf19d6242e73f128fbe2b3f3be45f31a8833931f02c7d85d88a557822d4574a89f435f87f8b1
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
index 2d9f4f984a53..ba5dec445115 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 SITEFILE="50${PN}-gentoo.el"
 S="${WORKDIR}/autoconf-${PV}/lib/emacs"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 85242e7d61db..12278af748d6 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index a51087db2aa1..9cf2816ddd15 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -8,7 +8,7 @@ DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719
 DIST nss-3.34.tar.gz 9586315 BLAKE2B d04fcd46a7bf318b4bab14f316ae53145f415b5abb637205eeedb72f5847d43b76ea5e77485c56e4eaa3d90b850ee4bb18b6d0e42422f94ea0a9f12559263e02 SHA512 72388b596151499850546a68d9a20d82434c59f159564fb7170980f110d43d7026f174f93660d3bb6da79b618fd7d4f1f16246fc80ba568aa555df99ebbaea21
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20161130.3.30-r1.ebuild 5957 BLAKE2B 62d319e8e5a91e087692455ea9b0ae3428fe32cf68a3194112599adb2fe1782754950708f22463caf848bde08d8d5b535ac6e7ba306b1418cc47271a514569cd SHA512 9daed98f9c1b864f6fb5aaa9172820ca660f0c794b9a68a82dd90979630c7f0d66682fd27896d679fcdfcd0048fbac77ce25b133db65f0e03c73628276649477
-EBUILD ca-certificates-20161130.3.30.2.ebuild 6251 BLAKE2B 903ff03839cd97cdcc39611d76e4b1ab0c26c9020aaec843f2194e9d8ac083ac52618bc90e2b38ef6b31bd111431d77be0437f0cd131d7242a85d791d48aff0d SHA512 ff5bef1d4997a0d4adfe2b94c9dce5d5f9bff23a6c339aedeeddcd24e28184300b94393637b2c692357e5408d2ffd6be71a18bc0fcc7d8055f03a12f4a0a9cd5
+EBUILD ca-certificates-20161130.3.30.2.ebuild 6248 BLAKE2B 067c2ca4532d086a86c77bfd0ef21cb282d21b7643d8af6e237ead84e29dcd23647feb1690c47b9d8da43659ec14f251ad7e9d4d5a2985fe76e1b4b531770d2a SHA512 ad3ce9a68d80b6604972d8a78de462aff6df914cc1452c1c5d972723f1a8be1eb9582f214fcd5b4c65a2638356054beaeac9f3bb1b310e563ad44c9b7add0564
 EBUILD ca-certificates-20170717.3.32.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 EBUILD ca-certificates-20170717.3.34.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 EBUILD ca-certificates-20170717.3.34.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
index c538eb461d5e..4dc1cd363d40 100644
--- a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
@@ -58,7 +58,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d6206cd44c51..ba33c5561899 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/impressive/Manifest b/app-office/impressive/Manifest
index 5efd8a23d7a8..38cedfa318e3 100644
--- a/app-office/impressive/Manifest
+++ b/app-office/impressive/Manifest
@@ -1,7 +1,3 @@
-DIST Impressive-0.10.5.tar.gz 166707 BLAKE2B 2d5ef9d05d82a22af037fda0e0b01252d513ee0686f9ab21f1d24cf86b4e0a5043aaf7f16b3d9d8a6773b110f716948c184a058845d7595155a40410821c8ccf SHA512 3939188d45ac7a617a56be72e72c98923c23073bee2c3c1b7b81fc2e26ce415ceffdf5456d754f921e488181d8edb7df96ad90e6923b2425c49e38da75c02f20
-DIST Impressive-0.11.0b.tar.gz 195138 BLAKE2B daa8e7bc17ec028a9c858688182a4cd6426004aaec24b7ea1574cd415a7f43f0d8a0ae43b01089d66a66c16b316439454341a3f6c2d366768a351ba2fff85b93 SHA512 c4038ed7b71ac79078922ee0e24ce3bef4b0384d8d468291f0283266fe8a849825f5798ec1260e40ac12659a8a7cf5325e3aca0e2475b1c483d3ce830f4bc70f
 DIST Impressive-0.11.2.tar.gz 198391 BLAKE2B e0157a910b61c7dbe0796193b3d18f533210de50568d835e5204a848a5ac4978ab228b633d5137fb068af09a88d0c50fc2dbbb02b9b0d1a32a99f9de220ac1de SHA512 cabb52612f65ddadfb080e3db6417680a1aa9724fe45d8b78a1206b6508a8b60c5e5a7c218ff0f90e62adcd498aabe625837164fc547604dfd7aba425db87dd6
-EBUILD impressive-0.10.5.ebuild 1055 BLAKE2B e004b2eae93fd347426be12630d2479cc795de7ded0c5035f2ff9cf209c5ff121a0f228b1449b60b854e53e0aef0a857f756c4fee7ded31a031db1eea2f65cb0 SHA512 ae386fbff67cbdb3c0771e36fd6f6d6bc9e36e75249b84fb94b384043a340a6a4cff28f9e3838d98dea4addf9d59b7ad8afe248afabab520ad03a7ad25a63bf6
-EBUILD impressive-0.11.0b-r1.ebuild 1569 BLAKE2B 1bb6419133a543493ac336227053696a973e6260a0e63ae9c857a710ba7d38094b1992da33fa75031bdf090f39b4e9e7dadcb2f09a2a40b71433baad7ccc8adf SHA512 908f2fea69536f8e93dda6f856d7d5cd297f178e684d01b28b5a925cb19258bfd653d876c84db3f5dcdc75fae2dae8f28d5162e988a34d1d6931e23bf5331c73
 EBUILD impressive-0.11.2.ebuild 1207 BLAKE2B c73ead27403b1bb04f82e179f0a9a3b7d9f9b15ac70b710a7c118c381f89707156ac7a794c63440958d91cf1ea627b1db662f80978d3ace4c1194bf5076b7c6d SHA512 ff208fa50780c520dbb3bc1e29e448ef02edad0036576ceb9a3afe017f811345b6e2d156811bdf5c77c6512096e781b5e75cb602daa194871be81a83ff3a397c
 MISC metadata.xml 333 BLAKE2B 145c89f4cff6275c14079657c04fd3806149b7d24e497df4673a09e868b2deb9cd3fea9bd888765aa7a7301148d71db47dd1a4100695cc5fbf6e268dd72c81ac SHA512 2c4d3cf1dbcadd548b1999c81105be623a9347e0ec290f21be1333ecf64649d75e3a3f6ddcbf61cefbb80a5053897aa94abaf976bdf5a2d0a18135e760e70a23
diff --git a/app-office/impressive/impressive-0.10.5.ebuild b/app-office/impressive/impressive-0.10.5.ebuild
deleted file mode 100644
index 11c6b3ca49d3..000000000000
--- a/app-office/impressive/impressive-0.10.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Impressive"
-
-DESCRIPTION="Stylish way of giving presentations with Python"
-HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	!>=dev-python/pillow-3.0.0
-	app-text/pdftk
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	x11-misc/xdg-utils
-	x11-apps/xrandr
-	app-text/ghostscript-gpl
-	|| ( media-fonts/dejavu media-fonts/corefonts )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}.py
-
-	# compatibility symlinks
-	dosym impressive.py /usr/bin/impressive
-	dosym impressive.py /usr/bin/keyjnote
-
-	# docs
-	doman impressive.1
-	dohtml impressive.html
-	dodoc changelog.txt demo.pdf
-}
diff --git a/app-office/impressive/impressive-0.11.0b-r1.ebuild b/app-office/impressive/impressive-0.11.0b-r1.ebuild
deleted file mode 100644
index 3cda43ee2c7b..000000000000
--- a/app-office/impressive/impressive-0.11.0b-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Impressive"
-
-DESCRIPTION="Stylish way of giving presentations with Python"
-HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV%b}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-text/pdftk
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-apps/xrandr
-	|| (
-		app-text/mupdf
-		app-text/poppler
-		app-text/ghostscript-gpl
-		)
-	|| ( media-fonts/dejavu media-fonts/corefonts )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	sed \
-		-e 's:tostring:tobytes:g' \
-		-i impressive.py || die
-}
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}.py
-
-	# compatibility symlinks
-	dosym impressive.py /usr/bin/impressive
-	dosym impressive.py /usr/bin/keyjnote
-
-	# docs
-	doman impressive.1
-	dohtml impressive.html
-	dodoc changelog.txt demo.pdf
-}
-
-pkg_postinst() {
-	elog "The experience with ${PN} can be enhanced by folowing packages:"
-	optfeature "Starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
-	optfeature "Sound and video playback" media-video/mplayer
-	optfeature "Sound and video playback" media-video/mplayer2
-	optfeature "Alternate PDF rendering" app-text/mupdf
-	optfeature "Alternate PDF rendering" app-text/poppler
-	optfeature "Alternate PDF rendering" app-text/ghostscript-gpl
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6e0a230fca6f..677a2897c094 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 2e46a6a161cb..19e11e24b8f4 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,4 +3,5 @@ AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1864 BLAKE2B e18984946d4bee7c476eb9cec0317fd4f590fb50522eb54200b20b9d6d3eb1225aadb5b1f1e248776e2e85e325ef12364cdc18c58b7f59d39c5653b581ba35ca SHA512 38efc7b3e888b8bd82b9bd2c03fbf5052a675ed7c0fed5c006578ff381213d05cb165e62979aad00c82146a1a9f217528607adc3b38c7e63bb8cad0f053c53bd
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1870 BLAKE2B 92848fe171dc051b5130f69d5230878470b1b7d917da0c6cfa5393fd4afca907c2e267f2309032d1b92b2ebd49f6ce20312866c2dd1bbcd133579b8ea86c3dcc SHA512 28f54f735741e025ec0cb797fd91be857c74332a93d0105c63aa06a1acddfba4dc2b00e2131c33185b40de44473e27e5743e23dadfdaa049283e2dc614614370
 MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
new file mode 100644
index 000000000000..0cf85933258e
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools prefix
+
+MY_PN=${PN/-sgml/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Shell scripts to manage DocBook documents"
+HOMEPAGE="https://sourceware.org/docbook-tools/"
+SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="jadetex"
+
+DEPEND=">=dev-lang/perl-5
+	app-text/docbook-dsssl-stylesheets
+	app-text/openjade
+	dev-perl/SGMLSpm
+	~app-text/docbook-xml-simple-dtd-4.1.2.4
+	~app-text/docbook-xml-simple-dtd-1.0
+	app-text/docbook-xml-dtd
+	~app-text/docbook-sgml-dtd-3.0
+	~app-text/docbook-sgml-dtd-3.1
+	~app-text/docbook-sgml-dtd-4.0
+	~app-text/docbook-sgml-dtd-4.1
+	jadetex? ( app-text/jadetex )
+	userland_GNU? ( sys-apps/which )
+	|| (
+		www-client/lynx
+		www-client/links
+		www-client/elinks
+		virtual/w3m )"
+RDEPEND="${DEPEND}"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}-elinks.patch
+	epatch "${FILESDIR}"/${P}-grep-2.7.patch
+	if use prefix; then
+		epatch "${FILESDIR}"/${MY_P}-prefix.patch
+		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
+		eautoreconf
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install || die "Installation failed"
+
+	if ! use jadetex ; then
+		for i in dvi pdf ps ; do
+			rm "${ED}"/usr/bin/docbook2$i || die
+			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/$i || die
+			rm "${ED}"/usr/share/man/man1/docbook2$i.1 || die
+		done
+	fi
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 867091d2f2e6..7f37fc070698 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,3 +1,4 @@
+AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 AUX fbreader-0.99.4-gcc6.patch 512 BLAKE2B 16e930b4594abbf48879fdbd6f46415a46e10a73c1660bfe44f05922269531c58b11a7c351a3f4fc9b338ce9a1ae2f319eb3750802ddbfac76b09ebcc5a70fee SHA512 79c64750c250e10fa6530ed397a77ed9ebb2b76d12a6c0967cf8739b24f8381c76961e72388d0116f514c71c3cecc04a4945781dc87db3a30a18e4a1afc0315d
 AUX fbreader-0.99.4-ld-bfd.patch 532 BLAKE2B 50a964b7cb79211302e3804f1eae2e54194114d8387f889e8707269d4bba8d9a5acd0718c49593564bcf397c8c0afdbc2773070195dbb28fd3c394057d781f00 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d
 AUX fbreader-0.99.4-mimetypes.patch 505 BLAKE2B 6877f9750ed6d4b30b10a83aed47c0e75b76fdb8d6c02a1d70568d3b7b1e24e7d67602c83ef5e5df5c2c3aa462b5800431ba20b9256f9908be79d690cfe5ec55 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b
@@ -7,4 +8,5 @@ AUX fbreader-0.99.4.patch 472 BLAKE2B a34f27d9f53f3faed5889dcb7a841a1c045e7bd408
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
 EBUILD fbreader-0.99.4-r3.ebuild 2279 BLAKE2B 1e22f5cbdc916be2543a79ccc95c753726e946c56c85e9dcd53c89b643fea39edefda496de67bc603d8c885858802a89e7d09c5d1a4d635fd5a32ff0333e0e24 SHA512 f93ebe20622e94f54b68ecd62d76520d3455595e3433b875d76654479939f34ba21ed80b580c1b46824473e9f927b4349e8a5df37e4b2f350daf824cb07eb27e
 EBUILD fbreader-0.99.4-r4.ebuild 2111 BLAKE2B 955873c4d80c35e8579e97140bc4eab256cff750ef844a68de99418666bb93f61824486c48983ed366993d8496e1d7396d4e8e2c5ebeb11f1513a3ddefb5e8bc SHA512 28195b8b7d246fd7057ba9c30835e263b37932206d07a26fa3f01d240b44c19a58196e575ffaf8fb4e4cdf76d50682ecf97a4b5bca2dc4c18582fdfdea2eb1a2
+EBUILD fbreader-0.99.4-r5.ebuild 1936 BLAKE2B c1088b520946446ff8ebae23c85019f2154ceb5ff7ae1bd4b8274a4964787973dddcdb88e4e572aa29be4196cfe7e790c5a82001503955143af02ae293e6bb74 SHA512 d4acd24ba9bcc8154596b43135b3e86e56cea3e5ff9e9faf9b596f74f7e627d62c79b7776ecc1f653b9affa26f3c64b810c880009afefdabb8362ebd6757dc32
 MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
new file mode 100644
index 000000000000..41a203a894ea
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic qmake-utils
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/libunibreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# bugs #452636, #515698, #516794, #437262, #592588
+PATCHES=( "${FILESDIR}"/${P}-combined.patch )
+
+src_prepare() {
+	default
+
+	append-cflags -std=c++11
+
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/d" \
+		-i makefiles/config.mk || die "LDFLAGS sed failed"
+	sed -e "/^LDFLAGS =$/d" \
+		-i makefiles/arch/desktop.mk || die "LDFLAGS sed failed"
+
+	# Qt5 moc
+	sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/files/fbreader-0.99.4-combined.patch b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
new file mode 100644
index 000000000000..f75c0fdf1e2c
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
@@ -0,0 +1,535 @@
+diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
+--- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/Makefile	2018-01-11 22:18:18.000208200 +0700
+@@ -23,5 +23,5 @@
+ 	done;
+ 	@echo -n 'Linking $(TARGET) ...'
+-	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
++	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
+ 	@echo ' OK'
+ 
+diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
+--- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/desktop/desktop	2018-01-11 22:13:58.401219117 +0700
+@@ -22,2 +22,3 @@
+ Icon=FBReader
+ Categories=Office;Viewer;Literature;
++MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
+diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp
+--- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp	2018-01-11 22:18:33.000207569 +0700
+@@ -60,5 +60,5 @@
+ 		return false;
+ 	}
+-	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
++	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
+ 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
+ 		clear();
+diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk
+--- fbreader-0.99.4.orig/makefiles/arch/desktop.mk	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/makefiles/arch/desktop.mk	2018-01-11 22:18:40.119207269 +0700
+@@ -15,27 +15,9 @@
+ CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+ LDFLAGS =
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
+ 
+-ifeq "$(UI_TYPE)" "qt"
+-  MOC = moc-qt3
+-  QTINCLUDE = -I /usr/include/qt3
+-else
+-  MOC = $(shell pkg-config QtCore --variable=moc_location)
+-  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
+-endif
+-
+-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
+-
+-ifeq "$(UI_TYPE)" "qt"
+-  UILIBS = -lqt-mt
+-endif
+-
+-ifeq "$(UI_TYPE)" "qt4"
+-  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
+-endif
+-
+-ifeq "$(UI_TYPE)" "gtk"
+-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
+-endif
++MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc"
++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+ 
+ RM = rm -rvf
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,7 +18,7 @@
+  */
+ 
+-#include <QtGui/QBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QToolBar>
++#include <QtWidgets/QBoxLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,15 +18,15 @@
+  */
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QImage>
+ #include <QtGui/QIcon>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolButton>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QToolBar>
++#include <QtWidgets/QMenuBar>
++#include <QtWidgets/QMenu>
++#include <QtWidgets/QToolButton>
++#include <QtWidgets/QLayout>
+ #include <QtGui/QWheelEvent>
+-#include <QtGui/QDockWidget>
++#include <QtWidgets/QDockWidget>
+ #include <QtCore/QObjectList>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2018-01-11 22:18:40.120207269 +0700
+@@ -23,6 +23,6 @@
+ #include <map>
+ 
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QAction>
++#include <QtWidgets/QMainWindow>
++#include <QtWidgets/QAction>
+ #include <QtGui/QCursor>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,6 +18,6 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QPushButton>
+ 
+ #include <ZLDialogManager.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2018-01-11 22:18:40.120207269 +0700
+@@ -21,6 +21,6 @@
+ #define __ZLQTDIALOG_H__
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLDialog.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,8 +18,8 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLayout>
+ 
+ #include "ZLQtDialogContent.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,9 +18,9 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QMessageBox>
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
++#include <QtWidgets/QFileDialog>
+ #include <QtGui/QClipboard>
+-#include <QtGui/QDesktopWidget>
++#include <QtWidgets/QDesktopWidget>
+ 
+ #include "ZLQtDialogManager.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,5 +18,5 @@
+  */
+ 
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QFileDialog>
+ 
+ #include "ZLQtOpenFileDialog.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,14 +20,14 @@
+ #include <cctype>
+ 
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QLabel>
+-#include <QtGui/QGroupBox>
+-#include <QtGui/QRadioButton>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSlider>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QComboBox>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QGroupBox>
++#include <QtWidgets/QRadioButton>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QSpinBox>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QSlider>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLStringUtil.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -18,9 +18,9 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QLayout>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QButtonGroup>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QButtonGroup>
+ #include <QtGui/QResizeEvent>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,7 +21,7 @@
+ #define __ZLQTOPTIONSDIALOG_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QDialog>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QTabWidget>
++#include <QtWidgets/QDialog>
+ 
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,9 +20,9 @@
+ #include <unistd.h>
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLayout>
+ #include <QtCore/QThreadPool>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -23,9 +23,9 @@
+ #include <string>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QCursor>
+-#include <QtGui/QDialog>
+-#include <QtGui/QProgressBar>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QProgressBar>
++#include <QtWidgets/QLabel>
+ #include <QtCore/QRunnable>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -20,10 +20,10 @@
+ #include <algorithm>
+ 
+-#include <QtGui/QSplitter>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+ #include <QtGui/QResizeEvent>
+ #include <QtCore/QDebug>
++#include <QtWidgets/QSplitter>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <ZLFile.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -25,10 +25,10 @@
+ #include <QtCore/QMap>
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QWidget>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QWidget>
+ 
+ #include <ZLTreeDialog.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2018-01-11 22:13:28.444220377 +0700
+@@ -49,3 +49,4 @@
+ 	  path = replacement + path.substr(1);
+ 	}
++	ZLUnixFSManager::normalizeRealPath(path);
+ }
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,5 +21,5 @@
+ #define __ZLQAPPLICATION_H__
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ 
+ class ZLQApplication : public QApplication {
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,5 +20,5 @@
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QFile>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QFileOpenEvent>
+ 
+@@ -73,5 +73,5 @@
+ 	new ZLQApplication(argc, argv);
+ 
+-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
++	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
+ 
+ 	ZLibrary::parseArguments(argc, argv);
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -25,5 +25,7 @@
+ #include <QtCore/QList>
+ #include <QtCore/QTimer>
++#include <QtCore/QUrlQuery>
+ 
++#include <QtNetwork/QNetworkCookie>
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+@@ -150,10 +152,10 @@
+ 	if (!scope.request->postParameters().empty()) {
+ 		QByteArray data;
+-		QUrl tmp;
++		QUrlQuery tmp;
+ 		typedef std::pair<std::string, std::string> string_pair;
+ 		foreach (const string_pair &pair, scope.request->postParameters()) {
+ 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
+ 		}
+-		data = tmp.encodedQuery();
++		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
+ 	} else {
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-01-11 22:13:39.639219906 +0700
+@@ -87,5 +87,5 @@
+ 
+ void QtWaitingSpinner::setRoundness(qreal roundness) {
+-	myRoundness = std::max(0.0, std::min(100.0, roundness));
++	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
+ }
+ 
+@@ -149,5 +149,5 @@
+ 	qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
+ 	qreal resultAlpha = color.alphaF() - gradation * distance;
+-	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
++	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
+ 	color.setAlphaF(resultAlpha);
+ 	return color;
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2018-01-11 22:18:40.121207269 +0700
+@@ -4,5 +4,5 @@
+ #include <QtCore/QTimer>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QColor>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,12 +18,12 @@
+  */
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QScrollBar>
+ #include <QtCore/QTimer>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <QtCore/QDebug>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2018-01-11 22:18:40.120207269 +0700
+@@ -21,10 +21,10 @@
+ #define __ZLQTITEMSLISTWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QFrame>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QScrollArea>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QFrame>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QScrollArea>
+ 
+ #include <ZLTreeTitledNode.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,8 +18,8 @@
+  */
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+-#include <QtGui/QGraphicsDropShadowEffect>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
++#include <QtWidgets/QGraphicsDropShadowEffect>
+ 
+ #include <QtCore/QDebug>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,9 +21,9 @@
+ #define __ZLQTPREVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QVBoxLayout>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QVBoxLayout>
+ #include <QtCore/QSet>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -19,7 +19,7 @@
+ 
+ #include <QtCore/QDebug>
+-#include <QtGui/QStyle>
+-#include <QtGui/QCompleter>
+-#include <QtGui/QStringListModel>
++#include <QtCore/QStringListModel>
++#include <QtWidgets/QStyle>
++#include <QtWidgets/QCompleter>
+ 
+ #include <ZLibrary.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2018-01-11 22:18:40.121207269 +0700
+@@ -22,6 +22,6 @@
+ 
+ #include <QtCore/QSet>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
+ 
+ #include "QtWaitingSpinner.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,6 +20,6 @@
+ #include <algorithm>
+ 
+-#include <QtGui/QLayout>
+-#include <QtGui/QScrollBar>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QScrollBar>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmap>
+@@ -186,9 +186,9 @@
+ void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+ 	if (direction == ZLView::VERTICAL) {
+-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
++		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
++		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
+ 	} else {
+-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
++		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
++		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
+ 	}
+ }
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,5 +21,5 @@
+ #define __ZLQTVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ 
+ #include "../../../../core/src/view/ZLViewWidget.h"
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index a2bbe40c09a6..7f7030ffef93 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,9 +1,3 @@
-DIST paperwork-backend-1.1.2.tar.gz 54340 BLAKE2B 133be8b0e9d7a768eaea0353c53b3f968f8e82cca26f02bee1d95becddaa7e0ad7f27f867df67333227b6aeb9ebb6841ae9a530f9d58e8d85078d09d58f8e70b SHA512 626a4e44243769c0982d2a4677e35e4c3431e6b68b05687f13574e1f9cfd026d0b949e95e53ea37c976ea5826883eb2ac672cffc346eb05631f3498bb525391a
-DIST paperwork-backend-1.2.1.tar.gz 63417 BLAKE2B 430117a0c6b33fa337318a566e1aaf23ac13dce5c6a04dad82486f87c53662d7d4d06059dc0581d4aa4b82a8366d3a60ee7eeff6e3d0ec1252c61b1da63e2efd SHA512 01878b8580187aeca45248a133a92b83c3f8e8012b6bbacc6e625ca447979c01633573cbb59a4460b88aae6f89db2ae618c27019bd940a391a30dccde1c54696
 DIST paperwork-backend-1.2.2.tar.gz 64271 BLAKE2B 8261f64585d113a0a06a556e93c06cb528c60e1a906e2926aa55a39d363988ba9949ee7c51ab83efb683aa9beb986883e12e0895063e1a350a4ecdc23bb71cf6 SHA512 6fbf00f657134f1aeae0850f58adce0cef4dc292898db3fde725d404bea5d2fc73c386ce8c1f37ae7980997c23ba9489c13e02e3e9d056cca8014cf5691e5ef8
-DIST paperwork-backend-1.2.tar.gz 63167 BLAKE2B ead1d7a7a4bba205f33874e8d492658061d448308b2aa78231f630745ed8b8a3273594ac3312010c192522f6a0ab27e1eb80f39cdd658162a27bf9d4f94659e0 SHA512 278d7080c9806a6ae68cb15ba9df2ac22bd2c120f0e77a9d7eacbbd6e70476d4fb803c572216e580a068527ae8c10c3f2e66199aca3d94949e655c08214beeb1
-EBUILD paperwork-backend-1.1.2.ebuild 852 BLAKE2B 09597d108186502d133dc8ce8bf47670c6c3426c9d893a9841dbf0de2c2f047ecb5bf962d31461a301e822417d5a8596e06ea552f7edb252c803551b1cc961ec SHA512 a0cafaaa7704ba1f43450c8e39a0015b20cf6a5b11d89041de91dbedb01f163df52f6ed4c69817811ad1f42aeaf231dd305c8340ebdaaff141121c6c980ea6ea
-EBUILD paperwork-backend-1.2.1.ebuild 902 BLAKE2B 94903cbe8f24b3a4fa40e110f41b898511b33e78790e768c00b1e170dfbf8393788ed15dc1076cb448178cea6e0ad7669584dad6bf98dfe036d2f1a8d90d91d0 SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43
 EBUILD paperwork-backend-1.2.2.ebuild 902 BLAKE2B 94903cbe8f24b3a4fa40e110f41b898511b33e78790e768c00b1e170dfbf8393788ed15dc1076cb448178cea6e0ad7669584dad6bf98dfe036d2f1a8d90d91d0 SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43
-EBUILD paperwork-backend-1.2.ebuild 902 BLAKE2B 94903cbe8f24b3a4fa40e110f41b898511b33e78790e768c00b1e170dfbf8393788ed15dc1076cb448178cea6e0ad7669584dad6bf98dfe036d2f1a8d90d91d0 SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43
 MISC metadata.xml 358 BLAKE2B cb88562d44bff3ee72bc171fe94d05ad0e21cdcbf56242ecba5b5401eebf9063c851f69f211d0c2bbdedd638a9626833a5c36169e7d334bffe1703981ccf6813 SHA512 1a5a81b753e23232ec0fa2e5239d80ae70a589403a1cec20191590f4d5741fe2519a389ecad905e4fd89d148f8420dc602016fe92f10fe03ebea70508d4d361d
diff --git a/app-text/paperwork-backend/paperwork-backend-1.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-1.1.2.ebuild
deleted file mode 100644
index e287a22cac97..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.1.2.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
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/jflesch/paperwork-backend"
-SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.1.ebuild
deleted file mode 100644
index da6daad02406..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.2.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
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
-SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.ebuild
deleted file mode 100644
index da6daad02406..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.2.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
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
-SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index fcc9b786c82c..1f74a0785fb1 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,9 +1,3 @@
-DIST paperwork-1.1.2.tar.gz 331028 BLAKE2B 3d491666330646fd0a30106cca2a3d6a7ad5fd1a5bf7d853a146a7045ba72884140e08969265282032487a36ae2562a22e2897d817a27dd39f2e2d0fe332b74a SHA512 14c018c9b148e1569948d2de7b1c0c04d353a7af7aa6a7102585665d9af2f5f2055145338a001085be0fc165abec066d73d3adc4a378a307326edf730c3c3606
-DIST paperwork-1.2.1.tar.gz 8116070 BLAKE2B 23ade3706222c4a12b0e145fec7678061498d1af076c74ffd0668f0e92e8c69f8a303ffffe20237641c5b31008532d678725a82f321c0d2781bcb1b2150c8da7 SHA512 fb44c048e8669cdc95a358369de418d862c49fe9a9d6cb8d20ce727ae0ca6a57c19cfd5f39fe95ee67c086dd481c22c3717a672f1ac09f3b63a0daa851a8e482
 DIST paperwork-1.2.2.tar.gz 8124352 BLAKE2B b88d03f0ab5f2512a2fb87a614c61458c3bb771b7803316feae526299e8823aaec73133a96e501f44d10f0c540c9697ddff32de557f060f289a2c7245d808b27 SHA512 e38d269e03f77bc3ffc75f9b77c960e69b8c3f67aac26a38f39b324118ecdcb5a293de8f50226da07f913f3c849b7602b3250304bc348fb2f6d6816d09b17257
-DIST paperwork-1.2.tar.gz 8086428 BLAKE2B 1431f94ab3a4959e189ca457711b8ff67c55e8b483e41ea4ebfb65316f5a72182970974189a99ffd55b77a16c06d5ae9ac3566b8a5c8fbc70fdf5e5b02c7b9cb SHA512 9c8c43ef31be2eef57ffbcdb00b4e91dd2b1eade75814b789c489abfb6f7bae07e68f7207c8fdef4f3bf95bd68bca8a680b965259106af9f0166bee7a6cf5ea0
-EBUILD paperwork-1.1.2.ebuild 914 BLAKE2B 0d6ac94966b8e522ebd55e0292697abb1e22dca0cc198ff0578df860d7faf9b015afef961c3df31de92a302aff08993eff8a563a6f43e96de89963f3e30f559d SHA512 2529c16f7f10b9c0da68337485f53fd52b9b6d4236dad7939e98adcca4dff74fc648570d0a06ad2ecf0b8b1e6851f4671e89e64663287263232ebfa5b7fcbdc3
-EBUILD paperwork-1.2.1.ebuild 926 BLAKE2B 1a9f490a37f67913eeae09f52583b4363a50e9472938a477273e7dccb9b21a4c64fe679c5e8939a2f8b76b9078e7b7e08dd02bf50220767f065bfa890b2262c9 SHA512 0e64099e88fce4e4050cc4d30a6917ba9981825801738c01187d46c2b39a10159d31ed7e9ce8ed0c5bcf4f38da0b00a993bdfc91e6d0be62586cdffcb9da9f5f
-EBUILD paperwork-1.2.2.ebuild 961 BLAKE2B e2703ac85d4bcce7e94a845ac2cd8e67341e19c3cd7a31e248ce4028233c77afd146ff0bd8b6c5a709782a2fc830d71146e0df9c01a9e77b2a804a2ef4672462 SHA512 8f3a63924f87649bd2ca96a9b324a4a0bd4ac3f4771338171d43028ca88686029c19c5aa9cd311e1cca2686cb63f5d7307a5d79ae401454d2d68cbb1dd9599fe
-EBUILD paperwork-1.2.ebuild 926 BLAKE2B 1a9f490a37f67913eeae09f52583b4363a50e9472938a477273e7dccb9b21a4c64fe679c5e8939a2f8b76b9078e7b7e08dd02bf50220767f065bfa890b2262c9 SHA512 0e64099e88fce4e4050cc4d30a6917ba9981825801738c01187d46c2b39a10159d31ed7e9ce8ed0c5bcf4f38da0b00a993bdfc91e6d0be62586cdffcb9da9f5f
+EBUILD paperwork-1.2.2.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
 MISC metadata.xml 727 BLAKE2B af7087f48e6c0412e1419fd2ed65e8e10e155d3988bcd8b8834e999851afb375171d5e49230673cb7a6e1066809f53ad91d1e2b90727646d0acb86f04ae40dc3 SHA512 cc1ee40752039159b50cb5e12a8f92a0e3c84b4bd0861538bb366b8202194503de68a48154f51873444f366543d3143f800754e88b73f0b128133e0e0268f989
diff --git a/app-text/paperwork/paperwork-1.1.2.ebuild b/app-text/paperwork/paperwork-1.1.2.ebuild
deleted file mode 100644
index c301f25b4f83..000000000000
--- a/app-text/paperwork/paperwork-1.1.2.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
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://github.com/jflesch/paperwork"
-SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinsane:2[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.1.ebuild b/app-text/paperwork/paperwork-1.2.1.ebuild
deleted file mode 100644
index 1ce4f4dfe5d4..000000000000
--- a/app-text/paperwork/paperwork-1.2.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
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork"
-SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinsane:2[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.2.ebuild b/app-text/paperwork/paperwork-1.2.2.ebuild
index 23d0921fdd5f..ca20baeb28fe 100644
--- a/app-text/paperwork/paperwork-1.2.2.ebuild
+++ b/app-text/paperwork/paperwork-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyinsane:2[${PYTHON_USEDEP}]
 	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/simplebayes[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/libnotify[introspection]"
diff --git a/app-text/paperwork/paperwork-1.2.ebuild b/app-text/paperwork/paperwork-1.2.ebuild
deleted file mode 100644
index 1ce4f4dfe5d4..000000000000
--- a/app-text/paperwork/paperwork-1.2.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
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork"
-SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinsane:2[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 627bcc964fa5..dcee3756cbc1 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -2,5 +2,5 @@ AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442b
 DIST po4a_0.45.orig.tar.gz 2208959 BLAKE2B f5fd533036eac41aa15413559bab7fb176556b47d63fe7bae4a98797a128f8314f6a22076fd1792d1ae19d8aad27599508064ec8323b6fe8ffd433989541151e SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.45-r3.ebuild 1980 BLAKE2B 3840a33a5c574b1f853a6ac582a93cd0f51f90c36fce29dd74be8a8432d5a4a923046b173a59a5b9cb3040e91fc44624ddfdea9e125399d1349c35c835079b62 SHA512 28547b542eb7ddc4125f9d6c1d1cd9efa3f0db8498beffde5ffe0f8ff9bd2223ff2e43d7b8f0d71571f6a91487c3259941cc1b5c217bcb8b01a443093cdde26e
-EBUILD po4a-0.47-r1.ebuild 1665 BLAKE2B 2e217b76e5baeced981af9620a36119ef4087a3bbda66539a23dab47b4e2cda41c948266fdc5d28864926ce0b8228dd8f291294b896505fd6dcd3041ac16e133 SHA512 59548632757f68e89e9b672b15cf5f3201ffdc022b912aeeb25dbe18b2a6da7bde8eadd9e079612ee9148034a14063211a0289f2801a2d3746fd70b1e591a141
+EBUILD po4a-0.47-r1.ebuild 1662 BLAKE2B 17b708bc9d3273f52f83bd4fe9d8907b1acc057b538592e35a9c2a833b9b395518834790099b18fe4cf55925ae099a09fc35788824511a5d5fe988d87b680a9e SHA512 46f6631a4ee4a081fb6526516713e801366da5e0bdd5c957fac9d3eb862f00a8d780a4de90fecc9af40349ab5f27bbc3991800e782c5174e4beb3d0e4d01a2dd
 MISC metadata.xml 359 BLAKE2B 595b8f927db22fe76f8ad8d6346cea457f50a139a794480ccc41b43a3091b34f4799f1058b1e00a5a937d688681364d3d7c83ba1e2b4b62d555d54e0c600d887 SHA512 aea1ab25da9b3d9c4b0080912a0260d642f91a4c58c608e7b091fdaaf40aa8bd9c7c0237f2cb90227826c1bda9931ab3d307a42354b5fd3172e07ea676e2f566
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index f08c52407590..f5c19f7c5d9c 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/SGMLSpm
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index ba6022f42a5d..a919f3dbb453 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,5 +1,5 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
 DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
 EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B 2a915944b3ac6e140591f3dfed56afc3689b64301411f89d9dfb65ce2ea1c24786354e28eb5008f3d01cc9989c598da1f3fce92e32e6043c080db80b97c831ac SHA512 7d895b58b606c9ae4f87efcc111e363afbdba7a1eea3f6feafdc12d3c676e3458c2f120ae955196c0e6b7f46829efc0fe0d7572210ca8e13712652e24b6da0e6
-EBUILD tree-1.7.0.ebuild 1063 BLAKE2B 1e95f792aaba1402ca0432f00edc1c6b1c1019d803a94b78455abbe0b2b19a358e47758e3ade7a2e8ab1e2ea75f9e2c693c3831fe19d036e7dabc44d8c03b9fd SHA512 f949ab05513709e1f2f1ac1ac16aa35b29de479dcb3077aeb1ac3ef3704a94fd769ef2bb06b57b0c031245e0defd8742e77a688cd33a2d80d51ecf2515c49cad
+EBUILD tree-1.7.0.ebuild 1060 BLAKE2B f5eeeafe7a06591a692a8b7f8dafbcea1cf0e10c6f073227bdad412fcd9bb6295a946787d003a50b9e12645a2c135e3601a887851e8777bf0b3a1ee528445692 SHA512 b0ac7ae78f15da79c9fb9a7b622e4715ece42f6767cd1ba4ae4f4f4c46b059956e62cc1442b8eccaa090d5a8096620056a989d7b333af1c1c10e089d9a44449d
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
index 2eb6dc1b99f9..403081c551cc 100644
--- a/app-text/tree/tree-1.7.0.ebuild
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index ac9df264c703..a220114ae1fe 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,5 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
 EBUILD xhtml1-20020801-r4.ebuild 2244 BLAKE2B 2de0b7976f3c0a2784228b32f30abf9d453729646059f5bb05ee729e48ab0eaf0257d897a083ef1e7ab2f4a4fce139203526846748e6310fa9020b85263084da SHA512 31718f3105af95a71fc688b260e7149d7fee94d8d9c3541868773407b8a130a9f19c2f693dd55c5c82b3d4f6dc4358b4f0bebe0eed62c7fe1c6c612f9ea687e3
+EBUILD xhtml1-20020801-r5.ebuild 2180 BLAKE2B f257ebd086f2f59fc286d3fe578e221799bfe13b54ffa026f0a5e4f15fcd0eb016ac00f63b5b4c1b25d357b49c99b7b434985178930455f6352b50201e8ae192 SHA512 0bba7ff7f8238383368ccffb64a7a937ff171700ec58a7528e4fd6f311ea716cb3f08c9c56eca094a3dfde4055a4da5475a07d54e75df92413db58e599dada3a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
new file mode 100644
index 000000000000..a1093ba390cc
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit sgml-catalog eutils
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
+LICENSE="W3C"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+	dev-libs/libxml2"
+RDEPEND=""
+
+xml_catalog_setup() {
+	CATALOG="${EROOT}etc/xml/catalog"
+	XMLTOOL="${EROOT}usr/bin/xmlcatalog"
+	DTDDIR="${EROOT}usr/share/sgml/${PN}"
+
+	[ -x "${XMLTOOL}" ] || return 1
+
+	return 0
+}
+
+src_prepare() {
+	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+		"/usr/share/sgml/${PN}/xhtml.soc"
+
+	epatch "${FILESDIR}"/${PN}-catalog.patch
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
+	insinto /etc/sgml
+	dodoc *.pdf *.ps
+	dohtml *.html *.png *.css
+}
+
+pkg_postinst() {
+	sgml-catalog_pkg_postinst
+	xml_catalog_setup || return
+
+	einfo "Installing xhtml1 in the global XML catalog"
+
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
+		${DTDDIR}/xhtml1-strict.dtd $CATALOG
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
+		${DTDDIR}/xhtml1-transitional.dtd $CATALOG
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
+		${DTDDIR}/xhtml1-frameset.dtd $CATALOG
+	$XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
+		${DTDDIR} $CATALOG
+	$XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
+		${DTDDIR} $CATALOG
+}
+
+pkg_postrm() {
+	sgml-catalog_pkg_postrm
+	xml_catalog_setup || return
+
+	if [ -d "$DTDDIR" ]; then
+		einfo "The xhtml1 data directory still exists."
+		einfo "No entries will be removed from the XML catalog."
+		return
+	fi
+
+	einfo "Removing xhtml1 from the global XML catalog"
+
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
+	$XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c71206c95c14..b7248769231a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 9072b4e0c37f..621a5be96460 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,7 +1,9 @@
 DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
 DIST Catch2-2.0.1.tar.gz 397154 BLAKE2B e41cb3afb706ebed5742b2639cbba9a3468b6325788c6928f8c4e307cd0b11a5fda6aa91def709536ec56412010c0865589999f1cb270630372ba3275bd36fbf SHA512 df6dc480aa208c6c39c8b36d06295883345f925b7ec579e9f0f7a68c816b90dbc3c2ece32926a6458646f7412027212f1b4c3cb28f217f411d3a56580f6edc32
-EBUILD catch-1.11.0.ebuild 729 BLAKE2B 9c52ce8e827467e77763408252f4c72448f8003dad47d3d035612dba04e58062e5dc429894927c9569adf090554de02df5ea1fa28ccc47fbfed3715e326bb00a SHA512 34875c7820d83b27feca0a96e6d3fa80c9f4a671dbd86a68c1ce3dba2c5ee60fe81aaccdaac63a43fbd1d41e7de0a8bc6fd81719378a1e90bdc35ae2891b8053
-EBUILD catch-1.9999.ebuild 560 BLAKE2B ae6c6f9128c19be10f9a61f2ef4662b771c5046803a38a7f492339c16fd8cdc58bb0857b4664c3bfef9fb8e0ed2d6b18ad1387a5f6c80f3c88f9684f1a143981 SHA512 70cb380180bbd0aa6887cca66d1291be81f0f05a93841a8ef12c764ed20fc95ae8b3f97117c6a3721b432cca6bfb272d8b7bf6826c57af171f57909502fcae8a
-EBUILD catch-2.0.1.ebuild 604 BLAKE2B 0b9fb3d54edea8ecc375b718639c644cb13fb07cd4fff4e4ac1f208d170d283b6aaca9adc33cebbd6d0ea9989a5f5a536c15fc3cc6d2db5b931e874864a53655 SHA512 287b2eb5e7b641bdb18611974f0e69e2b999cfa5e49b481ffd804fb53680750f8468c279a3137cb5cc2d810e8af1e999671e2f969387237586244c7e06cf2e63
-EBUILD catch-9999.ebuild 539 BLAKE2B 964abd6024bdb26457d8ac74ab5fe2f347cfcc758846ba05d14ea1cd8f3f1355f402b41d167ea49c336de30774698478384b304768f7e521cfcb57b4d9a006b1 SHA512 034d2afbc80114b6dfe83b3a75fc96ef3a0eaecee02fbbc1532391aae2b32b5fedca36916d01de98754b8de2849c9bf82940838bd55f026f166841d885784e80
-MISC metadata.xml 329 BLAKE2B b89c403ccccdad23fc4936aa8f2c23568ef37be7f6843d9195c6318349cb89b888b55055ca3127ed71e9b18c5ddce49f3048f87af2d287ce2e560973e1f5db61 SHA512 a6bc13d759be7cb9ff9c4b754927720ccb73268fec3d6065e3eb873bbf17f9500a50db27962b69890784ec5dfc7bcfcbadaa2c3c867c31e46dbc72a9f3a3f7b0
+DIST Catch2-2.1.0.tar.gz 475638 BLAKE2B 66c48b7fe551f066e43870465e0fb58b966243d00cfe78c22389af45cf1cf97d6b3c192cdbf6aec4046ff3744a03e0125ca3b66f7c2a47d17f5a6ce538ad8959 SHA512 1fa0d1cb607fcb8dec37437fa788868324b0ded8e929138f4167d57bafa567b64955546142699a3e3bd2aeb7d36b7c2c7c426aaf3d68b94bddd43b2f78026fc8
+EBUILD catch-1.11.0.ebuild 725 BLAKE2B 49c5034310812a931d9155d0aa3d791c30ab1f381c14bf102a26e23cd7c24ca97c4d4b7b11c8c859e665fdbd7beea44416e193ec06ad1d8e883f7459023ce3d6 SHA512 e7fa7e70cb02ab499606e656650d4ddb0c11c4990c720457dc0e21ebcee4a44e67356dfc89d3bdd0caf5e943fb5b59b5fa4ff9f2bd1963b6db20f362c1725560
+EBUILD catch-1.9999.ebuild 558 BLAKE2B bafe5cb18017202bd684d631b8839caab6bb128d8fc42d7772dd74aa91dcd99b139393fa22463536924da114fc508a92d5b49639590933397a57cab9f2159ac0 SHA512 1952c96b2fa49e674a32466f2ec709b2f92c8e2502eecb1f25c24d81d11c73e8c28cfbb1da5b7e322bbebd28d6ade06f6b157e07f47f1a06ad258c30efc118f0
+EBUILD catch-2.0.1.ebuild 600 BLAKE2B 57c2684c149adea28cf80122023e3a8140ef92e82e9523726c4377f13992f8d0c4ef812687ac2727496c8062269d1299dd12f3d3111295eb0acd551e04c2a8dc SHA512 dfad28f7a5d5379253e50ea2b7db60e9e560ace137fd28c188570b9e61d669706f6f97a0218d7ffeb6c8fe01baf52bc79855ff19fdc83f528fe437390f1bdcdb
+EBUILD catch-2.1.0.ebuild 600 BLAKE2B 57c2684c149adea28cf80122023e3a8140ef92e82e9523726c4377f13992f8d0c4ef812687ac2727496c8062269d1299dd12f3d3111295eb0acd551e04c2a8dc SHA512 dfad28f7a5d5379253e50ea2b7db60e9e560ace137fd28c188570b9e61d669706f6f97a0218d7ffeb6c8fe01baf52bc79855ff19fdc83f528fe437390f1bdcdb
+EBUILD catch-9999.ebuild 535 BLAKE2B 9082e787a9e9c3f3e511490035dbd44afa7e6ff1ecf1265b5c9becc3688f70fc19b6694e73fba7b605eb152ac435042d50358f29a7a5808774b3600081beb78f SHA512 9f18bc13b59feb24257416c805fc44a4bbefa85f073abc7e242f044c00974cc3b051eb5da69d5314588614d6ea8ae02d820129f28c9416eb86245bdb8b742252
+MISC metadata.xml 327 BLAKE2B a27a1462b8152e655ea7240d00f8281157de6c29edc8795da70ca7bbea07780db7cc61af462db35ac0d1227d74f0bcc7b1e9e7d5dfc60e43062b7f5a54dadd7e SHA512 e01e97734e655221a497409a35a7fb8c8d8566cdf08958b24afd4f278ef118214d4b4fe9d19a6da0c7e6fa2b87f41c8eccaaba59aa2a21d11d11c9934000546e
diff --git a/dev-cpp/catch/catch-1.11.0.ebuild b/dev-cpp/catch/catch-1.11.0.ebuild
index dd8e74f2615d..afc65f924e9f 100644
--- a/dev-cpp/catch/catch-1.11.0.ebuild
+++ b/dev-cpp/catch/catch-1.11.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/philsquared/Catch"
-SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index 4cad4e13c4b7..a770fcddab58 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/philsquared/Catch.git"
-EGIT_BRANCH=Catch1.x
+EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+EGIT_BRANCH="Catch1.x"
 inherit cmake-utils git-r3
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/philsquared/Catch"
+HOMEPAGE="https://github.com/catchorg/Catch2"
 SRC_URI=""
 
 LICENSE="Boost-1.0"
diff --git a/dev-cpp/catch/catch-2.0.1.ebuild b/dev-cpp/catch/catch-2.0.1.ebuild
index 309a5dc46c30..ac2dfcb10a67 100644
--- a/dev-cpp/catch/catch-2.0.1.ebuild
+++ b/dev-cpp/catch/catch-2.0.1.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils
 MY_P=${PN^}2-${PV}
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/philsquared/Catch"
-SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
diff --git a/dev-cpp/catch/catch-2.1.0.ebuild b/dev-cpp/catch/catch-2.1.0.ebuild
new file mode 100644
index 000000000000..ac2dfcb10a67
--- /dev/null
+++ b/dev-cpp/catch/catch-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P=${PN^}2-${PV}
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_SELFTEST=$(usex !test)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc -r docs/.
+}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 5a244d42728d..da181287636e 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/philsquared/Catch.git"
+EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
 inherit cmake-utils git-r3
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/philsquared/Catch"
+HOMEPAGE="https://github.com/catchorg/Catch2"
 SRC_URI=""
 
 LICENSE="Boost-1.0"
diff --git a/dev-cpp/catch/metadata.xml b/dev-cpp/catch/metadata.xml
index 800b18cb7704..d1245fb7c814 100644
--- a/dev-cpp/catch/metadata.xml
+++ b/dev-cpp/catch/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">philsquared/Catch</remote-id>
+		<remote-id type="github">catchorg/Catch2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b7f4e34943ec..b0cca40e2146 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 15c17ff48982..6ff6405b9f04 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -7,6 +7,7 @@ AUX mongodb-3.2.4-boost-1.60.patch 3352 BLAKE2B c008120ace4dc5507fd0de68caf12a79
 AUX mongodb-3.4.0-fix-scons.patch 1411 BLAKE2B 6e5975b70ec7f281ea2cd101b16ee2849762fa1dd8427522eb3b01cd1738e60ece013bf23d07c180c58af024aebd141ca7fdf80bc240701f48556da46d3787ab SHA512 2e29c91a22663259d2f5413fbb2652702bceb122899e50a8969fb82d74a64a78649e79b005e20e6640740c089b1cee19080890eb8d9344c2ce355a977146b770
 AUX mongodb-3.4.6-sysmacros-include.patch 1419 BLAKE2B f07ab093f13ea2b9675538dc99e2e58f85019edffad05bbbf3032f85f8ef881020cc9bf25bc62ca13344e7b8b7dd3b04954c76974c512a41ea5a7a2045de2b34 SHA512 ab269ec003b74848f981021f5eb09e38216d75dd9d1b8a155068b2a335d9ec9d1f5f575028ae9b4b0d8745d15e464cb05b70aabc6c28c984115574c6747afc05
 AUX mongodb-3.4.7-no-boost-check.patch 641 BLAKE2B 0dc3a426b28cd80d7b3361ff9c6747aff64dd27c1bc01a9717c2dd1c160b66f53feb72fd2ead385c220ebe92a8c7b8fa6b04fb3fa8437dba17d5f8346665f6b8 SHA512 812eaaadb6f265cfc904e8f3a7ae8276e42e3968529914179efab5e44f1951ab46ac3bbcfb259f924b20a8ca61d2ebcf72b7103ea9d5f25594ff8e9e3e85836b
+AUX mongodb-3.6.1-fix-scons.patch 1207 BLAKE2B 3c47d72eb940d67f40e4a12becb6de469255446b74aa5e0b2f27e8e0021e77f1af9cce12ae26ed0b05871e995e29d3da1eaee718997bc6de6e62838285946094 SHA512 70efb9309ff5a2415cec6ddca694c33ebaba29d5fb959ecc79907218205a10d4e7329fe48c8c8515bda83751061245d41f4fb11a5d8cd0c80c1db61217acb90e
 AUX mongodb-3.6.1-no-compass.patch 2046 BLAKE2B e6b6977b69eb297c6a6340661f906e0206c2b68a1cebfd3c7ca01b27cc05562e0909531a2488159a54db32a05ec0cc4f81b4fe675db51bf3c30d66bc9d484c0b SHA512 5a7257a3670f40453c424ae2e6d2bbe0e3d1c795b57351c24a1b48ea4134146b08310d88a47cbb0c94a0a451a2c4a3c30fb10c44a1b9203681ee9cb5240db412
 AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
 AUX mongodb.confd-r2 549 BLAKE2B b43518e43d9c2fe030887cde657fdc08cdd15349cf12cfa1f0f4f0a0db568ba2ae3e3cdec1d04953e62d87feaea6bae969be03bb2270ca31bd9ebbe5e9c79416 SHA512 75f11e8350e98b90eccafd577d794e4b05f36ede8d95e7839e9fa1eb77ea7bd9cdd2fdd07719abb78a714cd7d72109c177d265d6417ef198a4217453c0a4db68
@@ -27,7 +28,7 @@ DIST mongodb-src-r3.2.13.tar.gz 29273616 BLAKE2B 9fb9851953ef1561340bcb33cac6a2c
 DIST mongodb-src-r3.2.16.tar.gz 29293555 BLAKE2B e2863ed0210bc66fcf2c80e28668674c254e78ee750a0eb84c45569c2224157f1db65aca5296a0ed0c32ef83ab6269de25bd69dbf1f0ef54b021bb0aecd2e46a SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2
 DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512
 DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a
-DIST mongodb-src-r3.6.1.tar.gz 39996730 BLAKE2B 4d05b5bec959ff6d87913aae7a30af1cdec5d22eaf7785ec7f49e3deb5d4d92db35f278c7cddf91ed8bd3750797c0461bb7bc188214c82cecf9d3b2e43fbf6aa SHA512 ad02fac423186da725493bf82a417cf5f68b08afe91c67f007b46324dfde3d6b4c51ed8eb1a314da73563be498b844f79be66a4f5d1fb83095df6c5458bd6d1f
+DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a648fe52e69d8194998dc74453ad6766688929a80456f6cb4801f2806ac938a5dfc0407e5f46345b47a80ecce0ba03d7fde SHA512 7acfbcc68c1bd4e6e63eee09be1dfbb064be6f8b0144418105100a065f8162cafc9b776fe0429fd64c79b958561aa42d0bdef56588dda65acee27ccc98631f39
 EBUILD mongodb-3.0.14.ebuild 4559 BLAKE2B e72ff73baaa3b6a5bb4bbb33f3153d2aeaa9458b6e7f48419f5fd0f9b7fe43dfbcd93bf0824555e688faa461839a8c3cb5e4d1a24219a395f1a245828d639777 SHA512 747424cae955229f6affd867961171d9ad3fe9c34553ddb94e034db76d4e389ba0c6dc47db23c291212b893b7377d1bfac52e79ae4ab1b9dfd8f4c89743e1a19
 EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a96e1a030b5d84e0bb4c1524bacff7ed1a1576093b0336ed042f8bcbf01d37ba725392c077a400fdefc2705ec2ab SHA512 d5b77ede0ab5d9fa814542e831ec93d5854f0aaa55930c5e445410d347787be96294a741f30089764ea23cdab52413d1d82c6796b3d7133796d28de95726e294
 EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
@@ -35,5 +36,5 @@ EBUILD mongodb-3.2.13.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc08
 EBUILD mongodb-3.2.16.ebuild 5180 BLAKE2B 79f825055c4491535e1e4405af86b58650443885a6ac7e65e53f6739465be60bca9abba10ccc803cecfe93b1bf2645970f9a4e97b5dec72309ed12ddd4f1f350 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1
 EBUILD mongodb-3.2.17.ebuild 5339 BLAKE2B 44abb9bde7a946e9eb09002f0ea4c84e6cfb7161a8ad6624881268fe00d9e5d125a0d5a0dc0815d4f759e5d6fdc2160bbc88c9317848d15e551e2b165f5e1733 SHA512 bb163c16d8fceff96d1c199ee41e43ad91892a2442ea370c50c15484d80625057b5ac36e516deb0daa25325a74aeb37da7c19e0a97e3ce2a769c77933521622d
 EBUILD mongodb-3.4.10.ebuild 5240 BLAKE2B 1e1897fe9f4d929a7ae9b720aad33819cee29776b5ed34c502e421b3454daedd11bb009437e5316cfb0bf5f3d2d3f563f5c34ce946ebab26030ef96e91b1602a SHA512 001ea14c326133a4d462ce4b25db9318376f86279cdcd9edf7ce6e9f8ee4ed642576e4a0a622cda55fd31360912fdc2aa3a77068503b7dc039ca05b7abd9aa89
-EBUILD mongodb-3.6.1.ebuild 4399 BLAKE2B 32de68bd08d8ecb31d3dcded887ba053d5a564f9e8bd639e53ce5cce6c67ba974c9fe1ade84fbe17c8c6cc332e6c3eec38e5b9258aea4d3cc59041810c6f4f1b SHA512 0177d55dda560363180d9b16b4d3d01745a1e6a7e44dd0e4e3c41300de51962825f6f22f3642a001011256b7bd1bf94992143de45d51f3aa5a395f8a23a5b2e8
+EBUILD mongodb-3.6.2.ebuild 4442 BLAKE2B b62187502656f26136a95ec54db456e87cb2149305c4c5f6c0e4fe4f988c847b3909855d7f536093e7d4d4eb304d5e0322a25fff54d51a378511bbb95040e749 SHA512 3da494650e9126d3287b8dc04876bc8f8b95e49cba2ea3dc7dcad7016e43bc6062f64552e223c88c274312304b98526161151d2bf0e93a8701e6706324da8b0b
 MISC metadata.xml 1112 BLAKE2B 59da7a768ae87cb8ea3a539b40c27707b8aca5bdfd6f3acfcddca4d27a354aa5ffb13b68b7d69b57553d26d3b47860e186c5c43a38122df4712d0cc98ec1f690 SHA512 39b9bd8afc1c79382130c691154eac4338810fb4069406482648d32fd2aefd5d3697c272321d300154be2e4d37ac10f1372c62687d9c41ca0d3682b0152a53c4
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
new file mode 100644
index 000000000000..d7bfb35b00d5
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
@@ -0,0 +1,32 @@
+diff --git a/SConstruct b/SConstruct
+index fe7975b..92659a7 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1619,7 +1619,6 @@ if env.TargetOSIs('posix'):
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+     env.Append( CCFLAGS=["-fno-omit-frame-pointer",
+                          "-fno-strict-aliasing",
+-                         "-ggdb",
+                          "-pthread",
+                          "-Wall",
+                          "-Wsign-compare",
+@@ -1631,6 +1630,8 @@ if env.TargetOSIs('posix'):
+             env.Append( CCFLAGS=["-Werror"] )
+ 
+     env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
++    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+     if env.ToolchainIs('clang'):
+         env.Append( CXXFLAGS=['-Werror=unused-result'] )
+ 
+@@ -1650,8 +1651,8 @@ if env.TargetOSIs('posix'):
+ 
+     env.Append( LIBS=[] )
+ 
+-    #make scons colorgcc friendly
+-    for key in ('HOME', 'TERM'):
++    #make scons colorgcc, distcc, ccache friendly
++    for key in ('HOME', 'PATH', 'TERM'):
+         try:
+             env['ENV'][key] = os.environ[key]
+         except KeyError:
diff --git a/dev-db/mongodb/mongodb-3.6.1.ebuild b/dev-db/mongodb/mongodb-3.6.1.ebuild
deleted file mode 100644
index 363620ef0504..000000000000
--- a/dev-db/mongodb/mongodb-3.6.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8:=
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.4-series. Then upgrade to 3.6 series."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -rv src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# wiredtiger not supported on 32bit platforms #572166
-	use x86 && scons_opts+=( --wiredtiger=off )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-3.6.2.ebuild b/dev-db/mongodb/mongodb-3.6.2.ebuild
new file mode 100644
index 000000000000..8291fe7fc50d
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.4-series. Then upgrade to 3.6 series."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -rv src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# wiredtiger not supported on 32bit platforms #572166
+	use x86 && scons_opts+=( --wiredtiger=off )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 7f201cebdba7..60b1f09be8ba 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,3 +1,5 @@
 DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
+DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
 EBUILD pgadmin4-2.0-r1.ebuild 3430 BLAKE2B fb80fbc920e092ed3b39f58f0c080f41e6a358e573112f42da9db4c728a8bbec37f00a61be0eaadd19e607aa3c5b79841db80ff689404a102a51bc3ac28b118c SHA512 10d50efb96498eb3abb76943ab2a678c9b3a39935d628906a6a07b9b9d666ab6648eed4b2c4d6ecd0b4a61664dc4cf25cdeb4abc5fc55c2915a87d40e4f0975a
+EBUILD pgadmin4-2.1.ebuild 3432 BLAKE2B 150010a6b6abbd2dae6a362883a24c1b2a13a62301489ef4a6073801de25e7c6b9792beb542306393c8fe1b598dcb2125bef88e03020de0a61688edb76a78578 SHA512 493c026a3bc156a92f5253ac96aa30891d8c644463196ab603daed5cfa9536fdb99e786dd07cfaafa31b1eb782040e6711d9e8a541211aa905e57227309843fa
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-2.1.ebuild b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
new file mode 100644
index 000000000000..6f3816804830
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 qmake-utils
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-qt/qtwidgets:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwebengine:5[widgets]
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/htmlmin-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/click-6.6[${PYTHON_USEDEP}]
+	>=dev-python/extras-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-gravatar-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-htmlmin-1.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-migrate-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-paranoid-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.12[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
+	>=dev-python/mimeparse-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.11.13[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2014.10[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.6.5[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.14[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-2.0.2[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${WORKDIR}"/${P} || die
+		emake docs
+	fi
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/*
+	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	local CONFIG_DIR="/etc/xdg/pgadmin"
+	dodir "${CONFIG_DIR}"
+	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+}
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index defc72762b26..ee65541078b8 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,24 +1,10 @@
-AUX pgpool2-3.5.0-path-fix.patch 8540 BLAKE2B 7f384a93c665eb790a2c2638104fc5fba6c818a31ea789c72505fadcd4431837698b799d1fc69d1aaf1b5bbcbf6233806289e152a2b185a57b0f643a1cb8a080 SHA512 b9e5b2c3532fd9a72f19915913b0a9d721a0e714de0215ae3f5f0d978b4effa9662b1eb3cb013fdb4f18160cc7c4ed5733f3085c98770aa6407a2af384065609
 AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
 AUX pgpool2.initd 2174 BLAKE2B 153fa1d756067fd381e599447fb71d780b90bc4c187d0146b1e2806fcc1c19a85d215b59b1931373a3a95fa7e719b9cebd93756276fbeeab087f2a5ba5a1f27b SHA512 3123d2c5e7178fc4b970592fe6908df2860ca3cd5ec54d4609c28145ffc934edf6ddb11f9d2208d89d43bc4252e326b3bc0eed36a28fd2fadbaeb2d635935e40
-AUX pgpool_run_paths-3.6.4.patch 10760 BLAKE2B a5aab30ba1d0a478f4efb119117770c5713ca2ae4276637805144754f0188a7dabe70cf24338887dd6712652048e9eb3a9872d3bc3fe828f2d767fbaf07d960c SHA512 ba3bdd19e6ea9178da3eb178f72981b337c9746ddf9f27d6de51d0d3c41d3a4b6f52ed88bbbbbcc6004693ee630172649ab316d69658b25521f438c44f72b3c5
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
-DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
-DIST pgpool-II-3.5.5.tar.gz 2243184 BLAKE2B 4267991fdf45ddd0e2bf3e253508b9b18ad669d0184bcb13143dddcfe6233e4aa223ba275f9471b2645262e43341fb4c8e5ac9e154ee2fd3de49aa5420de070e SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed
-DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
-DIST pgpool-II-3.6.4.tar.gz 2623625 BLAKE2B d8ba2a02c0b7e4d4b259dcf87a85d0b3b7dd11d5121907039cb3baad52f2c40bd0ff2457e844922d04c300068f1638d26b0efdc60d828e05a735d3866365ca8c SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f
-DIST pgpool-II-3.6.5.tar.gz 2651330 BLAKE2B d0ad069b17e1e0fb46590e7dd0dd29feb499a6703056d5ff5d4f218227158f4bca44f8d52209f378d08879a97c7930f85a61dfc22fce0bafa1313ad3c7649d5b SHA512 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
-DIST pgpool-II-3.6.6.tar.gz 3171264 BLAKE2B b519d097366f190c4b6136643ccd839d1854ced0287ec1dc9f058dad1f7ebc18448d97d48338d03a8a7eafee49391381a8aa802fc14b84b757b133d6c97ec94e SHA512 02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10
-DIST pgpool-II-3.6.7.tar.gz 3188186 BLAKE2B b58561418e4027716614d6a70f5d844b8043312cb2a2b18882e0fdcd466e1f0624e43db7c67685227d808368388c6ee9dd0d5f3ea956d0585444b1e30bc49643 SHA512 4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc
 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
-EBUILD pgpool2-3.5.2.ebuild 2465 BLAKE2B 4e7d19f6ebdb02735cd58c00def5fa0b451e2878085235c5258952e18ee93e7ff21b4ba71441e100bb583530a424cd1094078cab5ac6a4c689c857b8e2c24fd9 SHA512 5f1d18669f16acdccda9eedb0a24d61705f9b9ea23130c95428ba1143ca337815e724047b9b41ee48ae7ae0599e329edd4a45ecc3ac428b95868d9990b4542bb
-EBUILD pgpool2-3.5.5.ebuild 2465 BLAKE2B d2c3ac6f7be204def3c7a7c9be6cf3aee43af6c340342197023f4001d078bdacbb0476195154989eeeb8cfa5d547d9e0a2a301bf553fbd08407a5a00bef07b49 SHA512 8cbe17265f1b698eca9386d1268dd3e07cc305efb0b4bd8cecd995656827bcb1db573094514d7f1e0b51a9a80effb70bffdc7c3c62f14fe974c468e2e3090926
-EBUILD pgpool2-3.6.1.ebuild 2396 BLAKE2B 5695231ccae6d373539da8fd54228ad1dcea17cae390a8b2b75d037fa26a5d02cfa0210a715deb2b2209daab1196f8ed574d832617adbe7c540113322021a574 SHA512 27b23a48947221074fee372c3c1708492796f1d0671d0f98272aa279c8021e491be182b7cf5f74e7ab7fa8a683a76539e60ad28ea89a79ed06984bc2e3920386
-EBUILD pgpool2-3.6.4.ebuild 2502 BLAKE2B 14ca82a4af57366f226004f2956c9a1e23798622aad40e76c76bd15cfb93e54864fda1f90f04a9bda3323eab0e1fc04a2b6e7afd272c0e375029daf421fff9d3 SHA512 2c2ebf35fd59e3d6103f7416a4f0cf2b16858773d9e12ac2d8d146af2103008792bb2c49927772e44e4558775299ab268b822f3ffa44a4e279cdd8214d47bc27
-EBUILD pgpool2-3.6.5.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
-EBUILD pgpool2-3.6.6.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
-EBUILD pgpool2-3.6.7.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
+DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
 EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 1b2fd9bcb5c00ae160e80220e22aded619d7e769de630372c13ec1d8a3bb073b76a7aaac66861af6ea41242a35ccd8ac2ed2048cdb0ab0df884063e2a574f1f1 SHA512 8733a16433afcd1684c0ac5e38a3623ff1cea9a1fe4925f80d36e9cc0a4d45ddfe8ddd9edfd0695661a2cb0ed56c7ac917fb09dc4983a4f82351626f611bb4fb
+EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B 0b2d0df464b71f63a9ab7a794a37eb0fb5a9617748ef149225552bdee4af01ae586a4a42276d93b5667f794c5f4c595b75c2f2fd9b26ce1f6ded370b02295adc SHA512 4a15fbb5fb53908a5a61c0649b8838ccaa4ca4f1f78ff411b9e30d8b2109b2069c3a430e58c849bfe4496c4894011e53350a3d5f8095f0bb138b7453b3f8c441
 EBUILD pgpool2-9999.ebuild 2440 BLAKE2B fcc37575bc095fe15b6176f351e86b97f5c5ea8385a3cd6100f3ebb4031e429b026b850c5c8b78770900e1d7fdee95e2e99190755c1b2a0204d2f37009d20bda SHA512 b2fd29cf9643d0cf093c64db9283dadcaa39fec6cca1ca8f1cb1cdd85265cbcca2fc30a52a041d2683328235c8717cead2083813f8b6365ad3465c620f0ec0a1
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch b/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
deleted file mode 100644
index b2c5d554e561..000000000000
--- a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -aruw pgpool-II-3.5.0.orig/src/include/pool.h pgpool-II-3.5.0/src/include/pool.h
---- pgpool-II-3.5.0.orig/src/include/pool.h	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/include/pool.h	2016-03-12 06:47:15.297966248 -0500
-@@ -72,16 +72,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
- 
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
- 
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
- 
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample pgpool-II-3.5.0/src/sample/pgpool.conf.sample
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample	2016-03-12 08:55:22.318087007 -0500
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave	2016-03-12 08:55:45.284665542 -0500
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication	2016-03-12 08:56:55.004397999 -0500
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream	2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream	2016-03-12 08:58:23.820723842 -0500
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -47,10 +45,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -215,10 +211,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
deleted file mode 100644
index d6943d7502e2..000000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -ru a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
---- a/src/include/parser/pg_config_manual.h	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/parser/pg_config_manual.h	2017-07-08 20:28:47.733745889 -0400
-@@ -184,7 +184,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
- 
- /*
-  * This is the default event source for Windows event log.
-diff -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h	2017-05-11 05:36:01.000000000 -0400
-+++ b/src/include/pcp/pcp_stream.h	2017-07-08 20:29:28.613506800 -0400
-@@ -48,6 +48,6 @@
- extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
- extern int pcp_flush(PCP_CONNECTION *pc);
- 
--#define UNIX_DOMAIN_PATH "/tmp"
-+#define UNIX_DOMAIN_PATH "/run/pgpool"
- 
- #endif /* PCP_STREAM_H */
-diff -ru a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/pool.h	2017-07-08 20:27:09.330984074 -0400
-@@ -73,16 +73,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/run/pgpool"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/run/postgresql"
- 
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
- 
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
- 
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample	2017-07-08 20:36:28.477717849 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -490,10 +486,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- 
-diff -ru a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
---- a/src/sample/pgpool.conf.sample-master-slave	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-master-slave	2017-07-08 20:37:17.914095382 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -489,10 +485,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- # - Virtual IP control Setting -
-diff -ru a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-replication	2017-07-08 20:37:30.384022450 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -489,10 +485,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- 
-diff -ru a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream	2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-stream	2017-07-08 20:37:44.060609128 -0400
-@@ -31,10 +31,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- 
-@@ -47,10 +45,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -211,10 +207,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -489,10 +485,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- 									# Unix domain socket path for watchdog IPC socket
--									# The Debian package defaults to
--									# /var/run/postgresql
- 									# (change requires restart)
- 
- 
diff --git a/dev-db/pgpool2/pgpool2-3.5.2.ebuild b/dev-db/pgpool2/pgpool2-3.5.2.ebuild
deleted file mode 100644
index f5c656a3a1aa..000000000000
--- a/dev-db/pgpool2/pgpool2-3.5.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser pgpool -1 -1 -1 postgres
-
-	# We need the postgres user as well so we can set the proper
-	# permissions on the sockets without getting into fights with
-	# PostgreSQL's initialization scripts.
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
-	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
-	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
-		sed 's|.*\"\(.*\)\"|\1|g')
-	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
-	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
-	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	emake -C src/sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation
-	dodoc NEWS TODO
-	use doc && dohtml -r doc/*
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin doc/{pgpool_remote_start,basebackup.sh}
-	insinto "/usr/share/${PN}"
-	doins doc/recovery.conf.sample
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.5.5.ebuild b/dev-db/pgpool2/pgpool2-3.5.5.ebuild
deleted file mode 100644
index 206325ee553c..000000000000
--- a/dev-db/pgpool2/pgpool2-3.5.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser pgpool -1 -1 -1 postgres
-
-	# We need the postgres user as well so we can set the proper
-	# permissions on the sockets without getting into fights with
-	# PostgreSQL's initialization scripts.
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
-	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
-	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
-		sed 's|.*\"\(.*\)\"|\1|g')
-	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
-	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
-	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	emake -C src/sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation
-	dodoc NEWS TODO
-	use doc && dohtml -r doc/*
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin doc/{pgpool_remote_start,basebackup.sh}
-	insinto "/usr/share/${PN}"
-	doins doc/recovery.conf.sample
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.1.ebuild b/dev-db/pgpool2/pgpool2-3.6.1.ebuild
deleted file mode 100644
index 644dc65245e6..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser pgpool -1 -1 -1 postgres
-
-	# We need the postgres user as well so we can set the proper
-	# permissions on the sockets without getting into fights with
-	# PostgreSQL's initialization scripts.
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
-	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
-	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
-		sed 's|.*\"\(.*\)\"|\1|g')
-	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
-	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
-	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
-		-i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	emake -C src/sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation
-	dodoc NEWS TODO
-	use doc && dohtml -r doc/*
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/pgpool_remote_start
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.4.ebuild b/dev-db/pgpool2/pgpool2-3.6.4.ebuild
deleted file mode 100644
index e3a92f81d557..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.4.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	if use doc ; then
-		postgres-multi_forbest emake DESTDIR="${D}" -C doc install
-	fi
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.5.ebuild b/dev-db/pgpool2/pgpool2-3.6.5.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.6.ebuild b/dev-db/pgpool2/pgpool2-3.6.6.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.7.ebuild b/dev-db/pgpool2/pgpool2-3.6.7.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use memcached && \
-		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
-	use pam && myconf+=' --with-pam'
-
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_with ssl openssl) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# Examples and extras
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.7.1.ebuild b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
new file mode 100644
index 000000000000..4a6fed48f203
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{2..6} 10 )
+
+inherit postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl:* )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index eeab596dc81a..7a54484d7c84 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,8 +1,3 @@
-AUX pgtap-pg_config_override.patch 1045 BLAKE2B e72b709ca1f565523ef96f034c80e543341f3912613ba3a7813ad02702d3378725cd94ce185ed79053cc49a948e84cfc7085eafed42c7c3891461e35b26671df SHA512 ac84f139d910a9f6394d9ceb8430b8f7c5768f9792ffad1b9b265ef4de45fc9d08b0961d04026a9a44c0c161f14e77acca52807191b3e07821a970a511a935fc
-DIST pgtap-0.93.0.zip 219355 BLAKE2B 0fc2a06bc623aa74a77905f6ee3d9c448c7863fe76098e355c478a0b663614a9e995044bad41a0671e12d2f5725ed5da5b01007b30f690ead035447a82d73e73 SHA512 6165f8bd107168a3955c3ec4c63277ce9fce31d7c375fdfe13cb31b7df71cb9aae4b20a1c2d961fba97e3ae207b45b8daf9174f0701a220e52f4ffb53dddea94
-DIST pgtap-0.97.0.zip 260089 BLAKE2B ac04be5e9e317b10ab8e944bdfc33d0444db989def18843adfa6c0238d56d041f40cbba8af62eb9152b19a397f140ff789d81c4723d2aadb39b1836f0de8e52a SHA512 8d1a87b6060e28150c580383b0151553dc9c588145a3888d1b2313770283c327bb50820eee3db8cfa5d21e4664272c1538cd3784908fd042c7e788b4558a0df5
 DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
-EBUILD pgtap-0.93.0.ebuild 1094 BLAKE2B d5e6450fba45c0e9a7c4d540c4de309b3898a1390916097975e3eb501c522ad65bda350202903469a7af6140c58c681f3a69f8e36253f49f8d22d2be1472d933 SHA512 3669d55eb1bd4a9fa30e38b2699f77ebe0c4bdd77daec4af8906188031bab8b07274dccb6a0d90ce627ab23d648bfc80a5806391c2366cfae20e2eb3facdeeb7
-EBUILD pgtap-0.97.0.ebuild 467 BLAKE2B fa84a8a231756d8e18f13c60c107185df4ee692ea921e69d8e4ae65d05f1ea20e54e781d18b8646c8daef6025883e06bd0cfed9176fbe3ec9401de17a98bb0b9 SHA512 803a340ea66b873dd932151def432ea435b28774dff15b9470165035f72def9d78a233caefd5b6f672ea5e953e11289368c5f33473bced4e1fd1d2b8540d2299
 EBUILD pgtap-0.98.0.ebuild 469 BLAKE2B f7b107484fa96f18584f832c9bb55ad6c9519dec8a1e15122b8d46eb33cce3d4b713a4362910e91fcecabf2c62c53c5530644cf0aad6207a35999a99ae8a953d SHA512 43b4e81afa83d0a34df82210a1db1dd635275c4589a47ba374b49ded125ac25d910f7837c493230689a6c519f1fa1041310631cf375687c4d600a5f2d803e735
 MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/files/pgtap-pg_config_override.patch b/dev-db/pgtap/files/pgtap-pg_config_override.patch
deleted file mode 100644
index 2034b233f00c..000000000000
--- a/dev-db/pgtap/files/pgtap-pg_config_override.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naurw pgtap-0.93.0.orig/Makefile pgtap-0.93.0/Makefile
---- pgtap-0.93.0.orig/Makefile	2013-01-28 20:14:20.000000000 +0000
-+++ pgtap-0.93.0/Makefile	2013-03-30 16:02:45.077880109 +0000
-@@ -9,14 +9,15 @@
- DOCS         = doc/pgtap.mmd
- REGRESS      = $(patsubst test/sql/%.sql,%,$(TESTS))
- REGRESS_OPTS = --inputdir=test --load-language=plpgsql
-+ifndef PG_CONFIG
- PG_CONFIG    = pg_config
-+endif
- 
- ifdef NO_PGXS
- top_builddir = ../..
- PG_CONFIG := $(top_builddir)/src/bin/pg_config/pg_config
- else
- # Run pg_config to get the PGXS Makefiles
--PG_CONFIG = pg_config
- PGXS := $(shell $(PG_CONFIG) --pgxs)
- endif
- 
-@@ -145,4 +146,3 @@
- 	MultiMarkdown.pl doc/pgtap.mmd > doc/pgtap.html
- 	./tocgen doc/pgtap.html 2> doc/toc.html
- 	perl -MPod::Simple::XHTML -E "my \$$p = Pod::Simple::XHTML->new; \$$p->html_header_tags('<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">'); \$$p->strip_verbatim_indent(sub { (my \$$i = \$$_[0]->[0]) =~ s/\\S.*//; \$$i }); \$$p->parse_from_file('`perldoc -l pg_prove`')" > doc/pg_prove.html
--
diff --git a/dev-db/pgtap/pgtap-0.93.0.ebuild b/dev-db/pgtap/pgtap-0.93.0.ebuild
deleted file mode 100644
index 1e2fc503e373..000000000000
--- a/dev-db/pgtap/pgtap-0.93.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="http://pgtap.org/"
-SRC_URI="http://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-8.4
-		dev-perl/TAP-Parser-SourceHandler-pgTAP
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/pgtap-pg_config_override.patch"
-
-	local pgslots=$(eselect --brief postgresql list)
-	local pgslot
-	for pgslot in ${pgslots} ; do
-		mkdir -p "${WORKDIR}/${pgslot}"
-		cp -R "${S}" "${WORKDIR}/${pgslot}"
-	done
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local pgslots=$(eselect --brief postgresql list)
-	local pgslot
-	for pgslot in ${pgslots} ; do
-		cd "${WORKDIR}/${pgslot}/${P}"
-		PG_CONFIG="pg_config${pgslot//.}" emake
-	done
-}
-
-src_install() {
-	local pgslots=$(eselect --brief postgresql list)
-	local pgslot
-	for pgslot in ${pgslots} ; do
-		cd "${WORKDIR}/${pgslot}/${P}"
-		PG_CONFIG="pg_config${pgslot//.}" emake DESTDIR="${D}" install
-	done
-}
diff --git a/dev-db/pgtap/pgtap-0.97.0.ebuild b/dev-db/pgtap/pgtap-0.97.0.ebuild
deleted file mode 100644
index ac184400535a..000000000000
--- a/dev-db/pgtap/pgtap-0.97.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="http://pgtap.org/"
-SRC_URI="http://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="${POSTGRES_DEP}
-		dev-perl/TAP-Parser-SourceHandler-pgTAP
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index e1f4d7dae182..f9d8c6cdb5a6 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,5 +1,7 @@
 DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fdb64adef21eb70c4991b057e31688128f50db2d6a84ab850b57ab59d50c0dd5ba06998af11ff3a5479cc9bd SHA512 758d47e041f4c7c91ad2033fb95e6d33a27b6f896077dbcb287331496e47740c31c6ba6bf7ea01ad6c1a3c3d4c5e525b268795a16f9c819f4d489d3e98fa3092
 DIST pspg-0.9.0.tar.gz 853226 BLAKE2B 7fc73a02557991c24892f47f09a4402fea691047a41ed91e0b4d3fac8fe2fbfc02530615d1123288b641dba7b1db8ba524156351e494a37ca7072853e1f028ee SHA512 a752570ab1a7bca5d69c602a2e8bc0ec92a6ce405b7170bc1a25ed2ae29b0e69fa7833979ccbb5bd1adbaad968067928f26044eef902069edfe662812e9d3edd
+DIST pspg-0.9.1.tar.gz 853229 BLAKE2B 791a8d05ac549b869a3d31578277709f17a50b9aebf3ea84ffb30199ebdda8faae6828e4f5068880fc1e74d57d88086bf363b1825789d4968ed77087561a5435 SHA512 40fb07153c36e2e170ddd1fda18a9c2e663e7995367c2ac30e136f65e07d36f812bf69f886767fa71588d548d90c47c442c0503fdc775b5f61826e60672d9d54
 EBUILD pspg-0.8.0.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
 EBUILD pspg-0.9.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
+EBUILD pspg-0.9.1.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-0.9.1.ebuild b/dev-db/pspg/pspg-0.9.1.ebuild
new file mode 100644
index 000000000000..9b1b64baa6d0
--- /dev/null
+++ b/dev-db/pspg/pspg-0.9.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index 29b9f8d4c7f3..1fbbf10b1e5c 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,9 +1,5 @@
-DIST psqlodbc-09.06.0200.tar.gz 887807 BLAKE2B e9f022189f3bf8484dbdb6ced330f288b5f2776be696531c97a121f78123032b1f16687ef9b0f76dacbd6d80da87529a0184abb7e43b18a9c39101256c0dee2c SHA512 d8e3b6c13e657b4a3435ace94e6e1265a5a1a7bcd3a1f81348ca4edcb532b66036e3595ecd7224d3104f6a3f2e02704f73c1b62d94e9879528933edef7764552
-DIST psqlodbc-09.06.0300.tar.gz 898065 BLAKE2B 736a718ddc207a136dc443141ddca0b8bb341b495bd6e9d395b6ebac84edd8f0d131b9addf57413390f378eb785ee7706e321bc9f84b586612d1192e4f74300e SHA512 c7e31138888307bd25ff80c0796deb653a1e8f57af85ff91f9f307c2b3b683d9d8bc4b18a837dc604a9f896f85ee489a6678a2a69782258b17bdb9d2911e968c
-DIST psqlodbc-09.06.0310.tar.gz 898154 BLAKE2B 305c6aedd445f5e1aedadc08e875479eaebc90d60b2210a5afe9f4d224b495f98896e7131c543683200b04ace5d8ffbede15b9dee19c557995116378ff3d5aac SHA512 ccd6536a4065428d906be74c4381471c01b386668be3746daabaa9a9b8ef6fb09c42e400fe1207b6e3336b8625716b6bd9a61e9b88080f4f7cd233e96cb55f8a
 DIST psqlodbc-10.00.0000.tar.gz 914115 BLAKE2B 3f1753a43b4707c0cb723df756b3d9a0177452231fd950a7bec4e5fc35bcd03012f64d2e0b64c1f7cdae375d2ff9211272537c6a76e044fcb3ac277752dff9a5 SHA512 95898b0030778f2f002b0820180de7261387cd7161231a000523ab84f3aa106436a4e6598b40936ab313a5cf578657548f833f58791eba50160c40be4ef3d275
-EBUILD psqlodbc-09.06.0200.ebuild 718 BLAKE2B 019fb51705771bcb54c0e39f338e60f20d19f0becccfc08eeb74a0319d8be1c149c2abc7a2de6e0d48f1bd73ed6bf342b4d27186edb63033e7ae6bbeb1dcd1e0 SHA512 523f1939b1136ae7baa1b23ad99d5643b19edc7ad8815681e7cb1ad19e7499a2cdc33c7c8f3255531a7d1115db909196b1d85261b419d2e0a3d623fb56179c83
-EBUILD psqlodbc-09.06.0300.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
-EBUILD psqlodbc-09.06.0310.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
+DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
 EBUILD psqlodbc-10.00.0000.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
+EBUILD psqlodbc-10.01.0000.ebuild 684 BLAKE2B 07f0532b350973ec74283caea9f698980e90bb3448d7611805b2847c2c44b1ac13fba5beb7fc833bf04d7f042956fbfd8ac69a147c7c3e64146ab9ffce46a282 SHA512 2ea7c9c760d05f9e4f981d7ee410bc1e668994ed4971a421a8c3059b2f8ab741c3ecbc905d08861d5f66e09d4fb0f39c6851030e72eaec36c3d631fa09d9fb95
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-09.06.0200.ebuild b/dev-db/psqlodbc/psqlodbc-09.06.0200.ebuild
deleted file mode 100644
index 1b84488b8768..000000000000
--- a/dev-db/psqlodbc/psqlodbc-09.06.0200.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"
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads unicode"
-
-DEPEND="dev-db/postgresql:*[ssl?]
-		!iodbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_with iodbc) \
-		$(use_with !iodbc unixodbc) \
-		$(use_enable threads pthreads) \
-		$(use_enable unicode)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc readme.txt
-	use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-09.06.0300.ebuild b/dev-db/psqlodbc/psqlodbc-09.06.0300.ebuild
deleted file mode 100644
index 0db49481b159..000000000000
--- a/dev-db/psqlodbc/psqlodbc-09.06.0300.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"
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads"
-
-DEPEND="dev-db/postgresql:*[ssl?]
-		!iodbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_with iodbc) \
-		$(use_with !iodbc unixodbc) \
-		$(use_enable threads pthreads)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc readme.txt
-	use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild b/dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild
deleted file mode 100644
index 0db49481b159..000000000000
--- a/dev-db/psqlodbc/psqlodbc-09.06.0310.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"
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads"
-
-DEPEND="dev-db/postgresql:*[ssl?]
-		!iodbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_with iodbc) \
-		$(use_with !iodbc unixodbc) \
-		$(use_enable threads pthreads)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc readme.txt
-	use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
new file mode 100644
index 000000000000..a7d8360210f1
--- /dev/null
+++ b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Official ODBC driver for PostgreSQL"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc iodbc ssl threads"
+
+DEPEND="dev-db/postgresql:*[ssl?]
+		!iodbc? ( dev-db/unixODBC )
+		iodbc? ( dev-db/libiodbc )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_with iodbc) \
+		$(use_with !iodbc unixodbc) \
+		$(use_enable threads pthreads)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc readme.txt
+	use doc && dodoc docs/*{html,jpg,txt}
+}
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index cc1ae0284818..a8c6047cea52 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,9 +1,9 @@
 AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
-DIST sqldeveloper-4.0.2.15.21-no-jre.zip 235443867 SHA256 b23aca1d256002cdc19a0b3136ae13ebf9064feacc45a131be229a88fe9faed7 SHA512 e67b0f3d127adbc6cb77b3eb822834a6c41be7039c54eceb85e8c882704684a02dd036f078408192ad2cbcb963dfb0ba583e99a9f7b7db36b1e9a1f96e555880 WHIRLPOOL 31b32713f116193036dc5dd9b63c9b6c321763e2273227c51d70bd3db93575e4f12150a045f8615fb6086ee1d464af4d112be5824f9bf22b4f5917ae5a15b724
-DIST sqldeveloper-4.1.3.20.78-no-jre.zip 331401110 SHA256 10caec7183f4075033598faf272d2be82207261442abf3bc3bd899246968b8de SHA512 828a751bc9df7bdc59f9b89b317189826e328671d081df24d39a102aeefaf5a0a56e01e066802da1ee92617bf1fdb77ad598b448043dd7f4239f2103efb4427b WHIRLPOOL 8eee4fbc34617f721893ab880be9c7c27ac8d5378491ba97bcd0084660ad500e2c0e4812ea5b25f8cd907e2c689168af08bbccfdc0b51f04cc0d74bf0760e009
-DIST sqldeveloper-4.1.5.21.78-no-jre.zip 349775471 SHA256 1b6a5ea4f12306eaa41e4ad961d2cae4e4ccbdcb4b89d85f3d8f88a883f06967 SHA512 06535a2d60ce140fa08cf937e9bb38d0a8ecefcb1b68675b547d4682c2e514ba62121e4363cf655c10de149e39a5e7d1d4a61c8cf79d7388b2998bf9b0098601 WHIRLPOOL ceb60934100a9184c734d2d07bdde752a384f807934186f54618479de6af19a114a879edee52214bce71509e4b2a22dca8fa988f4f91202d29bceaaf8cbe67e9
-DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 SHA256 866042c85f66ef022c256d726b4e2e0e8014be7b41346cfd84a56fe677d78b6a SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874 WHIRLPOOL 695130acfed58678d92521cc86a6b6aaa51d400c6bec61b6e95eecb156cc4925483a2f687b2b942fb88dfbc7440a02d0444a9a4d242258ebad605a5fa589afbf
+DIST sqldeveloper-4.0.2.15.21-no-jre.zip 235443867 BLAKE2B 41982f06998653c6dc67ea368fc244646b93ba83f7b02e58a4f172b5b2fd613873f1eb4a5f9f01f0a6b2c412f558fc9cb1e4efb2de75bfc3b7a43816a247d1f8 SHA512 e67b0f3d127adbc6cb77b3eb822834a6c41be7039c54eceb85e8c882704684a02dd036f078408192ad2cbcb963dfb0ba583e99a9f7b7db36b1e9a1f96e555880
+DIST sqldeveloper-4.1.3.20.78-no-jre.zip 331401110 BLAKE2B e4bd3e660bcc0a131d9c2cc0bc4b49c8b4e6051b7162e38e86105d30931d2207767ec1ea38eaa61dad31804802c2a010f70f752700f9eb52a5e9bbf936b957f6 SHA512 828a751bc9df7bdc59f9b89b317189826e328671d081df24d39a102aeefaf5a0a56e01e066802da1ee92617bf1fdb77ad598b448043dd7f4239f2103efb4427b
+DIST sqldeveloper-4.1.5.21.78-no-jre.zip 349775471 BLAKE2B 87a4288b493306971f9aee490223843d76ed2c19c5353a3021295ddf13de6b552e3a8c03f4fd48d8150583982942f205ae261c0f4b41ba146de3c785560d039a SHA512 06535a2d60ce140fa08cf937e9bb38d0a8ecefcb1b68675b547d4682c2e514ba62121e4363cf655c10de149e39a5e7d1d4a61c8cf79d7388b2998bf9b0098601
+DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
 EBUILD sqldeveloper-4.0.2.15.21.ebuild 2996 BLAKE2B 83bbeb25044d805ae355e08440be4ee4580d0046e0ed23df186649d3e614ac309e714d292d39ba488b54855a7822a6129d7bcc1f81aa72c13d9c866a29d2a02f SHA512 3bc5b623272f8da7b2d3af934bd3a767aab54145a76693b1f3cf57d30da80e0ce986ce4068a7bbae57c01c59ec0e992e35dc14303d5b07dc8101c078afbb859f
 EBUILD sqldeveloper-4.1.3.20.78-r1.ebuild 3192 BLAKE2B 8796cf35f38a845f3032d65976929a344ebca2939d30d5b5e69455e3d6e8441fe6aa5385b6db46805c28328b08c8ba17457249df7402d42ff16ddef75737c0c2 SHA512 6eb54e872d31ede49c537c625590d4be515a2d33b63027b71756709731eb2d9ceff6665dc5b31bf51f62a72bb13e174a3ef0306981790f69438cb1c8fec075e0
 EBUILD sqldeveloper-4.1.5.21.78.ebuild 3192 BLAKE2B 8796cf35f38a845f3032d65976929a344ebca2939d30d5b5e69455e3d6e8441fe6aa5385b6db46805c28328b08c8ba17457249df7402d42ff16ddef75737c0c2 SHA512 6eb54e872d31ede49c537c625590d4be515a2d33b63027b71756709731eb2d9ceff6665dc5b31bf51f62a72bb13e174a3ef0306981790f69438cb1c8fec075e0
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 072004acf205..ea95ef618d40 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 817f7a10cc4a..fdb67c42e654 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,5 +2,6 @@ AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb
 DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
 EBUILD commons-collections-3.2.1-r1.ebuild 1738 BLAKE2B 833bacda17d6bfb63dcd247ab2334f477a209bd583f4b6d0b61e3bda9bdae43644fa1e9359b6414d7c2ba38c443e1aab6b4dbc406b19d6ae8d094d67fbed2508 SHA512 ae2dcd035e5c0e596efb656add167b5047b424f14546dedcfb0f52bd0a5bdc6e2a568211b0b57f57735eb018f8ce55f10087a0b43ddbbe3d1d5bb0be09dcd731
-EBUILD commons-collections-4.1.ebuild 1179 BLAKE2B 3c5afe7ab9aeb665fbc8335faaa560c29dcd923421821213ae889a9578197fdc3f371cc0815e6a6f9843dde4ddd24e4a6e9ae5571622f91e4e4e5cd0758a6e3c SHA512 559c778ec39cbcad397664094bf4ba3e7f52e6331cb8a069ee3205c24f75d2a270f822e83edf07591083d14845b68ce59fd4e9fa0c9ad56ca7a49bc1b494f77a
+EBUILD commons-collections-3.2.1-r2.ebuild 1304 BLAKE2B b2dfdf67c6912c8c9c277058a91595df2feb545d017cb686f9ba92f4a222f04990fd38a48242d8ae7efe86ca9f282d182f603b587bdf9d836d5251d7d576e660 SHA512 274ef26224a9a615c634cd75c86aa519df78ec0bc1dc35f0ca80f6213280454eaa67a33f9bcdd64e068bdda34e58529df8a9449b5cb24c720120b0f65a2f5025
+EBUILD commons-collections-4.1.ebuild 1182 BLAKE2B c127dfbfc2dcab974143e7efb1a5eee63e2472b81f2a75b8eff8d011d8b6528e023326aec74de1447bec9acdfb330e91ee19b949941dd33939333965291eb7c2 SHA512 e55765f2d3896a45f064cbaecb05b90d5a8bc9004055ca22629428b6778c62584a0ce3264cd3285edbcd5cfe7ce10559cd24f202b55d6e2a718948142a717605
 MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..9c732bfc5386
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local antflags
+	if use test; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	java-pkg_dohtml *.html
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 3f442ecfe0e9..bd84b509220a 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,21 +11,24 @@ SLOT="4"
 MY_P="${PN}${SLOT}-${PV}"
 
 DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="http://commons.apache.org/collections/"
+HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
+DEPEND="
+	>=virtual/jdk-1.7
 	test? (
 		dev-java/easymock:3.2
 		dev-java/junit:4
 	)"
 
+RDEPEND="
+	>=virtual/jre-1.7"
+
 S="${WORKDIR}/${MY_P}-src"
+
 JAVA_SRC_DIR="src/main/java"
 
 src_install() {
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b375f21cf858..6becc34db457 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index c9c5b6ba6373..9efcde87f46c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -18,7 +18,7 @@ DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed
 DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e78867003847637e3730df7f3df252cd13370b71b8c724e4dcc9c0851a8e224402ba6880a1ac666521a64b9053a7e4c2 SHA512 00de89c4b4dbef4aede397c541ef5b9c5b1c2b8fecc7ea4b8d5d133dcceb65da6e834ff28609e7865d24e563f050de25c72ce3a88a162d8c88e87524aac5217f
 EBUILD perl-5.24.1-r2.ebuild 17081 BLAKE2B 3f2b034a7d0f6d8ecffd137e878f70fd2ea799b2808668a7b1d4b2087f91a7df272083a954cc849717d30bd0a52a0261916969bc31f8493bbbd54151445a13f3 SHA512 7c46c1b392371db63a03d2174613cc008f50045f3a50693034853a2c809b59c8dbef7b36a00f2be20d5f09aae62760365c32d9268d770d49a20a9b191af0ecac
 EBUILD perl-5.24.2.ebuild 17076 BLAKE2B e9f0500f185c2e281aadb4a7025a478895946e8f4adcdd32bf27709e60387c523d07c00f4456e213a52304f3ec027d1432d13a823b52251ef4457dacbc4c08d3 SHA512 c6bafe77fe764ed6a318a731ee4240e31b1555afb45a416bf2e9eb650d680ea618f37b5dafdccdfd34e2676e5f1e3f1fbc8d4757d6694149a733b6f81f4251ea
-EBUILD perl-5.24.3.ebuild 17074 BLAKE2B d257e40d013889ebd6068960c23ac916e40340a363a165fbdcee6130078e565e3ea84cf86427add1a39fc17c99ce1fc3f38992daa60fb642ba2ca20162a01541 SHA512 bdc76815509e6d099fc3b8e5a56ce2b9eb6a621f8e6c7bd6a6afc1b31008d7b0adc4a6c126013eb6fcfa3959e421f44ece6d800e48d39acea49c5e374415de60
+EBUILD perl-5.24.3.ebuild 17070 BLAKE2B 9e99b0f9064e85d7dbd935cc3ad72b91be4ea248cd1d74fcd2f4ec93ebcffeef3ad1c94a03c0b9a36ac9956496283891bd95421aa003eef0e1b22173deaa736a SHA512 150e72fbb0c05884b2c63e62cc76f42aa1f9f6e684f0d7bcb1169e80f970bef8aab5b3f9f82c6f81a54ad9232f72e2b3bff09927de57b60f1d6b835c012551e4
 EBUILD perl-5.26.0.ebuild 17878 BLAKE2B e49c729dcdf208399fdefeddc97e4e2ac57d289bb433b3ef0c2176f850dbb44477ac5b1e9c2b66fdbc0466c9a5c335c5f001f565e0fe3fe4f43a2790669e2105 SHA512 574fce3abb6a2ca762a4db9b9deb36906980d5d3c8a1c99cbd3761871e423a1bcd678c513e8d728359acfbccef67253743d48c14e544b4498f724e24ad965609
 EBUILD perl-5.26.1-r1.ebuild 19253 BLAKE2B 3d192d2a79bb036593ba46bc02fa901ddfbf4b4e53692f6635fe4f94b530888aab7d5e82b3cd47a74c24828052e53647373d71749b0fce61d0756972500ca8b0 SHA512 650d1573aaf99c30f5df0cb1ca8830cdf23e43b2a20acc0b3d75a52777f5b69df874894e929802c728bdfa6c6a7017f379ee56745b1dcf43862c66564345c5a1
 EBUILD perl-5.26.1.ebuild 18983 BLAKE2B ef92b27b06f0866a1e7e7a3d35f87d8378e1d6df1a42ab68e03682c978f35429f83f23beef2921a214382ecd84e706bddb4a49d1a218d5dc133b71f15faa327c SHA512 903eee39e82711ff898fc7b3628bd06baf7d5ce6ca0b685b7852991755cf7779cc869e076a14a13293eab549d60453026411d3dc2b277873184975ff9ff491c4
diff --git a/dev-lang/perl/perl-5.24.3.ebuild b/dev-lang/perl/perl-5.24.3.ebuild
index 9dd1429c6169..9d55fd96aa80 100644
--- a/dev-lang/perl/perl-5.24.3.ebuild
+++ b/dev-lang/perl/perl-5.24.3.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e0fb57f6bc32..7f3cf353aa47 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -27,6 +27,6 @@ EBUILD python-2.7.14-r1.ebuild 10796 BLAKE2B 705db175a906c0087f462d4b7ed94ebfbf8
 EBUILD python-3.4.5-r1.ebuild 10670 BLAKE2B 2db50ef10323f864a5831813c65b180ffa5d4844ad680c21ad930ca517120941ad87d1f43e2734a8f6d8fd1c22fc1e6d84c397dfcf960df4eddf6bf22ce384de SHA512 efd34ae63f759f234b250e23c1ca6fa996dece9fe8da70cf496787dd52b20fd358f0d268985dd768a696769c3b61a184d98c460c96973b9e775dd5c4c9a677c1
 EBUILD python-3.4.6-r1.ebuild 10604 BLAKE2B cea6146a6b8643d1ba8def78647a83ee25bb055b9605c0f3d214220500034c7a412955fa8047a058e383dbcb832ddd1300ee2ff7a05b37d7dc7fa831d6631c5b SHA512 4aea9eed7fa7806d5eb8f51253c9665b6b887ed187db39959a42a99da2e4ef259109c1442886156019790b8f83c4a63dfb9e5ff33df318a9ec75521d02336359
 EBUILD python-3.5.4-r1.ebuild 10731 BLAKE2B dd485c532b73233127163845467691c73c53b65979376715d18b711ee787db78db869b0f09c00492981376cbecc204315af605a683972e9b408a0f6751f22f46 SHA512 13e023ca09f35188c2858f7fde9dd71e4fee35be808d2719706b60892d4f8d989baaea332e174ead6b4e6fde8259c52421ffa08473347ae8920b93cfd704119a
-EBUILD python-3.6.3-r1.ebuild 10168 BLAKE2B 5c6da641f831b9ca0961db60b59132cea2d660f6c7030cbe92cdc1bbdcc0ed102d702d1e47f9a633737ae8928d28b51efb9a22bb5d2ca7599f53691f8c863a32 SHA512 2e5a90a7a36a6de21d5cde8c606aac0106b3e0a0503a78fe00177d2cdda8802737f9db5683c552170decf8520f1f2f9d3bab2940c20336368d62d8a36f9bf5df
+EBUILD python-3.6.3-r1.ebuild 10164 BLAKE2B ebda210c0646c6a4f0b633b7c90b96bb53be52d5559164cf43d8ea6e58c994d3d848439a0ab538fd7ac580a41aebb1862e8635f0afd59a7a6047a3b76342ce45 SHA512 ef5efb5459cb6fd5d542010799533e30a64eacf0074eca562e571c493a97a0ae51544a42332ebf0cdc25c33397ab272df478a180871c15fe37bc512c5a6d6ae5
 EBUILD python-3.6.4.ebuild 10095 BLAKE2B 1ffeae9ed685b550c0828905ff313e159b6eb0c3ce90e4de2fdc8d3d069723d2cf3ca8433cfb5505c50ca718c5bd6c2723cf01bf433655fda4b64dc54570c412 SHA512 b70f8be85568c444c42f0e6e9827c47a5712add30749e4aa2d8417e2f6a12d1d7f9571a26cc0e011e5ed30418711dc024b8555cb2d87147fdf60fa94f547854f
 MISC metadata.xml 738 BLAKE2B 464af9b051fa52c8d7f632163a0ea51e356f79d5f0a2ba82c8ac70ef2ebf5ea489bb0d5371ebd954ee0d5b07fc86b8497be3aa2f660929eb09c4a0222a6cf704 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847
diff --git a/dev-lang/python/python-3.6.3-r1.ebuild b/dev-lang/python/python-3.6.3-r1.ebuild
index d904618dc9af..d94998bb2402 100644
--- a/dev-lang/python/python-3.6.3-r1.ebuild
+++ b/dev-lang/python/python-3.6.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 0abcf4db0fcc..25e1a033c208 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,3 +1,4 @@
+AUX moz38-dont-hardcode-libc-soname.patch 637 BLAKE2B d78f53814955c3e0842040f47330d8216b3f496574fadc045294b534f2ec7d049b14564cb495c37ae2d084db2f5671e447d1d98aa19a367f8b96ec97201b4f30 SHA512 f3d447996da3bf445f082a0b5c3018eb618b6b08a49bc43f275dc6cc77d7d906928e99264378472e96213df8f8b5d279a0af72d9d6a0a3417b266d7752c7f1fd
 AUX spidermonkey-52-baseconfig.patch 963 BLAKE2B 4652a28774677933a2974b50336ca772908892097b533a6c13f943a9179d8112e004e4aeba336e9e5565f165d6dee5d424a68d80896f66b8a69632f570f2199d SHA512 22870d6ee8a0a0b4359d78173aef0ade49063bfad495fd40815852684a1cdf17f9f50585e0d693eb712c2a2225ea43c4387cf454f3b9bd39e01899f3936775f1
 AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec5f3fb4c108278a8b71b57ce71644184bc4e19188059f6cb9c164ab87877605028241ed0b68a1447414f1aa0f5453fa26a603ecd4f6a6 SHA512 5d178b68cf0744da874624da79cd31555bd882aed205e697a3f0bfc3cb91a149d74da79b7af5883ea5a23e1d1692753ebfda0d83e7a25ac000105849db5c1548
 DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
@@ -19,7 +20,7 @@ EBUILD spidermonkey-17.0.0-r4.ebuild 3546 BLAKE2B 0cf5236b5ee991dc161633db218d42
 EBUILD spidermonkey-17.0.0-r5.ebuild 3564 BLAKE2B 94cb60c2e53143a50fb98e2f6e572fa354d22b87469a8ba4487891d3864672b0e315fbb4cbbc03fb1fdf203e9adc7fecbcafe5ca63535adb03890788673a5156 SHA512 1032e8cb002b43ca41b585a9f20865dfeea6750056df6a468bec9f3f7c78b4c707654787f4a2bc9368b3ce4a81b3be72ab6d1fe7bdccb37048b73fadb8343f6c
 EBUILD spidermonkey-24.2.0-r3.ebuild 4015 BLAKE2B 6608e66e03d2b606dc0117a46b462778468ac3697e64c44aa8a102c830f32c17e12c8458b2f43b05cf90306e7331407686959141078001534d1e33607d89e1ae SHA512 d715cf8f6ceb2139c14502ebe4c01a5a949fa59937737529dd9a5074444e1c25a2379018d740af2bb2cf99bbb3e35280bc88e68a44fa95d49d24e73f1843f003
 EBUILD spidermonkey-24.2.0-r4.ebuild 3991 BLAKE2B b7d253dbcedbddd3ae9738465101a4c6982381f037af2f0a78a9ca8f7b744f62777b4018b0d7728025153b8e0b6b2f6d5f78efb437835e12539802dff34e72ca SHA512 679ca189b9d1fbb9c6a6a56fe1b0ad7ad754df37f69c5194c522bde089cc1a5863d21e35c9ef2651812fbaa1233944296a3fb59852274625d79dd94ccf27c653
-EBUILD spidermonkey-38.2.1_rc0.ebuild 3813 BLAKE2B bd71913f2fe51f8a2ff3394430517b4d9923adbc7873fa073fa13746d02adb97d7fc3df7ace509859ffb2ed65c5b9f1dd02645cbc60d569b143960a4b4eb10ce SHA512 aa7b7cb2258a46338fb25b5ccb7f9c82b5cb97be192ef38e81adc6d0eaf676e73e65b80f48ed0c4f1bd0da020a529ad99a94a8c0458d48c06f7ab0b29a454a79
+EBUILD spidermonkey-38.2.1_rc0.ebuild 3869 BLAKE2B 745ac2159448b848b242bddc66df7184aeca7a5016e78006f8c45305d26bc599b37bfb29ca87502564567674e0e6f5aa03a998c7f370aa20beb059f8b5b9903d SHA512 bb728b4e9237df7fc2d093842635bdc5f7d2426479206e9d83907fbd4d2f1aa40a25c5c321d0e9b5dd0ac4f03601a8a9c0f6cbfdbe94792da78eccf55b78bacd
 EBUILD spidermonkey-45.0.2.ebuild 3905 BLAKE2B 9bd9a00eb41ac4f61da71b3feed187d1a70a2b4487f305580732ad734e91bf512dba6f8a7a5889814982e70ce25c9c9b0be8b87f05dacef7edfa2e08b53ada3c SHA512 a9a39994674ecdf1a974fbcc20f8c94e1f1f168db4095ba8c21a9d2fd01a6dbd0a59c932419c6b5f6c42b9bd7cc8b2aeaeb81973663a44b23372ea331b65d5db
 EBUILD spidermonkey-52.4.0_pre20171003-r1.ebuild 3868 BLAKE2B 3c4315cd6c23dffad04093eae078ea3e9878b0a4284aec1baca43617816fdbb3ee711e3c49998041b67f097837d8ce14317ee8eb2aff8bc5ad8376c87f955eae SHA512 5dcddaf5debdee01c4dab41b5088cf4f5375ba7c2f35f35c91f65dce0c3d1db74ce17955effc5002c8147e37fbb873b6a7d2242c0794ee98052e40e9c68b4f11
 MISC metadata.xml 906 BLAKE2B 8557bb4bfdce358f543be3ff571177d61beb5713ba6fa4c24c8e91522ca30f8c5b1bf42abd0324164cc6febd04d07c1ae3a311d6d68d62992be6368c20650ca9 SHA512 a411a781913fe81801799d4d801645fd8029ee4fb727431589cb948f97464edd828b8d86969b2207880432db8e8e627fad829fd95394fa121bb0ae97ae8249b0
diff --git a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch
new file mode 100644
index 000000000000..708c7496975f
--- /dev/null
+++ b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch
@@ -0,0 +1,15 @@
+--- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py	2018-01-12 12:21:16.764318254 -0500
++++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py	2018-01-12 12:22:23.392069398 -0500
+@@ -93,10 +93,11 @@
+ 
+ if info['os'] == 'linux':
+     import ctypes
++    import ctypes.util
+     import errno
+     PR_SET_SECCOMP = 22
+     SECCOMP_MODE_FILTER = 2
+-    ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
++    ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
+     info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT
+ else:
+     info['has_sandbox'] = True
diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
index 476c5c40b785..6b3861a9c18f 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
@@ -42,7 +42,8 @@ src_prepare() {
 		"${WORKDIR}"/sm38/mozjs38-fix-tracelogger.patch \
 		"${WORKDIR}"/sm38/mozjs38-copy-headers.patch \
 		"${WORKDIR}"/sm38/mozjs38-pkg-config-version.patch \
-		"${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch
+		"${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch \
+		"${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch
 
 	eapply_user
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3be4b44e86a0..d9a308cb0a05 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 4819b63cda84..4808bbd2f36e 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,6 +2,6 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33
 DIST elfutils-0.169.tar.bz2 8067758 BLAKE2B cf4c11619442fe19a5df95b79546af879771890b069de44743440ca5f6b44ac471125cce21fb4b1533d5265760e9fdf2ea3371c36bca39713c3e587987b69cd9 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 EBUILD elfutils-0.169-r1.ebuild 1807 BLAKE2B 3740f463d0df20cc0cc706f0ebdcc5785b6a1e3eef60722cbf322e073c21130fce50db293df352549a9eb1f1a26104b1c79e8b8e1d56f0cafada1887bdde2f66 SHA512 5ae2adb8d3263555993d269e015985e40a1d979bd65ee3731168455babc0c16169a3c32cbc1ef237db92edca74cb45d50b327721fd11cb5c1ad0a028cc5d1538
-EBUILD elfutils-0.170-r1.ebuild 1807 BLAKE2B 5674dc6de2bca1cd5bde706893c6092e03bdf111b5b8ae95262e73175ddffe0154e593476a90fa7f5643a22e2c9f9111f5c670f5cf0cfa05c4e7e7d9950af8dd SHA512 133ae942d2d7f0a81284545db5b9c30448c79b4d99d3ef07475b446927caf48d8b04b68f53c5bb78befcf0864f38d5995843b2c733e0ff13ae32092d02584ca1
+EBUILD elfutils-0.170-r1.ebuild 1804 BLAKE2B aef0de1b9d2f1c273a8f83e46c21fb86b06a8b8aaa07c1f7ffa70470ef2d54029e558367fe904dc89077fe6aaf8e5b80ca79243ba969dc6b9bd22469719e5be1 SHA512 eb077affbed83d53459480308126cb8ffdda5455544d912b85dc56f1467a9316b64511f17be06251967f78320c33394abeebbdcae6a47c1a7e1a68c521255fa1
 EBUILD elfutils-0.170.ebuild 1811 BLAKE2B 460aafa4c30eecc5cebae1409280fd9a334f8c9dc3ebcbc96903eebe69805ab62668d1b467427e9feea035ce564aff0bbf1be195f78d63c7e49b0f8359cbccb1 SHA512 c86b7cf333da96fb7704aacf2bb836a42dabfb30d3aec60fcfa524b96ce549607b4ad25aee69f1fde9753cf7b8b82bb4590ed15a2980fc0329be7629476a37d8
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.170-r1.ebuild b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
index b01d0ec89fdf..b381a17195a7 100644
--- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 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="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 5952f4f2dc4c..c8244bc63be9 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,5 @@
 DIST flatbuffers-1.7.1.tar.gz 475449 BLAKE2B eb5030cb899e579d7e875cb934c691af2711628c91f398407babb92c9c0e68aaf399d9c15d3ae0a229516fb438eb3332ded576c3ffb07a906a063b80d4dcf1fc SHA512 57732fc352c216c4be6d3237f93b872abf9dd2b62361d7d2856f99804a178760e4665ead2e33d5acdd00984ad03a746f581c9784ece583e1b2df1a10776f967a
+DIST flatbuffers-1.8.0.tar.gz 616362 BLAKE2B 545b568fbc1671005c351ba255f9dc2b5f97b618eae13bc74b717d1e08875e465a0afd3965b35ec8243c1dc80223fdab7f15abbfb4196a129700e4a1532a8965 SHA512 8f6c84caa6456418fc751ea9de456dd37378b3239d1a41d2205140e7b19a5b8b2e342a22dc8d7fdd0c36878455e9d7401cc6438d3b771f7875e8fcfe7bbd52f1
 EBUILD flatbuffers-1.7.1.ebuild 757 BLAKE2B fffd60fe03499cf34b4827db34382fb3257676a1b29e1f675a006771dda2bae56c86370f0e10b113035868a2349e2609e10e82c949545a9da5580fe30825605f SHA512 a501a99c56475eba20f9d726ce4215ae61f1165b5185fde26461757ae0a77c6fafd73e51b6e59db2a3746f972a8a81ff3cc8256384d50f52d3825198b72869c2
+EBUILD flatbuffers-1.8.0.ebuild 632 BLAKE2B 7bc57afcf6aadcf6e36dd6368561ddf88a2d5c5b132a9a8c9f01219f80217737e5b05997004e2b4d098660c922518d27af445aea663b293f9f38447089e50cd5 SHA512 8db440b05ecc3c1dfc9264ab73d58ed3aedbda8f28c87231c40549811b58e8295cc23a175ff53e5236656fad52e3ae68a67334494b800396ba633793f05b13fe
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.8.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.8.0.ebuild
new file mode 100644
index 000000000000..f5dd8c45be0b
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+src_configure() {
+	append-cppflags -std=c++11
+
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/gecode/Manifest b/dev-libs/gecode/Manifest
index aaaa2cf8b511..2d9ea6a788b3 100644
--- a/dev-libs/gecode/Manifest
+++ b/dev-libs/gecode/Manifest
@@ -1,6 +1,6 @@
 AUX gecode-4.4.0-no-examples.patch 463 BLAKE2B af3a815d3499a4cce304d8d42afcf6a9c134a52156f4d97c7f3d8066c724427f5b4b74aa7fac9578c08578b396e5688a049b01c88ddd2620f3dd64696c9595e9 SHA512 bf9b4fb44338ffdb6be6bc6bf601697bbf8a7d7f2518c753dff8306f58af1d4c03024785d1d47446518364eb485791c2b245f7ec6e8ff63aa0a37e9f8656d61b
 DIST gecode-3.7.3.tar.gz 1643336 BLAKE2B bf36fec6ee7f9f76be578de084f6d5c60afb9c01e6d66dcb6e7f35e0105fbf3be9017f8377f09a00502bcd4bc02f97083d23ceb42de16f5361c388fa332f9dba SHA512 292bafeaca3911b8af40d7c0f425cf0263f4408afad47f4f229a821ce89d06dc69ad1feeeef72531a1e711d797d249581b67c2d9cfdc9e544240012c838d2a5b
 DIST gecode-4.4.0.tar.gz 2889186 BLAKE2B b98692f841f8af292371b222c5dd8fda771eee48664e415daa84fd34c6430276fbc96c127491c8eb0fb86c1744f4137ecd1556420ddddc72af70ff0712999bd7 SHA512 5189a3c5f9f34371a0bc94528e8ca65efb0a3078ec158887f47a816d6fe3c879a7e908ee421414bc317754333ecb73806c8fc46b0b6b7d8419cdf6f13a4f8aef
-EBUILD gecode-3.7.3-r1.ebuild 841 BLAKE2B 7049aa41cfcce6c6ded71852431e29ecd676fabce57671ceb64792f28609983856fa0444e4c87d7d419feed5ea73a8f413bee1160ca3d7602d3c8cc06ce09465 SHA512 245eb4bc7175f03dd0bea46ba39a3ba2939dbe376120504de4ce51dd54565dbe2efff7d66f609b742520d16f3e80cfb038fba32590d4d7f22e4bac0e66867028
-EBUILD gecode-4.4.0-r1.ebuild 1516 BLAKE2B b7a91d6ce8cd9559724b94a7936c030dec07464b5bf5b082d22bd14e989f9ce8e40e28ab38ec4dd42824075691e49c078200d6983665d7e51d28fa1dfcb02f7f SHA512 d516a56f01885ff293df777811ade1f0c0f9bed380abb8b05ec0bc5a082d6d26da233d49ecf11fd237df4cdbae88e4a7d0b904d3549054526308f7039fb779ee
+EBUILD gecode-3.7.3-r1.ebuild 722 BLAKE2B 0962e7c10c56af0b455ea12fef13590ef8ce17a099d9a5b143955a0fd794bb2309bdfc004336d44fae5e8e900ecc6e248840e5bff3cdae5bfcf385e731bb54cc SHA512 9c75e8ad0bf141feb626fc082cc0d7ca0fa5616060828bc1a09cd36c254de18a02e58d676a2da2e40a6f83aed9cfccea15d8c0b7d7cff6f892689433a8a63204
+EBUILD gecode-4.4.0-r2.ebuild 1563 BLAKE2B 5e25dcbc20eca89520637dbd358ea392c15f3373fe1c3b39a034d7e5b26592fc865fc4763aa17a16502f4652152290475e96641b365be7669873db69bb17c2c3 SHA512 6c0ed6549afa92ca8adde52684bfc6e88539a6f6e077cc53dfbd5b34b1f217b9d8d4d934b27c0b5894db735f126b575151b97bb04f95ee88a8d1080ea12fa190
 MISC metadata.xml 358 BLAKE2B 5b3d5ca409a8a649ed5b12a183102cca98e71be6195e0d0ec3a62d12441a33962d7514806642402695e9d98853d85047771979089fafe8ec1f7c6da9a20fbe73 SHA512 dfa79307fe5693ac03c56589907f414074c21d584c652a542e1ff409fedfe8b43a130e842cf4fe949d30d483d047c73d14906094b7656118b0e31461eb03dc06
diff --git a/dev-libs/gecode/gecode-3.7.3-r1.ebuild b/dev-libs/gecode/gecode-3.7.3-r1.ebuild
index 644e93c9e264..f586564191f5 100644
--- a/dev-libs/gecode/gecode-3.7.3-r1.ebuild
+++ b/dev-libs/gecode/gecode-3.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -10,22 +10,16 @@ HOMEPAGE="http://www.gecode.org/"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gist"
-
-DEPEND="gist? (
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/freetype
-	media-libs/libpng
-	>=dev-libs/glib-2
-)"
+IUSE="doc examples"
+
+DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
 		--disable-examples \
-		$(use_enable gist qt) \
-		$(use_enable gist)
+		--disable-gist \
+		--disable-qt
 }
 
 src_compile() {
diff --git a/dev-libs/gecode/gecode-4.4.0-r1.ebuild b/dev-libs/gecode/gecode-4.4.0-r1.ebuild
deleted file mode 100644
index 3a38dc91e039..000000000000
--- a/dev-libs/gecode/gecode-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools qmake-utils
-
-DESCRIPTION="An environment for developing constraint-based applications"
-HOMEPAGE="http://www.gecode.org/"
-SRC_URI="http://www.gecode.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gist gmp"
-
-RDEPEND="
-	gist? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	gmp? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.0-no-examples.patch" )
-
-src_prepare() {
-	default
-
-	sed -i gecode.m4 \
-		-e "s/-ggdb//" -e "s/-O3//" -e "s/-pipe//" \
-		-e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" \
-		-e "/AC_CHECK_PROGS(MOC/a AC_SUBST(MOC,$(qt4_get_bindir)/moc)" \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	 # --disable-examples prevents COMPILING the examples.
-	econf \
-		--disable-examples \
-		$(use_enable doc doc-dot) \
-		$(use_enable doc doc-tagfile) \
-		$(use_enable gist qt) \
-		$(use_enable gist) \
-		$(use_enable gmp mpfr)
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" emake test
-	LD_LIBRARY_PATH="${S}" ./test/test || die "test suite failed"
-}
-
-src_install() {
-	default
-
-	# The --docdir and --htmldir that we pass to configure don't seem to
-	# be respected...
-	use doc && dodoc -r doc/html/
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/gecode/gecode-4.4.0-r2.ebuild b/dev-libs/gecode/gecode-4.4.0-r2.ebuild
new file mode 100644
index 000000000000..4642b6d3496b
--- /dev/null
+++ b/dev-libs/gecode/gecode-4.4.0-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools qmake-utils
+
+DESCRIPTION="An environment for developing constraint-based applications"
+HOMEPAGE="http://www.gecode.org/"
+SRC_URI="http://www.gecode.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gist gmp"
+
+RDEPEND="
+	gist? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	gmp? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.0-no-examples.patch" )
+
+src_prepare() {
+	default
+
+	sed -i gecode.m4 \
+		-e "s/-ggdb//" -e "s/-O3//" -e "s/-pipe//" \
+		-e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" \
+		-e "/AC_CHECK_PROGS(MOC/a AC_SUBST(MOC,$(qt5_get_bindir)/moc)" \
+		|| die
+
+	eautoreconf
+}
+
+src_configure() {
+	 # --disable-examples prevents COMPILING the examples.
+	econf \
+		--disable-examples \
+		$(use_enable doc doc-dot) \
+		$(use_enable doc doc-tagfile) \
+		$(use_enable gist qt) \
+		$(use_enable gist) \
+		$(use_enable gmp mpfr)
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" emake test
+	LD_LIBRARY_PATH="${S}" ./test/test || die "test suite failed"
+}
+
+src_install() {
+	default
+
+	# The --docdir and --htmldir that we pass to configure don't seem to
+	# be respected...
+	use doc && dodoc -r doc/html/
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 26ac190a0b59..af31b360aeae 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,6 +6,6 @@ DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9
 DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
 DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
 EBUILD libgcrypt-1.5.6-r101.ebuild 1819 BLAKE2B d8c7173947450abfd72f78cedd5b0f0575d1a0395e12009cae295ffacfa1198fd2600cdd9251e7c7c4c92fc1ab01966899d15e64136278f293e374077728fe05 SHA512 c6f34489fa52dd333fcbcbb3ece2c0256e59653a7461e0531802ac477a19ef1cbe69266349e18ccbbe6b1cf98bff792c40e47594a644c26ce2360d29e251356c
-EBUILD libgcrypt-1.8.1.ebuild 2241 BLAKE2B 19fb745f1469f4e48c9f1e8ec389ceed8365f74767327bb56aa068f055531574fd58a80fc5b9a75ac874ce24f9bf1c42dc942d12ced533996f9cfaf210d9113f SHA512 ea88e007fcbfbcc4d8bcef445694a8a25efc833a03d3169eaef53372571014c1450f84691c4bb24275bd84305227c2ccac36168368299d8023b2cb85bb28a6fa
+EBUILD libgcrypt-1.8.1.ebuild 2238 BLAKE2B a6a1e54c878ecf18df7ce4c056c51a16ce333ce5cc4433dfb1e2054a3d70a2d8cc75d7a582473e84aad89cb2850118d8752cb223823f685803ba5140c82bc110 SHA512 8dcaaa3df574949a55f0c33d853d95f393ee856dabc0ccf4ba0fffeffc120cf7a96ba94f3a8cfb4d40654fabfd2f67f551515754c7bf348c25c4e16d80e73bbf
 EBUILD libgcrypt-1.8.2.ebuild 2251 BLAKE2B b6b3e62d0d7038aefbd4ea52842b1ba02009f9fa129887963e2e7b044740f21e89d0b3099a3f1cc1c7bd6ca471a70dd7aa55139747d2403b64eb4af65fbfb40b SHA512 5e456df4f4466967b2f638d8c870134e85ddeca04e5a8b4186959b2cebb236454997ca881c4e009288e18cf544bb50a155d473e3b588b22b035d1b2f394b4a24
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
index ef31a08ba728..9ce34df34e87 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libmemcache/Manifest b/dev-libs/libmemcache/Manifest
index 91957b10a327..9b59a54936b4 100644
--- a/dev-libs/libmemcache/Manifest
+++ b/dev-libs/libmemcache/Manifest
@@ -3,4 +3,5 @@ AUX libmemcache-1.4.0_rc2-inline.patch 2051 BLAKE2B 80b6b6afdb818f8f27d574f30aa2
 AUX libmemcache-1.4.0_rc2-ppc_ftbfs.patch 983 BLAKE2B 15a7b9e02216ed68375d7aba2b5b0b65d9da522db74d6ccb200ceaaf1cc1ff61872db6f657cf832894a02cf0c59448bed52795496d0edd9a86d3366348c052c4 SHA512 4ae7d6b99982934e7a28f7e0dd103341e9f4b7eb514e20cef3c02e428ee8c555c71c8bfdc06f0771ff0b73827251fa5eb4e7bce8014cd5cf2f5148d18b1f56b1
 DIST libmemcache-1.4.0.rc2.tar.bz2 301136 BLAKE2B bd30932811012e0d6e383c42fc3e61096d3a4d38f111bb70f04313119aaa1ea65c8709198b3edcad5dd136a809656dcad58603715115cc44affab333bf750302 SHA512 4b8c09c425d48d0ad040d3f01ec3c0d88babefb702b666d5cb3d10eac9993be88d00120b57b6224f7d55ae979d3136de10d5ddc793d9aa7f8b9531b5d79449d0
 EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1042 BLAKE2B 96a1ceb60a04859cb09a1f9eae486538888396b4f8ed26d4607f54ffb795d06475be415e4efa930cc2c650ec29329ea3fcac0dfbf33e647c551031ca9c745a6e SHA512 232afae4296e1362764ea1ed0ce568eb0efd9396c921b99d0e8b71c8ea437b12f32ae677bc02a5b3d3bc7ba90d96af83087b1a4241f0705aa84928931ad5f4de
+EBUILD libmemcache-1.4.0_rc2-r2.ebuild 1061 BLAKE2B 7fcee048d7c601c3ba3436c336dd808f348d0ffd895cbfe840fdefce9b4d6139330d61a3dfdbefa14b5a14d9f88fdb1944943a8a7677689588f821b5f16330dc SHA512 db99d49c555e6bb364fedef4450ced5bea0e30fbc9abdb91b68d08ad349ab1abdc182120b4810d10234d0006581f92fc0ddde7a2674b6424ca46715a0ce6a6b2
 MISC metadata.xml 304 BLAKE2B cf6f26fa6563aa19ef922e08b525d5f70af1e8df8ad6396a67ac6f956b75879ab0af1f7d65d2306518f56d52480bb27a7936fc32e31b858eb4cdb4db9ed19fdc SHA512 de92a462028eebdb520fd2a745eeffd845615fbace7691bc954997113a2b0f273f5b9fdcaebc299ae510d3fafa611397ac468b8b13fd44c00488fbc210b3358c
diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
new file mode 100644
index 000000000000..30154cf19961
--- /dev/null
+++ b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils toolchain-funcs
+
+MY_P=${PN}-${PV/_/.}
+
+DESCRIPTION="C API for memcached"
+HOMEPAGE="http://people.freebsd.org/~seanc/libmemcache/"
+SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-inline.patch
+	epatch "${FILESDIR}"/${P}-implicit_pointer.patch
+	[[ $(tc-arch) == ppc* ]] && epatch "${FILESDIR}"/${P}-ppc_ftbfs.patch
+
+	rm -rf test/unit || die
+	sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die
+	sed -i \
+		-e 's,test/unit/Makefile,,g' \
+		-e '/^CFLAGS=.*Wall.*pipe/s,-Wall,${CFLAGS} -Wall,g' \
+		-e '/^OPTIMIZE=/d' \
+		-e '/^PROFILE=/d' \
+		configure.ac || die
+
+	eautoreconf
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog
+}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 85f40169e822..6a38743f9283 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,3 @@
 DIST libqtxdg-2.0.0.tar.xz 62404 BLAKE2B dc84654693c6504c36633394ce4bafb46705b45ac3e7576b03b92710603c86375fd70d5ea76a2864e498c5b33728b02d215da5b65eb3728218ff97defd883bf0 SHA512 f4e32346eddedd31195093214a45e9831742ee886a14b5d7ba1d640a91e05473b9b8adc7bca9970090f1fa8187597cd10796c32ecea4ac02229e9869cd4f1db3
-EBUILD libqtxdg-2.0.0.ebuild 864 BLAKE2B f54f6e18e2e44454f5528d6cb20ec6b56b22b1d5f15da55fefcf32757aa4eea46239c61bd50ed129b327bfe5b74c6d31465b879731ae3d1e6585a597a53b1d4e SHA512 03a5998de4e0e855a29c2a9b9cb0a305ec950e9b6164887c8e9e133285e2a83657b75b4b84cc096b81b67b981bbd19f3fc58bdfd1312c85293aec1d4c47736b6
+EBUILD libqtxdg-2.0.0.ebuild 862 BLAKE2B f0247239922d2475b29654506c0d39bda2ca3f73eb53e5ff7278a7cd89e9ef2e46a7af823c90a21b0e1de63894dac89527905de2e949ec5890b8040fead92786 SHA512 105806c06b9d67df93b5d6ea091f26d62e6dec18474a663fa2fd7d1204cbd378aee5524406ad9a64e99864c3d1e1bcf4723b6ce90fb2d47c6579fd6dc5104b1d
 MISC metadata.xml 354 BLAKE2B d02d04cc08da509cba043080d79a8c9974c7b5a1da876561e3998e59ec5a9bd91035f44c776b21cd6ff2e6d44fbebfe46c7cb1bd792b0d66e97f84aee757cc3d SHA512 1c79d30acbeb7bb3b6ef14e7357029e1f1ec4dce23ff6e2ce851f2ea36e981b5606e8863027edc8211e90fa75c66c37c17d9df4f00fdcc333955568de6a986ad
diff --git a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
index 194c8516ead2..ed5a953680b7 100644
--- a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit cmake-utils virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://lxqt.org/"
+HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
 else
-	SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
diff --git a/dev-libs/libunicode/Manifest b/dev-libs/libunicode/Manifest
index e7053f9f385f..af055757e066 100644
--- a/dev-libs/libunicode/Manifest
+++ b/dev-libs/libunicode/Manifest
@@ -1,3 +1,4 @@
 DIST libunicode-0.4.gnome.tar.gz 211622 BLAKE2B 299e6ed5e3991b836ac43c07aca058b7c96a030648280792ec1c83fc590817147f577c86ef7e3138c431a3f54a175349a32a9ed3363e23d032efe8f0c7e69e3f SHA512 acfd67f80f194780ee6784abe3e41ae1557c177b8f07ee4bb9c9767499bd5f4b2e6ad7ce66653fd55b7e8ff765e5f7e8134cd5e3e28735e0c4f78cba60f6205f
 EBUILD libunicode-0.4-r1.ebuild 711 BLAKE2B b251c4b058c322f2cc50384fc361133bc7ae4c6b9d87dd25f96b4144ac01108e74b3d9743c90e18c2de8893892dee85ae34f75703f8b98f93379cba9d2b9d1b1 SHA512 d5e8758738da7b39ecb59e1ddb9f8a819e34980fe22e619a2a25a2ce9df8404d376c0b489c7d798101316d42e10167ac9f8e1acb5f7887226822997b93023c9c
+EBUILD libunicode-0.4-r2.ebuild 758 BLAKE2B 27adfc8e62dd885a2802f4b0a1d7127c7200873e0872183b7cba5d9e282c9cc13a7baf4ab7b21668795e3d1c94d8e0631e2574f0dea9c87ed5fb853d06e5186c SHA512 59294bada37115bee5b14b07e5d05ffe9d6e5e1516d3e29f32e9a3d5bde335c276c64da9287764ac7f1756b2467db8cde3f15b3d546fe93a9115386bae22da48
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libunicode/libunicode-0.4-r2.ebuild b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
new file mode 100644
index 000000000000..ffece83e3936
--- /dev/null
+++ b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Unicode library"
+HOMEPAGE="https://www.gnome.org/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.gnome.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+	# The build system is too old, regenerate here to fix crossbuild and
+	# respect LDFLAGS and probably other problems too.
+	sed -i -e "/testsuite/d" configure.in || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static libs installed
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index f68286ff053f..d2580cc38655 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -2,5 +2,5 @@ AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee9
 DIST log4cplus-1.1.3-rc7.tar.bz2 562969 BLAKE2B c67365a3e12b037014b9ec876b5725d74cd3856fa92aacb084dc3fad8557eb1b5c49a77fb5abf0833ee99bdcd646fea1f09bbd14fc7aa8b574ff396424195cfc SHA512 6854a966dfd5a2b807778e34957ea33c43a340b8be71a1a989941ec6c6fdc22d181dc2f0bb0e87910c77417a9f5c4f07d4fbd8f13eadffe82adef10a1e00ef02
 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
 EBUILD log4cplus-1.1.3_rc7.ebuild 1693 BLAKE2B 5cf2c0d0b6e8d4a110e7a9c2555184d05e037e7ab5d996267841314acb0668cf173237363db44a65a863cb3277e2ff72358ad5d582b9a72748bf24773d8e72bb SHA512 39023966bd1b696e5c8d7a7739f7323b78eb60018869bfb59698cf51abe5ebe3577fcc65c5dc0e0b3ac53666839360db60d9ccb8ab63a996bd7f7700c366e66d
-EBUILD log4cplus-1.2.0.ebuild 1553 BLAKE2B 3b52ff63445820be20d86cf22fcb53203aee735676484f8470db1d30efb83728f254fb709873259eae766d49323e1db7d1e47a700d62a1bc70cf63513f5c6e8d SHA512 cf300f50eb336f3c430d148f52b7ba838c13790b6a1c669afafc43bc218900fc730ed86693034827052e9f497edf17d52c09c92b1f5fc1a16caad3d4e94ca3b6
-MISC metadata.xml 690 BLAKE2B d49b395a962f0f8b1e0fceec5ae8bc602b770556c30ad6dc8fc0725b1c230ed9c8f2d2f503d5b2cd250051d8dd07a9f716f9d077e6081bd0cdbbf6912dd217a1 SHA512 21d2eabfdb5675aad9e9be7aa237b570ef78abe4e4f7142d1e8d638b2854e07e1e51724316abb7f796419da6f5a2e03dd09f26d1d2fe17b17c961c8c8e2551da
+EBUILD log4cplus-1.2.0.ebuild 1593 BLAKE2B d8b6eeea0ca194e78461cdee7ac8d695d5a2265c7e7c25447adcc72db328b48672089ae1c96e6dbb32702be1edd1c7ddb1da4c5df41ca75b51db2efb9cd05271 SHA512 63614e3b68805a4f01b710f6c56a82e4bfffad86477e2e326da6c27fde9361b7a0c70562708b17b446c12196a5502490e50ceecadcb8a3079d20391c5b9ee1b6
+MISC metadata.xml 749 BLAKE2B 896a9b8fb91d74d3ddcad1b2d775ad65cb0de33a16961fd96096ba7ab59cf624a83a01c13f1263f17eaeb8ee578474fe067ac1e13d2a0f991b1988081c325ce5 SHA512 9fd7d13a36875f50fa784dd61b775cda0834d8e76302b9e6a6fec6e843131b869831ce4d9eb5c93c6b3eb1c58bf3514b4d5b6c3ac9bf70c95cd877d28b29fa96
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
index 20d7a8533148..2ba2caac6fc9 100644
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="http://log4cplus.sourceforge.net/"
+HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0/1.2-5"
 KEYWORDS="~amd64 ~x86"
-IUSE="iconv qt4 threads working-locale working-c-locale"
+IUSE="iconv qt5 threads working-locale working-c-locale"
 REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
 
-RDEPEND="iconv? ( virtual/libiconv )
-	qt4? ( dev-qt/qtcore:4 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-c++14.patch" )
 
 src_configure() {
 	econf \
 		--disable-static \
-		$(use_enable threads) \
 		$(use_with iconv) \
+		$(use_with qt5) \
+		$(use_enable threads) \
 		$(use_with working-locale) \
-		$(use_with working-c-locale) \
-		$(use_with qt4 qt)
+		$(use_with working-c-locale)
 }
 
 src_test() {
diff --git a/dev-libs/log4cplus/metadata.xml b/dev-libs/log4cplus/metadata.xml
index 99ab0fff8a6c..ccbce42becd1 100644
--- a/dev-libs/log4cplus/metadata.xml
+++ b/dev-libs/log4cplus/metadata.xml
@@ -8,6 +8,7 @@
 		<flag name="iconv">Use inconv for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">log4cplus/log4cplus</remote-id>
 		<remote-id type="sourceforge">log4cplus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index d7d14cd5d4af..64a8097791b5 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -2,7 +2,9 @@ AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e
 AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
+DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 EBUILD mpc-1.0.2-r1.ebuild 993 BLAKE2B e079992e59b38bcfb8d1c24653d525b33830499ba76aa6d464fc844060de1393a09931fa8404d5b4a9aff077865bfad24200868852731dde8d3e9e5e9f94a659 SHA512 43c6c7cd7c33293b3539eab725f245da896516bb447b5e750549b9bf7f63b65477d2bc72ed5ab6fef015556a59cf7b606240253472079376cde92818d8fffff6
-EBUILD mpc-1.0.3-r1.ebuild 1115 BLAKE2B aecfb425039471748a87dcc130faa9fdbb4fbe4e6adf85da77e4a3525c9a61ecf0a112688df6814d6df2a7609b72ce4130585a2fec25e2ee961ff32e259e63fd SHA512 93d773e5c63944144c058b1fe189d4fecd8db04044cd06cc4c26d0a79663b04b17881761603055a077866f3e40dbe9820f601991b264fbb4c27ef34c544f333d
-EBUILD mpc-1.0.3.ebuild 1010 BLAKE2B 0a3d2092c5164964148e96ecefc789cbc842ae4cd013c310d8c37c10c168d782a3f70c2480dfe03958505498e87c6ee6a135f87eede1f3831ba13e7b40e33053 SHA512 0ff8e3a6ed9c7c8ec8c937e3aa7acd31384044a06d7c90a59994108b320dd2eb480e0c90828d0ee29341c24934c898c4b2217435c4cfc536811efe07d40ab19f
+EBUILD mpc-1.0.3-r2.ebuild 1117 BLAKE2B df2cb9956c46f6d1ec89787b83c4b44fb701f55b9e37d3b90a1478e827f6e10aa72d799bfada27ce20925f8572ca666a159d05b323bb66e0d2ec17d2f1dd933e SHA512 91fa1174924b6fd6cb8e7a3e3f3255bfa3d44b39c61973ab647f23c6509a3356b8b7d34f572cdd17d01516ef5fd39e00eada1192d761a96d7cd609289abb2e10
+EBUILD mpc-1.0.3.ebuild 1005 BLAKE2B c7282174e4d3b5efe19725581d0b6070551be9a1c401aa2aeada18e73c2b6222bc5c24696eecaa0181e5b2b3765c520247f5be87add1e263a975229ff81a9f9c SHA512 c9186aa7715afb1404f193c7aa6e5852dd655bdf1a8b5b267530d81019378232e23f481cc326af000e16dd06162f167d55e2a5c4ed2176150a8e124113af09ae
+EBUILD mpc-1.1.0.ebuild 954 BLAKE2B 7471acab67086676197c8a59899b92f907a6e19e5fa758c74262814907b61dbf5a76dbab0e3fe93013a4e2e1dd3c3d0eb34e06b9a6e10c11d09eedfdec12aa94 SHA512 8286594f6f70fa318ae02d197985c58f7ece7667dc17280b57ceb3c478f3bde8ea4599477b8514c13a0233c5dd4ec941372a0c121770ef6c877516b1874dbdee
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.0.3-r1.ebuild b/dev-libs/mpc/mpc-1.0.3-r1.ebuild
deleted file mode 100644
index 43c7e147e0d3..000000000000
--- a/dev-libs/mpc/mpc-1.0.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=6
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="http://mpc.multiprecision.org/"
-SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mpfr-4.0.0.patch
-	"${FILESDIR}"/${P}-no-ulp.patch
-)
-
-src_prepare() {
-	default
-
-	elibtoolize #347317
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..d4f00b4f5f78
--- /dev/null
+++ b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
+HOMEPAGE="http://mpc.multiprecision.org/"
+SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mpfr-4.0.0.patch
+	"${FILESDIR}"/${P}-no-ulp.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize #347317
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 198111c0b081..415e8304f4ed 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.1.0.ebuild b/dev-libs/mpc/mpc-1.1.0.ebuild
new file mode 100644
index 000000000000..2ebc852471ef
--- /dev/null
+++ b/dev-libs/mpc/mpc-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
+HOMEPAGE="http://mpc.multiprecision.org/"
+SRC_URI="https://ftp.gnu.org/gnu/mpc/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/mpfr-3.0.0:0=[${MULTILIB_USEDEP},static-libs?]"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
index e69b14f54cfa..334b9924f962 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for accessing the GNU locale utilities"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-devel/gettext"
diff --git a/dev-perl/Locale-gettext/Manifest b/dev-perl/Locale-gettext/Manifest
index f23c44d9425c..1af377ba90d2 100644
--- a/dev-perl/Locale-gettext/Manifest
+++ b/dev-perl/Locale-gettext/Manifest
@@ -1,4 +1,4 @@
 AUX Locale-gettext-1.70.0-no-dot-inc.patch 2576 BLAKE2B 026fe094e7cff34eb0192076a333349f6ec875c59eeca21658a4f16b8817b796b4830d5540ad77d0ca71d47dfbb5a009256bf1d8ccd1d2fb6da91be72ddeddc0 SHA512 af169db6991e968e29dcc760030919cc619e4bd9f13b4f20d707914674aa5c53dabeaec0e9f29254dbf9250fc96e6ace36a86a50b1dc5af0e1573bf4485047d2
 DIST gettext-1.07.tar.gz 8651 BLAKE2B ecdc105303c0b494d53f985ca0d789d75da33abc85e8579a43af1658d6faa18e2564e18fc6613548acc2add4ce847d03769c1fbe29dbb760b9498f4b251cbb1c SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6
-EBUILD Locale-gettext-1.70.0.ebuild 660 BLAKE2B 2caee2ddc97e72122f3696661484e534fc4c297d34e0361a19c9df69c7403d714c46166687cd83b07e0b93d1054eeb7a77752b22dae8ff600854d676d56cea74 SHA512 ad25f3fe8fc75d91df928ca5ef4ef24551675b8c1d990889efb8b3d95e5936a863ccbff6d79de1cd4736c2feafe17fab90970886f0b0c06e7e69e1bfc03447ea
+EBUILD Locale-gettext-1.70.0.ebuild 657 BLAKE2B 68912a8db02faf4993ca4469d510b24fe0ad4aac0283d7c257fab29b8b98440c9a41c1f121b656a90d2477b21f718650636de6f9dfcc052e4d41b9ec2dda5e59 SHA512 4971084c8528387539055a9155370c71a4f2db08c6c7bccec8f14668d86e6bed30c1fe381021591215a2d03ccd766f326a18938b558a1a43901e6ff0471aea1d
 MISC metadata.xml 393 BLAKE2B bbff5a6ce4a93c66bbc706cf416835858db71b6ce566478b67af59afe2cf42057ba053ac1d23721dce435c47982437811ebd9cde52f91474116191efab62f316 SHA512 368d7a37c00a186733e33eeaa01c12fdfed50f2f45c66bc88d0dfddcfd063aacb6c0953aa76737d8f9f5c2ed392e0eef41279975cf2cfad7fb423b8ca29592b0
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index dbdae9cb5ef2..a1c5bc28c5cf 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Build/Manifest b/dev-perl/Module-Build/Manifest
index e6106c1ebe7f..0a43f5f28a2c 100644
--- a/dev-perl/Module-Build/Manifest
+++ b/dev-perl/Module-Build/Manifest
@@ -2,7 +2,7 @@ DIST Module-Build-0.4216.tar.gz 305240 BLAKE2B 2e41fa1a2a5342d196a46aa3356976d17
 DIST Module-Build-0.4218.tar.gz 305533 BLAKE2B efc91b80ebb00a6156b1583bffcd5d0fbdaa3774ddb34b53f8f7cf52b03e45567e781a02faf83edf0693de971127ae59fbd467c35f0499634ccb949edf1eed87 SHA512 d752226dbc89b1ae65d3dea4f4356cd355288ab73eebc34bd09efa3d4ad5f78d284a705525d8bbc8785babf6cdc934953333254a8cc7c67cbd943f88ffaab301
 DIST Module-Build-0.4222.tar.gz 304398 BLAKE2B 5ef09cd78bf4b66215af3accc491c3bf9d7150d7a8e4f2e470cce92f6448fa2209efe7db77df31371b860c9685d42c9a516911cadd56db2e2d006df35a510bba SHA512 348c8495df5e665a7dc61c37c9c612ec20f7dbeb6d6692e40c57e44cd5f2a4c0ba538ed24f8d88d8a83fe85b3039dd874d9f6681d31b985429b27123def374c6
 DIST Module-Build-0.4224.tar.gz 304181 BLAKE2B 6cb44d1c24f74ebc5c8b0b353b7a7e9ef0d89bd39c45fd610fbac2802ae5630a7dbf61b179719502a419f2afc5e65988fb09f516fc1deb57b751a76aa5275fe8 SHA512 c08e84c542a882aa16a682a81cbb7a4860774a3f6a0ec2e720ba9e9bcea76dab331999fee86bf8b92edc08560d7cef4a7c2dfa4e626ab9b22da965e715af531f
-EBUILD Module-Build-0.421.600.ebuild 1278 BLAKE2B 453999441474ebc38406f986f40c39bba8ed0ec6ed526b3d911d79ef72d6b09cd8f8171f52fe01746fc2c31543d3a71aa2106bc16b3d189681a79fa5835128ae SHA512 2ea9fa2355ea3b774a6f2fd34b0626a51e81aa57cf34fae678bb0d5589d4d5de10aaedf84ccbfa43831a419fb541204c428c0775e527a41005f776c4ae4695cc
+EBUILD Module-Build-0.421.600.ebuild 1275 BLAKE2B 4fd08791a720d898746176ed7912e2efef0fe1476d92e9e7cca07bd5b2393bddf8fc5dcb402749a7066de9827d3ae016b1a466ed4c046b8ba888687c75525c9f SHA512 51bb8a8bbd30c5b075d44a46409c8e7b246ea07ac8e42c481ea915df65ecb9ce6576cdb772f7028f302260de9d7c9d4f74f04c9c4fb305cf5085aefc5b0efec0
 EBUILD Module-Build-0.421.800.ebuild 1201 BLAKE2B 5590a7139fea03e6ceafacbdedd891110e49e6e42fc29306f155d36d57a2ebc7b9282dcf55f5af587f8ca414b4e8bdccb62aa7303df3973c1bd4c359ba0e8db0 SHA512 1ea6007cf406d4be9b46e986836357bc577b71f71b2cc93888bbe19a1b8e6da02ffe29b39ca2d873439dd7b00576947159f21f336429e4a68c278223dc9e7956
 EBUILD Module-Build-0.422.200.ebuild 1201 BLAKE2B 998d3e3ffa3dde3689ffedc673e18dcf8a28f866f52e489cef4d7739dddc9d981ba9b9e790711a046fc334df8f7e991e3990997431f1bca70a57ef5a825a61de SHA512 c7e7403ccfe2f0f67fe6196edb5fb4c64b5e4ed6206aa4af36790cf938d9314186f8f7234503cc3fd4869bfcbc800f8238ceaf3f59e78b39ec14661cb5661484
 EBUILD Module-Build-0.422.400.ebuild 1201 BLAKE2B 387493622f39a1c45c9867d5ab0edceecff0be8e61cb6715ca7fd8f8cec353fcae438ea125e4a1bb54d6629f43eefa62dc0cc804523e39241b0827a224dd20b4 SHA512 cca0b42bae0053a4967927ad261cc27b626cd6c91f4d5ced7963f25d1f26aee125066a179270a6807d0174f36deeea578c68fd48a0d96d4cba7a9f8fe0b00a70
diff --git a/dev-perl/Module-Build/Module-Build-0.421.600.ebuild b/dev-perl/Module-Build/Module-Build-0.421.600.ebuild
index 916ea7b71adb..3251016a54e7 100644
--- a/dev-perl/Module-Build/Module-Build-0.421.600.ebuild
+++ b/dev-perl/Module-Build/Module-Build-0.421.600.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Build and install Perl modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 442a3a4fb825..348a8cf41da8 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -10,5 +10,5 @@ EBUILD Specio-0.320.0.ebuild 771 BLAKE2B a1e4a2ae6a049399eb7f1a9134a0ffccaa94103
 EBUILD Specio-0.350.0.ebuild 874 BLAKE2B 30ccca96ed9e66b5cf478efb3e54c99ecd1fe5cabbd4d9c7196e0b003ae82054d84046a8af3eb600f76829837992bfac64891e08a4ad494b5db68e925f96c2cc SHA512 d0c32a83e6e5b5c844ebfc8c505baf8d8767e05628f96d2d1824592da8e0771cf547f007e37f4d9fe14e4b1e70f592b9ed04a2cfae73d1a6fa44e7141f2a5d64
 EBUILD Specio-0.360.0.ebuild 874 BLAKE2B 477f368aebe6932d6e2cee9dba5537675117ec6248edd18383f0eda4c733805951806063acf318c4f83b6dfe23b4b630e83406742f319a0f5438762a4f12bde6 SHA512 5b40f2a854757d340e417bb19bad20a3997cb9ff6a25173beb969c9c16fd3a6785022286e7ae44a2905d3949c2d9b6a46d3ec7643dc0341f2276bae48ebdf3ac
 EBUILD Specio-0.370.0.ebuild 874 BLAKE2B 99ff4c2b38f8e5ee62f72df126292b900974daeaad56ce8c3869b6abec8010a6ee40bfd6a078e232706167f5d2da81bb1baefce1d93df1f15b7d91de59880b6e SHA512 466f9c353a8fe8d4eb2949283b0a723a28fba17922c57a9f688ccec8af97b24e025f9993508895e8fd94ec7a13f3f5832f2027d9668c46db58bfa47a2587db44
-EBUILD Specio-0.420.0.ebuild 886 BLAKE2B 04bc5bafbc9a42c3e6fc1ebcf2e94df87b7d8095d61eb67ea93969eab430a297f4cd44e6879b1587ea2868f7959d78e594a1aae8040ce59848afb5b78510da6f SHA512 1e5f0b6b02c7721aef6b0ca62fcf40931de8a627dd5d0f6400a7072c69b15b2f9c0e370a7b4205fe1888234c6e75068d5964dda48a71c850e1afea59f94e0737
+EBUILD Specio-0.420.0.ebuild 893 BLAKE2B 9d9f3399b8715950cc2302e9a0c84e949451effc993f48424bdef46ff9a1b19e4a04b659f1a7e7204873a9da00e8d94e690cfad559a915e9612fa851e8ec3eac SHA512 6defe945377600c208b0e4c2c027e3ee2dddbe0a841538eb43329f6f5914ddcbb31d37d96ce8310c92bae6915b07fc26d49e61d2a6f7a0935d534152205d04dd
 MISC metadata.xml 3181 BLAKE2B b9c67b2ca34c1b6e169f856c59731f884558f46dbabd5313093597283cfa507443c7745c4dea004cda322c5bf7a89862cd531d3570a610383d5a4e1cdaafd589 SHA512 fa6cedfa101b23b99f854562aa4f914170afbf027e1657a8338e19d5bcbcf4db5370d44062f1df1bbf4b9090051264baba5ebd18c79fb9c2c608d4a931aafc27
diff --git a/dev-perl/Specio/Specio-0.420.0.ebuild b/dev-perl/Specio/Specio-0.420.0.ebuild
index 181e9d81aaad..bb79cca66ecd 100644
--- a/dev-perl/Specio/Specio-0.420.0.ebuild
+++ b/dev-perl/Specio/Specio-0.420.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Manifest b/dev-perl/Sub-Quote/Manifest
index e5224e1166b7..a6c2d1b55bbc 100644
--- a/dev-perl/Sub-Quote/Manifest
+++ b/dev-perl/Sub-Quote/Manifest
@@ -1,5 +1,5 @@
 DIST Sub-Quote-2.003001.tar.gz 19131 BLAKE2B 20ae1ffacd8f2d582cac67671ece00ce34cad0fd28ec9e76effa26a07fc655bbc4ecf9ba2bc814eaa0325ac9ae0fd7fb4617d91e5c69e9442513ccc98d574985 SHA512 cd24460e52b68955a460accf673a58235c8f846285a01862198bbb4f6c5718f2977e615099da7eb54a41d76ae75fd7167c7d682c14f6819e65c83f163189dd49
 DIST Sub-Quote-2.004000.tar.gz 20363 BLAKE2B 0697f2a0a9aec799161289bee34f991fc86eb59e23a72f300f207ba80608d8f96653222dd8fb2393085cf052b875e9861bf6f34f9c099d1258bb36a0db3d63f5 SHA512 222354896728154da7bfc6ef9d4562430ab250b1e1169330f63b43eef01527785c1c8559c5eb77a8d42484187be74a9ff97b325bb2404a205a6d4b990f8656c5
-EBUILD Sub-Quote-2.3.1.ebuild 559 BLAKE2B 56b6f7f0232e3d20afb4b6721d54abdcd712af83fc92b8adb7801e351534b2806dd387e978c70ee7b83794e30950eb0e2d928b22a3d548896c9f59e65878e6b8 SHA512 b776a32a77a313ea438044b30a87f989722df7b395af02661afdec8bf18de65f682742cfc0a54e407ad3f87ee30e97212c5935fda36f7915dfe75cd6ab654f1a
-EBUILD Sub-Quote-2.4.0.ebuild 556 BLAKE2B 1b9de5012f759ab704a706fda00090409942afb4a26b8469bab73008d0ba2b8fdeebebd0181588098a7df8d263aac6e0e92a4a1244c359f26a2d2f1bb8bcaca5 SHA512 2627cfa842b189b427092ac31ba1eb7f922018326cce992e1dc889f1d2375873d70ec5617d368f223132784f2767542fe397c11b5622878628d778804f864d05
+EBUILD Sub-Quote-2.3.1.ebuild 566 BLAKE2B b911b90d9fcb352f89bc6a7103573c75d60e1931ec87bf31e60e283dcb2314176ca90af21266abc403df201b0ddc1873d6e50cf9d22d36f47e2142c1e52cf102 SHA512 acbe1494b9a913c11191eecd21e97c0bbb71763870071dfc423f21658669282befd02df8bd0f28c3e618c09dd501600293018282cf0cfdaf8ba8668755a8c393
+EBUILD Sub-Quote-2.4.0.ebuild 563 BLAKE2B 7f9449faada93d9b5c640615c3f6bc8d393492a733ba8539929f94406771a41d9787154ad90ac3261264e4ad0189cfffb72e2adf4a60285608234dd29dc34bd7 SHA512 e54b0774569bfc9af012607f27fb331de5f39551d0dea567685fc8151a50e1ce59241516262a5f14475bfdb899b5e02c7203804f8504fc341e9c0575eebad0e9
 MISC metadata.xml 447 BLAKE2B b414878a42aceb8390f1de47f02ff23dd6ca3ed337074f06c252824c968d933023dbba655430ceab71406ede17a30fd2b3d8b376a1159425116c2898b316d182 SHA512 b3147fbe7cfbafec109ef47574f27a5d3f49558f55ac6b9d6ee52c56c2701b26114209f0f675e32de3eb253b375719d2faed0ffdd4087ab49b3e6c9d0cd1237a
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild
index e7bf7a1c5be0..bca4beeda06d 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
index c2f3eb2a2f0e..e78283161c39 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f2c3f60ad3b8..1a859bcbbd17 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index f0d51a78b121..0058f45860e1 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,3 +1,5 @@
 DIST awl-0.56.tar.gz 769208 BLAKE2B 08513675d8d26fab26429a6e51cfd7dc3b00aa7cec6538789e6bbd2853989bf563ffba0df3cda61359f30ab672a74798251213e58423cbc4a77185ffd74e6716 SHA512 6336d6f938330eee0b51f04665776269d974086ba56a3c8f4b7f53e7e17b637d899e9b329aeba3dcd690673a1a95a8cf03ae8417ebb9f356294314790915886a
+DIST awl-0.59.tar.gz 601449 BLAKE2B 606c52bdad06e6fa130fd20f7da25bc75c7357c81c1d34d88bb62c43b56857eb95492581b8845ff97416d94d64135ccaa5bcba0b3989a115156ade05bc1b26b8 SHA512 d3e82e7f3269c1c02c801628498768ec94a8d215b719369e8ee997d67c86c5e4e780571852a077511ffffbe91ade1d05bfc60ee03624fbaada1ce23f7335d3e3
 EBUILD awl-0.56.ebuild 710 BLAKE2B f337c86868e39557069e05eeae6718504e4333f19fe1f30f842202ada99ba3173650b8da2438e75b600f047e7abaedb83f99a152410ce1b456b7ed289ad178b7 SHA512 ea8e35d70ec67e67731796f57dd006e6dd875c7dbe544d60ae1a8aaa6004234bba878900d30b9ea9c004fbc43191a9c70114c868225b4d6d1d32518aab009a83
+EBUILD awl-0.59.ebuild 620 BLAKE2B 32bd7e413e5419d4e8833b26f854ec136ee10be2e60f590424135b2398c199d4e1ad54a304172d9be4063c157225273104415e70f6727432899ade2248fc1f4e SHA512 fa4cd3dfd29e5450dd61208a086f2527bef1c0f7252840081f44f521fac0b09dd22bbcbb7097955498e3e22542d52642205c924d848f801b591956bfb8985f36
 MISC metadata.xml 346 BLAKE2B dcaf62bc7a00cfa20175ee9a029ea85ae9afd300924d69d4ee5243b2ea38263a3ded54e9ecf68436b49ba8830a9808339d33a2b0b828d899069416b72f937237 SHA512 027cb2cedae394feac3b1c136a384cc5c030554774e766558ba87fe4e6a468e6e93086e8c551699a2adaaf23c717299e43b56e156159b04bef841d45fd31aa02
diff --git a/dev-php/awl/awl-0.59.ebuild b/dev-php/awl/awl-0.59.ebuild
new file mode 100644
index 000000000000..24b33af893f7
--- /dev/null
+++ b/dev-php/awl/awl-0.59.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot
+
+DESCRIPTION="Andrew McMillan's Web Libraries"
+HOMEPAGE="https://gitlab.com/davical-project/awl"
+SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=r${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-php/phpunit )"
+RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
+
+src_compile() {
+	:
+}
+
+src_test() {
+	phpunit tests/ || die "test suite failed"
+}
+
+src_install() {
+	dodoc debian/changelog
+	insinto /usr/share/php/${PN}
+	doins -r dba inc
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9fb87d1c0715..ca1ad08c8e5e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index c12760be625d..b06cc666ada3 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,3 +1,5 @@
+DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
 DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
+EBUILD aiosmtpd-1.0.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 EBUILD aiosmtpd-1.1.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 MISC metadata.xml 451 BLAKE2B 71e452a1b393808879ead1ea59d7b7a7136a39810533db9a43e1da155724ae75ff4cdfa1019fdec699fc4d4a0b7fe2291af27877a60867a63c300d4b6f089e51 SHA512 15ade72252545bff264b5504ac70210b8f8a1fc9b816b9d00bc1fbcda685efd4f1cdd6dfdd01ec27888b59d7098c0e6f64d4781a8b9ba697f4613775d0b966a1
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
new file mode 100644
index 000000000000..8595ce17c0db
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="http://aiosmtpd.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	rm -r examples
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index a79832cf14bf..cb1a5582c90a 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,4 +1,4 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.3.ebuild 1190 BLAKE2B e4ca960043fec64cc379571e9e9d26f0a56fe3ef893e2af78521116e16b89393d0b0a7d1f63fb2fcfe8e790e06a2b2412aae67c36e0cd10693cd2a54f6f67365 SHA512 8a1526f09c8445277a2bbd3a5819bc558d313ee233eefaca7c3391ee2b5e269b532717bc8a3d8657f5493df148f7766de6e9d886ffb96d45f2e7885d3366f08e
+EBUILD appdirs-1.4.3.ebuild 1187 BLAKE2B 8435f5c829d22d9f0c84d45dbd50ce1de925e97b3110b85195881b24bcc2a7ff4988ef4a3b99982f488cb71fb3c11c1e02ca8c596adc5ca1c6716bd3847bfdcd SHA512 a5904317594dfc2119a9da22b6e3cfd9c0d7a6bcf9721c506cb51e2202d8b181acddd91a99ea6ab725b0836c7a188bff49fbe191a628b0af89730d9ec387bb0f
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index e2de18ca890c..45809ec5dfb9 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 64d979becc94..e9eec89172c4 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -6,6 +6,6 @@ DIST certifi-2017.7.27.1.tar.gz 348217 BLAKE2B 5c3531b0537df743010c5969c88fc40eb
 EBUILD certifi-2016.9.26.ebuild 724 BLAKE2B aad0c66fb167bc21893503c57e671e7faba78a4e30b990fef86a804f10b34c91d68db7a7cb7b0b1923ef4ba80d08b4666dfaf8250b15546d914f875e85853df3 SHA512 acbcfcafaafc2b257018df09ebea8680900b69bd82209a21ce0ae9f462f166daae14e1e0d93d7e1104d7c9dc85595a522b87d14bd6f0991efe096b6f642499b7
 EBUILD certifi-2017.1.23.ebuild 740 BLAKE2B 54fb273e2f0399608731e2a6216f33121746f6769772e31d83671a64ee39daa1a507659c1c2d23a72ee29af88e129e1fefd64221e521a796d6e33757ccdf3107 SHA512 d1e7e8c1d981084796ec441656414ba40b83ccf41313e5dd68eadb3da86cf65cb2f0758f5479ee23b4d1b6f4bbcfbbf4215ac45c53fac4f57e32574fe27b683d
 EBUILD certifi-2017.11.5.ebuild 748 BLAKE2B 11f215adc44f6eb78b359f9816eab5380ba0224e1f1d699d307f7ce98e6745489022ab76cc6c72f8e705de9223e0f418b9c109ae5f2a0ad969b3664a457d8157 SHA512 7fa014910bac4fd96e0544072ec075edc5950b60087bf75601a1b0023cd4c787113519823de10a7cdff005816ff14883fba73a568e5e1b11b5eeffa5977a73b4
-EBUILD certifi-2017.4.17.ebuild 739 BLAKE2B 6c4b654b1e41d84333d085e85ef9c37865aa2a52f67b5fdb5d764f9cfeb0f0e64d3e0b10f78fdec4f632412d3c6035f3a4f72a78376c4ccacf8619218411798e SHA512 885694b67b712fe63e16c3e4543972eed00ec37da8c732a54d05e222ac361f7f5b0113ad7b261c3fa41f03191a74614e9df7cde4bbae211e6d0d91760793e68d
+EBUILD certifi-2017.4.17.ebuild 736 BLAKE2B bf1d016013550970887d62036ac71dee3a682b229b8b8972a66a94b72dd83c8415a059309e0fe9ca969e57ceeef28f746411112e834093e7366ef7042304e4cd SHA512 71456ae15328a13d945a3f637fef48ef96921a0763f7390c0748ba397da1166c7c1406f98a04c70b3de4142178e49288befd505f31a3b83892d996ef3293a186
 EBUILD certifi-2017.7.27.1.ebuild 748 BLAKE2B 11f215adc44f6eb78b359f9816eab5380ba0224e1f1d699d307f7ce98e6745489022ab76cc6c72f8e705de9223e0f418b9c109ae5f2a0ad969b3664a457d8157 SHA512 7fa014910bac4fd96e0544072ec075edc5950b60087bf75601a1b0023cd4c787113519823de10a7cdff005816ff14883fba73a568e5e1b11b5eeffa5977a73b4
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2017.4.17.ebuild b/dev-python/certifi/certifi-2017.4.17.ebuild
index 5d86bae9c5b5..a7fa755182ce 100644
--- a/dev-python/certifi/certifi-2017.4.17.ebuild
+++ b/dev-python/certifi/certifi-2017.4.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=""
 
 RDEPEND=""
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index 5091e5b6c73a..a0855ec3c808 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,5 +1,3 @@
-DIST libpillowfight-0.2.1.tar.gz 23125246 BLAKE2B 74af3c24cbe252ec66a0c2ab1431189509d1da34620df8f37898ec5b45d9c30651f37fdede72906d8ec690b32020c8a2a6d70a17ff6102a4e489e61cd008a127 SHA512 352f23daa2cce39395604f3c545773fec26b336ae17cea9148b8d6b7f61f0fcd314ab08e4fde8dff85531ecfa07fbee0fda90e3258c04c39cad397a775318d95
 DIST libpillowfight-0.2.2.tar.gz 23125494 BLAKE2B b9620b0e574869d1efcc9449e09f281a5d2611ec15f144ee24b385b5f6f693f037c844904f0abc715d49125df7d1a27d6c433aed83b33371b3f07310be8288db SHA512 76dcaf9105b4dbbe427851d794e92ba023453e2d750ecdd4e3feb864534f9d99adb562b719b7c9af299ae16c0778b510ab96b4997cf9bcc6ea4c6f8f7471ae8a
-EBUILD libpillowfight-0.2.1.ebuild 668 BLAKE2B 7c17ca8191eb721be1881877067e755aeeb229da6ee4154ba2298b75373e1a27de36b612181062f0c0c4608e5d6bee3189dbc5f1a49e6abac9f872182eeff90b SHA512 6127bba47f4091ee83466c925278ef8f65613f1a3c6de66a2ef45ab7992cb4781a69715dfc6a49b79c411f7e0bd11e7f6df6367a847850bfaef58be7cc8e3224
 EBUILD libpillowfight-0.2.2.ebuild 676 BLAKE2B 07c3d9097cd838705c06523c4c19b8314b822ce7427c011da9760b2b033dfb0aea8202ae3cbe00546cdb20074f121b607f66ceff7d712c4e24e39d89c22433eb SHA512 8919455d801ce8da7f49b41728d3dd41362b3669e3a23a57b3381e6a97011f3e5ddd045b3c5b59bc7fa08b1f02634076c8c288ce9d2455874cd1b672079fb46b
 MISC metadata.xml 349 BLAKE2B 4b7c076969b0b1a899de7615bea08f02595e340b4ec1228e630d8feafca7709693993ac48dc3cac91ab912cb1c41fa13dac818e598eec4bfb8d928d385484b98 SHA512 5934060618b194c844776072f78ac15400fbee4629595a8c3ed60acf30b4ffd9cfed4dfcd9b263101842be197a1491daeb3e929bdd924839c17819b185ae7578
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild
deleted file mode 100644
index 1401864b5c3a..000000000000
--- a/dev-python/libpillowfight/libpillowfight-0.2.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://github.com/jflesch/libpillowfight"
-SRC_URI="https://github.com/jflesch/libpillowfight/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 34d73133b654..b906420f8954 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.messaging-5.30.1.tar.gz 316794 BLAKE2B a962841520b559fb433fff6ac2cfa884419d1d53d8ae1e99572e5b32ba2f45cbce55bc812891ab0cffb65db765793e020cf42308a53ee199027e192fe5aaa880 SHA512 e59a17a76963681cd96ef63a5f946ad2e4126f80a7fbdb0d1bc48597ad889862c72450fe526b46d3712eaf92b489e1c0020096e825654c7554c382282923b526
 DIST oslo.messaging-5.30.2.tar.gz 317883 BLAKE2B 4003de476db2636eae2462cd3aef7bacb911e321c2cb228263482eda7a82361ec4c731872dbaa8394cfdb42759a8c5e200a03b919c0941f74da32498831394b2 SHA512 b4715c73c158414d1b65fd56c6697ff67ce24499e96ca076f8c3d5d93d0b06ca1f9f80fa0de43c5ee0d5e8de221f20b95e077738b026bac6671d1a2ec6128b08
-EBUILD oslo-messaging-5.30.1.ebuild 2145 BLAKE2B 3c903549b31026bbe3ee6d78e6fc8a651b15b381f3aefeb5d1d706eefef945adad87fab02024e795a7ae32a1c974edf43d1bc6d963acd4bbc6ada41aa16c1c23 SHA512 83b8c7a8adb6ef7e670a55b0d23c7b19cd9bac290bd2387363a61e8f6b357a92703df8c41d1c51432e0ae8f003a67456d9b45e3b59f54f8cd9c83e48337df035
-EBUILD oslo-messaging-5.30.2.ebuild 2147 BLAKE2B b4c24092e8fd62d0e2d1ab65a946454244223135177c2b56a80f4bb3e5b45974a1de4d12e96dfd91bc38113caf2e12dd45718069aa395f3fba0c3cc6675782f0 SHA512 b10f400551d0f03e5f70a957221c6556df34ba080b5dee487c9bf0f7a78d309fb54a556c6ac3feec1640bf7fe27873db8ec5d1f7c6cf12c43a5e774b082186d8
+EBUILD oslo-messaging-5.30.2.ebuild 2145 BLAKE2B d27a718e90755170492a47c25701e55f73332037e52a0463dd3a528521c284ef3ba01600e29f9f72b8416e21ec1b1e9a4049d5c50df54f3b07749606470c9c9a SHA512 5e6d85a3f10b78d37a0d77e4dc943ac0c4400682330bf90aed803c8a30349bb9d18fa67af0de5df12519b0d096759638a79b5fd69e248d7eed889d1e9bc7c1be
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild
deleted file mode 100644
index 66dab2f8da61..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-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/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.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-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.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-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
index 4686a5f1c6f5..4304312da896 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index b1e2e3803bea..00c13f831b3a 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,4 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-EBUILD packaging-16.8.ebuild 1464 BLAKE2B ca45be2bc47f2cd1b21a8fad9581dab3a17c0cf40ed2311ffc4b2ceac2a750d76a2deca4990b13c532dfca0645dcabbb1d656109a4dd541e42744e3ba2d19dcb SHA512 bb6a69a0843c376d4d3eb4b501a25047e47e7fb3f2e594ab2cfcba38d073c1c8aa4c1ae8aabf66367a2500d1a92839beb666a3c449415023049462fd67725fea
+EBUILD packaging-16.8.ebuild 1461 BLAKE2B e84f2fa0a4e839008794b5d8a6bf8944e8d4c73940e65728a951426b65fc0c2856aa1f24e811d47bd51d768c1e9f7a4150bdc06b6c9ad1cb6722769aedd0eeac SHA512 07a982c089274c472bb4ff5050bd705aa9333fdf9267f72ed1fe79bc1a305bfec6db2f4503ad0fafd6e145f7caefc074438504872f20ad3e13dd0d29c5a8b464
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index 62edc8ae2a28..be9240f517a2 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 3f5ab8eb4aa9..bf4ecc51cd4d 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,12 +1,16 @@
 AUX psycopg-2.4.2-setup.py.patch 568 BLAKE2B 820a8ab11084670b79d159dcdb75a30f157f740a8110370ab0ded41907dece280cc7095ec691b96f5288e82bd29d8b6a46f108faddde79c4ada709e52e489ad0 SHA512 9111df177d89559b0e397bc0ca9844636f981552d4bac3ae04abfdae5c68bc4f9efc553829da9c3a653536ddb18f01a3049e9ece746d0fe3328684a6ef6b6976
+AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
+AUX psycopg-2.7.3-sphinx-1.6.patch 1164 BLAKE2B c8dc98f49f1070f7866b01a10bf779480a03620eea548f66e1f19c13d1e8ca72ea4761dcae857db5a350aa545d8b3dbb2695334a05496e6150853820a6105c1b SHA512 dd6438110f5a653236ba8e6efda0f6d5cb2baaa506398728990106a0fbcb1ff8d072716c48e7f14ec608fe0b7307b8f5c7c0076fe2921104e25f21c905c0f6a2
 DIST psycopg-1.1.21.tar.gz 213753 BLAKE2B 679b4ba810ad7821c781e169baae1f62b6f926e2c115c88f0055404ecd266ed69beaea6151643984ec2bc5696a79ac02f23adcec727afe4e6b6e657740a1692c SHA512 2681e8b3c4873f69a1a07aa4d3908a42f8e8be9392adbed189fe72c1a601699ac08643d24454622baf4b26153ef3a687f27a941308368e2227cb98ff948322eb
 DIST psycopg2-2.5.3.tar.gz 690689 BLAKE2B c1c070fc9acf5270f6bd711d457f162d2e5622a0cb40584d5b24cce441429c460aded278b67dbdf351605d710085c3e04ac63927d736c8d04ea27d21cccdea10 SHA512 88590c37be839e8cf5025b7ac40411c4682269700795c5f8f1b762966d906faf3f1ee85de35fc734a2d10c6a68d7fef569891bd96919bab809b9500625e2a41a
 DIST psycopg2-2.6.2.tar.gz 376348 BLAKE2B 279f2fb905c3e3034d89535a8c1de3114ef87cbd7f4b32a54b38150ef1cb845ae9811b3d6f57a5f46042db47e6d5f2563e87c986cdb8a8799fe6d60580180cc3 SHA512 614314b5ab7ab5fa7c5e9c4f861579f90bd73521a9964dcb5a0938f77a9d6dfbea689cef35ad399cda698a45bb736c315912cb5dca85a52132f011d79f4863ac
 DIST psycopg2-2.7.3.1.tar.gz 425069 BLAKE2B 4d34859c63217bad08374b0a8d03dbcba7711c1e8034eb106ba27211e85af148f51902e2d1b294e4c0ba4e798f4a64903d9d735605d09bbcb1d291ad23cfb4e0 SHA512 206d4cf62a091927daf4b734e0b3597399fc588cb738366711674fc06c39d68a682981bc4756c356d37c41caba49b5df2b915beace8670c190d7d41e374f1eb5
+DIST psycopg2-2.7.3.2.tar.gz 425107 BLAKE2B 47fe652d5e2e62c765150941d565b9ee896e221ae565e51745645f2723a0070481daf2f0d0d1a1fbd741b5b536c12cdf892becb4d5d4283a26cd324cd02c47c6 SHA512 38460369e339b16e433328e9bd6ccdbb4b03e41d40b9fb453a54513af4ec43f0a72dc795de6eb13d9618e1d5636991d3de7f619459b3f21d070798d497b2776f
 DIST psycopg2-2.7.3.tar.gz 425004 BLAKE2B df405ca5b5f5887fbd166523cafd5686a9148b313b7c30a85dbfc5dec42aff426505993f42a18d6d60569deb17a5748a858737a139d74943e66bce8bdd12beb3 SHA512 9e673f47190b12ab31e783a3d2b464231b933cc6ad4f12742c457020aab5db36b83829d84b4e63f793f5567e689081fd9479bfc4634b7bb08c7d873a3f42efc9
 EBUILD psycopg-1.1.21-r1.ebuild 1569 BLAKE2B 2bd03f117610681759be78e45636f721c16e2f8f54abfad2a985ab19d0e1c51ed5a878e3e7db810f03ed896a5b45a38155ca7c5debffc40c6065d71992d73588 SHA512 e69ba12412bc2d3d76fd3eeb4326bd33aec7ca8bf3f6830b6efdfd66640c7dfe036d7e09a8a0340a5b5fb448c57dd01cbb7b1a5a1810ca502ecd6796d285162e
 EBUILD psycopg-2.5.3.ebuild 1456 BLAKE2B f2bbc2a656e5cc4c3ab673ac42afa8a9367e443c2687f9f4e3f7eeb11ed88607278f5aff26f2c79d72e6d0eb84a6fb624078b8e25749a1530a10ca9025c7365c SHA512 c349bd2b9908bfd33e86d197569e080b52b08fd8255f719fcd625a0a5bffc391e18c66e988f8ba7be5383bf37adc1542c91e018bac76026f29a22c2dbfe81f3c
 EBUILD psycopg-2.6.2.ebuild 1966 BLAKE2B 81b3269d763a5e621ce9a6c706b7a391621e0554da40afda2946a1fe1a6598d4fd7b897a3232512052aeb1c965f8d0abf5442ec1a9534b4e7cf7bdb3ab0728da SHA512 0b87755b75f0ddd72a474795942247327fd8e05ba63f8723b505ac43f96980ebc273b9ace49f8a408c87c7a86d989b6f7627585f3764fed3bb9d11cb86718115
 EBUILD psycopg-2.7.3.1.ebuild 1928 BLAKE2B 4b032f272bd21902b4c0f4d0f1f11d4bf80aa994d27827448b8ea3162713acbf921863fe1e37cc62d73062e9850b57338b1baf01fd9a06eea5879d18848cc562 SHA512 3608d22ec32acfc50db5dd8c9cbf63138123153071bae3203db718d3ac822ff8da28da648de0268949dcabc71808e0e148bfdd64c153aa46a1c6b6650cece0ec
+EBUILD psycopg-2.7.3.2.ebuild 1679 BLAKE2B a77579c1033b439a81a76ed54d5eb9ba0d740792ef8f3b91d25b511a276d1557c30423d77b596f8091b82af307e39f2902926b339c7a4840bf7e3ba02510c45f SHA512 029c0ba87ab6f695a976e84ea4e3fbe067f4e31b7dc9e02fb355a963f337cb13a8f256ae9d8310992273e6dff175f6288df477c8cfb4340fcbebbe959fa3c268
 EBUILD psycopg-2.7.3.ebuild 1919 BLAKE2B 5d82b03df033826f9a4ee25f317d87f1700ae54f9b4ee45d685d2899b911bdb4e25742f50a5a7c6a16f4bfc2686d6efccc392c87642ce7294b818364c2764dd5 SHA512 84cfe36d770054cf31158dff615ce1cd7caf16b8db8af4a411a885f1c80e4ec9e668143c0828f68ccb0ad1fe5c72b2e188cbcccfff51db0ad305c797855c6271
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch b/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch
new file mode 100644
index 000000000000..aab130c54500
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch
@@ -0,0 +1,40 @@
+Index: psycopg2-2.7.3/setup.py
+===================================================================
+--- psycopg2-2.7.3.orig/setup.py
++++ psycopg2-2.7.3/setup.py
+@@ -527,20 +527,21 @@ have_pydatetime = True
+ have_mxdatetime = False
+ use_pydatetime = int(parser.get('build_ext', 'use_pydatetime'))
+ 
+-# check for mx package
+-mxincludedir = ''
+-if parser.has_option('build_ext', 'mx_include_dir'):
+-    mxincludedir = parser.get('build_ext', 'mx_include_dir')
+-if not mxincludedir:
+-    mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
+-if mxincludedir.strip() and os.path.exists(mxincludedir):
+-    # Build the support for mx: we will check at runtime if it can be imported
+-    include_dirs.append(mxincludedir)
+-    define_macros.append(('HAVE_MXDATETIME', '1'))
+-    sources.append('adapter_mxdatetime.c')
+-    depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
+-    have_mxdatetime = True
+-    version_flags.append('mx')
++if not use_pydatetime:
++    # check for mx package
++    mxincludedir = ''
++    if parser.has_option('build_ext', 'mx_include_dir'):
++        mxincludedir = parser.get('build_ext', 'mx_include_dir')
++    if not mxincludedir:
++        mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
++    if mxincludedir.strip() and os.path.exists(mxincludedir):
++        # Build the support for mx: we will check at runtime if it can be imported
++        include_dirs.append(mxincludedir)
++        define_macros.append(('HAVE_MXDATETIME', '1'))
++        sources.append('adapter_mxdatetime.c')
++        depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
++        have_mxdatetime = True
++        version_flags.append('mx')
+ 
+ # now decide which package will be the default for date/time typecasts
+ if have_pydatetime and (use_pydatetime or not have_mxdatetime):
diff --git a/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch b/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch
new file mode 100644
index 000000000000..4052a14649ef
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch
@@ -0,0 +1,29 @@
+--- psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 	2016-04-10 08:48:37.000000000 +0200
++++ psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 2017-12-20 22:14:19.097225121 +0100
+@@ -12,7 +12,7 @@
+ from docutils import nodes
+
+ from sphinx.locale import _
+-from sphinx.util.compat import Directive, make_admonition
++from docutils.parsers.rst import Directive
+
+ class extension_node(nodes.Admonition, nodes.Element): pass
+
+@@ -29,12 +29,11 @@ class Extension(Directive):
+     option_spec = {}
+
+     def run(self):
+-        nodes = make_admonition(extension_node,
+-                self.name, [_('DB API extension')], self.options,
+-                self.content, self.lineno, self.content_offset,
+-                self.block_text, self.state, self.state_machine)
+-        nodes[0]['classes'].append('dbapi-extension')
+-        return nodes
++        node = extension_node('\n'.join(self.content))
++        node += nodes.title(_('DB API extension'), _('DB API extension'))
++        self.state.nested_parse(self.content, self.content_offset, node)
++        node['classes'].append('dbapi-extension')
++        return [node]
+
+
+ def visit_extension_node(self, node):
diff --git a/dev-python/psycopg/psycopg-2.7.3.2.ebuild b/dev-python/psycopg/psycopg-2.7.3.2.ebuild
new file mode 100644
index 000000000000..93f6d5ad9cbb
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.3.2.ebuild
@@ -0,0 +1,72 @@
+# 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 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+# Fixes build error with sphinx: https://bugs.gentoo.org/634730
+PATCHES=(
+	"${FILESDIR}"/psycopg-2.7.3-avoid-mxdatetime.patch
+	"${FILESDIR}"/psycopg-2.7.3-sphinx-1.6.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	if use examples ; then
+	   dodoc -r examples
+	   docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index 47ea976b2685..53728cc98eee 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,5 +1,3 @@
 DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
-DIST pyinsane-2.0.9.tar.gz 325576 BLAKE2B eabf8444daba9b5da86f65d94d8f8c7402d0b2129aea349b12b933fab743fbd3753606dced8c29a00d0ad1c8f729b8724e26f203213ad3b4e65c8976d51c002f SHA512 e882e237ce6c0e7a5055633b79814115e104d4ef0c417fdfff8f3bcac92527f432b3cab96c018445ae40455bb93fc5ef71d5e8cff1977878d1f09c0b121dfa2b
 EBUILD pyinsane-2.0.10.ebuild 851 BLAKE2B 2ec7f8ce75cc7cdece605e1f3dd68dba4e445f4958da926c1f5659d6381db94262f8020c3ab8c9c8d48035a120eb2a82ac59ede1d9f761d4dcbd4c3cf232f4b7 SHA512 14f5240f6080be599afe2cc902f4ee133adeb21292978024f132af70cffe69a069fff6527db1f4fc4fe5204425906e708f51f131dec38de74ad8a3d36ac9e649
-EBUILD pyinsane-2.0.9.ebuild 759 BLAKE2B 368d1c0970d92c3d4173f69043d0a2fad25b11f492a4e454aa65699a75e1cc8dceac656cc853b569c3cbf4bf563c215cb9dd15e317935bd9676d553790776db6 SHA512 86117866d517e0e9efdb5f4420c49d8a6bd9c2c726c855ee418596ee5f7246a25cf78b14f617dc097c4f9400a47432dd233d60a6a124f6da719ea49a88b29cb1
 MISC metadata.xml 921 BLAKE2B 8ce4124a05f809f24b7381d4eb2111c0a4b816c146c790af54e145b6d93e713b8e7d973762cfa5e8852ed5f8d5069dfaa23f50723b1c0bff7a5cf43e72ae8ccb SHA512 5f7247aed15fb530cda752989621d2d806dc25f48dbf04ad34115f2d90b0c32f3209bfd7acf6478545e4f52cb3eb5bb97a1e8cff49abefc5ab9cddefdc49f1a9
diff --git a/dev-python/pyinsane/pyinsane-2.0.9.ebuild b/dev-python/pyinsane/pyinsane-2.0.9.ebuild
deleted file mode 100644
index 02c2710c8c1a..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.9.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sane API and abstration layer"
-HOMEPAGE="https://github.com/jflesch/pyinsane"
-SRC_URI="https://github.com/jflesch/pyinsane/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="media-gfx/sane-backends
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index a659bb811867..2c01ab924166 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,6 +1,3 @@
-DIST pyocr-0.4.6.tar.gz 1282437 BLAKE2B ba90aeedbe08991e41ecd0a690c87b195302a27b75e68a2bfdb9af64da34c1663f708b93f80bbbe9978a4dbd19a7f1d3debf8d45b959e2d421388c1079c88872 SHA512 3543ef444dc729506574120bafaa192a7b2a689ab408cf59960e2b0be2d9a2eb13fa3bcb02c27022ab48257e8ceac824ca9b8d7e9850ddeef0a877117b889c11
 DIST pyocr-0.4.7.tar.gz 1283774 BLAKE2B 0c4958882c350ee9e71f956694c180097607ca1c9e75b2886185361013f6038fd584a73de63de80546354de4023c6a8b1a589205f2e0c9165904d4fd3881b9f8 SHA512 ee4433c34058e0c79478dbf4276f55dabadcf5c841e86e1988e574bf91d96b96a314ef5e15047fb510737c956b4deed200eb47799de6fb1c021e407a6d49c192
-EBUILD pyocr-0.4.6.ebuild 745 BLAKE2B 6286a0aaa8ff59a39c5900dc3b80a64b9136675898c8f5dbfcf1184e8be035b5a3cef5bb84a5184230af846b54a19f36296db7b95917c27311609ec3a3778889 SHA512 359fd7441598355279852ce0aaf0716d43552d771f8d70c70698116c1167f6fc8285d945ade54df5758a85c4fcd73ec3f19e8dbce98b6ebfabeffb8beac20459
 EBUILD pyocr-0.4.7-r1.ebuild 761 BLAKE2B 92b5e1aada2a0c2f61e59ef14539df4469685ceeb0e474d1f1f155580b6df47f4b0720b7a755648e176d5ae53969ebf800f16c6526cb8ccf414c5b3bcf917f91 SHA512 68050ad1419fce72d68b419e3d0a0ef8a14acd330408ddab125bffc144d30710de49f3603cd0a3079f2b74fda0956d6d62e56137e9f182cb6d1163960e122d97
-EBUILD pyocr-0.4.7.ebuild 757 BLAKE2B d8d3c6ae67bbad9bf569be0c710355576debbaa312050b4599ac901766fad00cf247d53538704e686c798fd085b442666eb746494cbb9618a4fbdd1067120300 SHA512 eee4c10d8e3ea4b6f06ca0284e2334c28d2b9119d4d397bb7fba7f1004f1023a2b28edca7850f9ddb572d83864e864ef3354026a4517e3a19fe9417dc7d4f89b
 MISC metadata.xml 1068 BLAKE2B cf7a168a1119d56549e19884a57e65ef64b04e8ee281caf980c5cc1d03b100c9de11e3b35925de1cf5e00a58d51bcae1e01da32727cf2e5f1a44117c7719b383 SHA512 c4fe226c68e85011b2470ec1bcd43eb3744df25948c7dd13a8c21ac3b89e6394f21a4d92793366c17bcaa25c24d8979d75a21bb6e2e884dbeef73e2db0f8f52b
diff --git a/dev-python/pyocr/pyocr-0.4.6.ebuild b/dev-python/pyocr/pyocr-0.4.6.ebuild
deleted file mode 100644
index 1b297d3a7383..000000000000
--- a/dev-python/pyocr/pyocr-0.4.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/jflesch/pyocr"
-SRC_URI="https://github.com/jflesch/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
diff --git a/dev-python/pyocr/pyocr-0.4.7.ebuild b/dev-python/pyocr/pyocr-0.4.7.ebuild
deleted file mode 100644
index 634a7ad88580..000000000000
--- a/dev-python/pyocr/pyocr-0.4.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="https://github.com/openpaperwork/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index a507a0ba1c05..7390c218f109 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,6 +1,8 @@
+AUX pysaml-4.0.2_CVE-2017-1000433.patch 1245 BLAKE2B ef0d8c68cadb6c53810e9b3d083a9de895fe70762a4dfe88140558d3b03848615319a08e777f488ce81f227994b7621039e0354967461fd403880e44eda19264 SHA512 be699d09afefeb9034c46a5d8cb0a86ef2d7bb5ae0dfbe708b6746a43236eaa21903fe6e6590247722f8fb68632f850d018143f19a4b8b5b67609219f37e4249
 AUX xxe-4.0.2.patch 10657 BLAKE2B 6ecb7b265c55ee9cffda2a9acc0358dc092eec1d8040415665d22104bc8ca1d54473c471c542ae74cda68fe1a62ec3d1ecab0c29f4a017e24d895da1f66bbb4c SHA512 5c18a3c850526e6fd0410d0526bbf385d3383978b944de80da781301114f6a9081d2a3c662f45990fbd7ed88f971382b1ce30d974e4e76e19c11d6aa74d010d1
 DIST pysaml2-4.0.2.tar.gz 13657558 BLAKE2B 35cb9dff897caf9f7fc39a70466dabce88098b6bbe0337a2ae47c733e4fd5de3bd80ddf73f27b6ff67e6f571b1f647d9856bbed58c8b19fe6547a35254dc2019 SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14
 DIST pysaml2-4.5.0.tar.gz 20030696 BLAKE2B 547465c2c4191a26de6bf1bab55bd9c36ed7e477c620a4155b7a463c98dbf314a8067d45263055a05ec8ed696177fcbd1443dd856113871f2941b572b9df0628 SHA512 163dfc2acfa0f242bc97d3ec334aec98e993ef9265b2240223205e496f86df5518ca613620b371eabcca0c4070a0bf7bb72a2216f517e19e3b2ff0f20e30a0c7
 EBUILD pysaml2-4.0.2-r1.ebuild 1030 BLAKE2B 520548c8898e7c508ece1ae7c343b80eeabee5d2713fc5fbd367fa8fcfaa929463ccc9930e75c6375c86e92042a141b17f8c99866249341e0ef14fc9785889fd SHA512 7f0405c7dcad153ad041e1ced22c8d490e566fd090fd6baf61e9de3977de6d2d90c7b3e34899ce072b4bc0be58055e656546f62eef6ed57561a6ad85b2be3a4a
+EBUILD pysaml2-4.0.2-r3.ebuild 1083 BLAKE2B 4722c18270f2139a4238d3dd1d4430ecf9ced1edfaec70ab08c203520c4b3e0b3941fc8c531759a7708207aaa41d52226a264fe6e5c75a28d411121b648bf6b4 SHA512 132a6dfe3f0c81d6881277fc02c17fe284fb169baeb8cc461555c04da5574f8d282a01e7e4e337602770983eeaf2634c8f4ccbd4b8d3b9d5de4ba4885f49eb4a
 EBUILD pysaml2-4.5.0.ebuild 837 BLAKE2B ef546e17850b3d3088cda21c3cc31a18c7d80267ef51f89c091823c2e7b3ce5d64448a89d1f1b9bbb77780552b82058794d0b992ed3d0117522dd5ee924480b5 SHA512 6b313ff7137cb3b99ffa49148a2a76e10b5d1f4fe9256ac567e12b5be3698b8e95f0a7ab1d92b9b2c1136c3a0b512714730b6923468af5aeec3cfb469f813d76
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/files/pysaml-4.0.2_CVE-2017-1000433.patch b/dev-python/pysaml2/files/pysaml-4.0.2_CVE-2017-1000433.patch
new file mode 100644
index 000000000000..7abc765c2984
--- /dev/null
+++ b/dev-python/pysaml2/files/pysaml-4.0.2_CVE-2017-1000433.patch
@@ -0,0 +1,33 @@
+From 6312a41e037954850867f29d329e5007df1424a5 Mon Sep 17 00:00:00 2001
+From: Ioannis Kakavas <ikakavas@noc.grnet.gr>
+Date: Tue, 12 Sep 2017 12:22:47 +0300
+Subject: [PATCH] Quick fix for the authentication bypass due to optimizations
+ #451
+
+---
+ src/saml2/authn.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/saml2/authn.py b/src/saml2/authn.py
+index 1f2d02cf..1e1a220b 100644
+--- a/src/saml2/authn.py
++++ b/src/saml2/authn.py
+@@ -146,7 +146,8 @@ def __call__(self, cookie=None, policy_url=None, logo_url=None,
+         return resp
+ 
+     def _verify(self, pwd, user):
+-        assert is_equal(pwd, self.passwd[user])
++        if not is_equal(pwd, self.passwd[user]):
++            raise ValueError("Wrong password")
+ 
+     def verify(self, request, **kwargs):
+         """
+@@ -176,7 +177,7 @@ def verify(self, request, **kwargs):
+             return_to = create_return_url(self.return_to, _dict["query"][0],
+                                           **{self.query_param: "true"})
+             resp = Redirect(return_to, headers=[cookie])
+-        except (AssertionError, KeyError):
++        except (ValueError, KeyError):
+             resp = Unauthorized("Unknown user or wrong password")
+ 
+         return resp
diff --git a/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild b/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
new file mode 100644
index 000000000000..8b3dded83c0c
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
+HOMEPAGE="https://github.com/rohe/pysaml2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/xxe-4.0.2.patch"
+	"${FILESDIR}/pysaml-4.0.2_CVE-2017-1000433.patch"
+)
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/repoze-who[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index b5abdacea2ca..2aaecc7eebe9 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -2,6 +2,6 @@ AUX 1.10.0-no-setuptools.patch 545 BLAKE2B e884088c94e36283ce3e9a8df716cf25b040d
 AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
-EBUILD six-1.10.0.ebuild 1823 BLAKE2B bc29fccc4c631d29c84be40f5fcb9f61e81701e775078538efb4c2cfb7c4c94166fbe04d3f1aad7ebfa9b9dc5df6f55117b2e8c2a0f70629b59e1214af94fdf1 SHA512 258b5e8d0d9221d916260a1c2053b90224109933d3c87054588c2253910fcfb177e4bc329da491987eb88d7d7ff85b13a0057127c285855c2b896ba9ed8b9f51
+EBUILD six-1.10.0.ebuild 1820 BLAKE2B bbbae2233c95397a63029aec8b8f3ae2d161dea2406e9f9beaff577a42c11a3080e794a86d5efa55951a26a10902ee5b30ee0ddb8df2813a5a1a47a8bbfdda64 SHA512 4e68661a0b90e0f2235007aa98c1428f534080fbe593c52cd5400bb86dce440e5aae8a2df739f70ab8860fb2950cec895302800cba576377231657804373e2f0
 EBUILD six-1.11.0.ebuild 1095 BLAKE2B 6d6095cebcb5e05101a72f3f41042c71d0989c2037881bbcf733d673f87de56e07cacdad3b199d994ffbaac45171b162bae49284a0d8bc8b876e45696ee683c4 SHA512 87da6beb6dab97b5f20c6c84a69a7fc23a5f005958dd413ef299281db273691a6d97a3822619b12b5ca1bd47d36d0a9ba6ffa5c5c39703831709a660d61f16c5
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 950dd2975ff8..a7c52d164479 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
index 3427b51faab0..9cf835465bbf 100644
--- a/dev-python/tlslite/Manifest
+++ b/dev-python/tlslite/Manifest
@@ -1,3 +1,3 @@
 DIST tlslite-0.4.9.tar.gz 105402 BLAKE2B a26d0938dc713b701d6079263e46f44b23814708d04fef8698bd0b736e10d58ceb5e99dcb1ecdd66a225fc0a697aafdbb97ed46522229d3af7f760daf23f4d86 SHA512 5473139b5730ef946efa139fbb9adb3333dc67f33f03305f4a6d3b6eaaefce950ba93bc1053362fc31b9d68ff9f6deceb9449987e29ff44035b818d7310edbea
-EBUILD tlslite-0.4.9-r2.ebuild 878 BLAKE2B 0479a7e246e6093b63d0934a9b7726e3e9c9841f3e93a2d859112eccd57179990ce9234ea352af2aff6000cf9e573f3bbf00549fbad8418d4dc81f757accc65a SHA512 27f5c7767acd27f255a19a2c90a18cc4e130594f7c71215682ef9f6b4b81ee45f3407b0139421b26ead2e8434da724c02284089b77773d8d2b6b3d829b8f31ac
+EBUILD tlslite-0.4.9-r2.ebuild 882 BLAKE2B ef40129872619473963c0000800fef3f0d84cc24cc83c4a001ee7084a85ea840ab1a12f4425a499025ab38a0a235a24d3ab746727c301c05487d89adb5dee9a0 SHA512 01fff7fb7a1fc229b674aa8d383460747e30f4536d13b06ed3de2d5a3e9281cd403ce351f369a3450ab6c4ed5c52e952d528518a3661ec0fefb4b50762cd6a4e
 MISC metadata.xml 862 BLAKE2B efac680351c088ebb5c54afec47d1ff6539eba67860a891dedcf142ea2bcd56ec53a9ea7b5f5f16f90c70807bdf563344efb14a3308463413962e57bb22a475e SHA512 1374c0176a6a8386e8123bf1be106431d616de1b70d4b4948327b3e8f20a5d346bb622a2b83389aca1a0eda3f33591e9327929f2a7c062f04af80618ed3b0b8f
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index f4b5a7a47c55..b068342b957c 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9d9c007bf5c0..b104cede4546 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index d92f5f99c1fe..74785d20be99 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,10 +1,7 @@
-DIST msgpack-0.7.6.gem 74752 BLAKE2B 4ad445ce73c1ba2889a7989f15a06ddafc8c304a53096ed3b0881da3829d7a90e4456a017536dcac49c48fdaf39776534ef3270581ed58ee79375741dd93632c SHA512 9d30533175118c08f671015a99664e4798c845f63595495933b42f0fa95c160a6708e472da70baeb64537a704dd4768cdc9ab99a19045daabd92555b21f4e389
-DIST msgpack-1.0.3.gem 77312 BLAKE2B 57b02566009c19ff9c7886b82e6ac300c598462cfc3a8f29f07bf53e037508aeba5f6a783a865a49014bc9a99d5256f6dc59b20739ab7a3d34c84bc534cafb7f SHA512 b76db7f5c91128d19677774c7bf8c914a7e85e374fc0149bf5d0b470729fa01f4fdf173f7397e6f8df32af760a622a405cdc6d268f45b776b172bb39b9f1f4f7
 DIST msgpack-1.1.0.gem 78336 BLAKE2B 34b450bfded43cbbde3246ec581191de85131b6b74b4bf57ce6dce26cde3d6d40ab9f018e28b4b2e2b144c44cfaafd704ca4edd641371b179b3779f43c6ce23a SHA512 0142c9a446a476a7b4f9212513dd7b1fbe107193a473873f4eb6f4321d5515c42ea3540ac4de17f37f9e833f19bb75594d14b84ccf70b16d2a3840e066c873da
 DIST msgpack-1.2.0.gem 77824 BLAKE2B 15b44b5de8ae02ec6864323241a8827099d912850158c1bb81d32840ff7f0c7e53351d30b209f7c0bfea9e099c34ec724c98420bec45e0701918d883a16a8367 SHA512 c81d68519d5dfc6188799a889fde3d5aec0fc4231366da61914b028e8ef23c8de0bdc2399e634327ca1885566c14ceffe08def795417e386834d07dddf5f8836
-EBUILD msgpack-0.7.6.ebuild 1135 BLAKE2B e0e4232e256e721b5e3ff9e54c2244bae6cd09fc9521bc86dfac3a490c43d9ffead1ac4cc333e10c3e5f6462429414af1680d0009e355eb788a0baac37d4bdef SHA512 f0c00b42fab6d68ee37b8a8b56ac578517614fc5aaba7376d10e508926b20aa9bded94dcaecd440a56a91ef7a62dd10a3327f35aa323d03c339cd240cd65a4fb
-EBUILD msgpack-1.0.3.ebuild 1134 BLAKE2B a69cee974f76d65644db684152f1cdc0d53eeb635243d89dddd02314cb37064c79472096d4605a19b6696482b9ecc8e0d71ab343dfcac4981151ca7736b7ed65 SHA512 70de551f55543ff788216e6193d748e7f610f8957d1ced9701dadffc79fd2964b3c6692b2e7fbb1d755b9f41669a9fd782cf3f9b1fb353d76c27dd36c2cae8a2
+DIST msgpack-1.2.2.gem 78848 BLAKE2B b3ae75ebd6159a78c6a31ecc45bfe0474d5fe91672b6c9dfe96a561b07ebb5bc9ebf91477bc370fba199c5a8c187faa4995a90aa0209b8af81e6d06cd2e58b7b SHA512 7f7fa3350485c3888a42a78fc53f91029208bc6ee483b4c1a082dfa515d435295b6d2f57e9c4cc3f7805349e4a21854585997075d2535c0343af4ae1ec66a802
 EBUILD msgpack-1.1.0-r1.ebuild 1134 BLAKE2B 11fba0baa2676881c4c2044c3b1489be8b30a4a5ff3be1d7bc25ca952d57329899a4abcb882d73acd0e18811cf5d19d0b2985e288116551da0601cddb964b77b SHA512 203489b8cc169c99f692328a7952e11b49ffcb42f72f3a04a0bbccaff3d0187d632b31c2c2b8d56a7cd979ab7606ecaa2e3ee957781c3a92c1fcd1da16cd7f72
-EBUILD msgpack-1.1.0.ebuild 1134 BLAKE2B a69cee974f76d65644db684152f1cdc0d53eeb635243d89dddd02314cb37064c79472096d4605a19b6696482b9ecc8e0d71ab343dfcac4981151ca7736b7ed65 SHA512 70de551f55543ff788216e6193d748e7f610f8957d1ced9701dadffc79fd2964b3c6692b2e7fbb1d755b9f41669a9fd782cf3f9b1fb353d76c27dd36c2cae8a2
 EBUILD msgpack-1.2.0.ebuild 1134 BLAKE2B 11fba0baa2676881c4c2044c3b1489be8b30a4a5ff3be1d7bc25ca952d57329899a4abcb882d73acd0e18811cf5d19d0b2985e288116551da0601cddb964b77b SHA512 203489b8cc169c99f692328a7952e11b49ffcb42f72f3a04a0bbccaff3d0187d632b31c2c2b8d56a7cd979ab7606ecaa2e3ee957781c3a92c1fcd1da16cd7f72
+EBUILD msgpack-1.2.2.ebuild 1134 BLAKE2B c96c7d377e63ae95ffd1916ba016489b38c9c34387fc5b9dd52a9730e633f3b3b661f1d8d8b21f7f66fcd962a525d8ecb28ec6af509e44a0605eba96d5231601 SHA512 2345264a73acd9e213d5dc5d62843b83e06bc6d813bd843519b1483366c0a42c3168997329d71b90304f9d2d67f53ef74196ba6525a9b9d0247a10c66820476a
 MISC metadata.xml 331 BLAKE2B c964da6cce4e1e413377a6bf37282aa6ba207c33f3682ca5738361bb0df8c45dec063abe22f3183354b79b70707f897382a3412de1f6b185460a26ac2006f082 SHA512 5cff44a3b9425bbdccb3b682a26355c9526931b2826d7ff91da0d6db5e0dd139ae556a47dd06757b5cd209413b67181483189ba2dae819f70ffa58a46751c4c0
diff --git a/dev-ruby/msgpack/msgpack-0.7.6.ebuild b/dev-ruby/msgpack/msgpack-0.7.6.ebuild
deleted file mode 100644
index a4a1f467aa3c..000000000000
--- a/dev-ruby/msgpack/msgpack-0.7.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-
-	# rb_num2int is not inlined on 32 bit arches but also not explicitly
-	# defined, bug 582968
-	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/msgpack/msgpack-1.0.3.ebuild b/dev-ruby/msgpack/msgpack-1.0.3.ebuild
deleted file mode 100644
index 08bed06564e4..000000000000
--- a/dev-ruby/msgpack/msgpack-1.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-
-	# rb_num2int is not inlined on 32 bit arches but also not explicitly
-	# defined, bug 582968
-	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/msgpack/msgpack-1.1.0.ebuild b/dev-ruby/msgpack/msgpack-1.1.0.ebuild
deleted file mode 100644
index 08bed06564e4..000000000000
--- a/dev-ruby/msgpack/msgpack-1.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-
-	# rb_num2int is not inlined on 32 bit arches but also not explicitly
-	# defined, bug 582968
-	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/msgpack/msgpack-1.2.2.ebuild b/dev-ruby/msgpack/msgpack-1.2.2.ebuild
new file mode 100644
index 000000000000..ea2b33ee6acc
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+
+	# rb_num2int is not inlined on 32 bit arches but also not explicitly
+	# defined, bug 582968
+	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index 1cda080ca209..7afca3fd2ca8 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,7 +1,5 @@
-DIST parallel-1.11.2.tar.gz 20403 BLAKE2B dc10982b8bbfc5db07784fd991fff65dec673f37ae428cd657f2fd105c1fb1e79b3a94ddc4b2a826ae476523b3b4e3811a534f2c32f26706c29e00593d4c78f9 SHA512 4763abeb76ba50000eb88c85f661a794d784e457ed7ba6bd1367e65d802006bfd05cad017fb9a8fa3ca45ee87bb54c2dda218099fe78b2f6f36b05632d2ccd3d
 DIST parallel-1.12.0.tar.gz 20472 BLAKE2B b6e998588f94e07194c19d4bf38964aa5e846b7f62c7a267041473a237a9d8fdebb4dc501695b00902c852021ce7817b24bfe01dcf4c0e18445b46d46c7cb42b SHA512 8ca41cf577ee4743ef50abe693d0040eaab12b61eca17c3d6c33d3720c38563e2df9a0eb5af0fe9d8c34c3b910f1c626ce141fd2eb7d2edfbe5abbcb9f54191b
 DIST parallel-1.12.1.tar.gz 20499 BLAKE2B f0fa25b9fe65e44804854f703dd2d80e53572e64c2072c418d0462922bd04f89cff0e023caf4293d8a1504ad66a2a29ebbdd01920fc6fe400837859da0f0eb78 SHA512 f0ab332dfa60bb3190bba8275dbdf7b54d3de205ab76099d11f0a64e1fc28e1ba7e72d1a242bd615015c2d09a3f08df01c382869fd6990b854b01fe182245857
-EBUILD parallel-1.11.2.ebuild 1498 BLAKE2B c1487c2465a5827284ac87a87243d5c9edd10a6f42f8c1fc496d944f0d6a90bf9916f8884f26e47db87ee680160717199717b032eb581633db4ab644d5bc9535 SHA512 ade72762ead45cb9a9352c2132cd8181f5a6f082431b1c2dc94553b0ad6f9802450adde8d7e18465807f7ce782d01d7c5d029f56d5027d50af5ebf1ab222b207
 EBUILD parallel-1.12.0.ebuild 1703 BLAKE2B ba3bce20cf9bf46583d7f86a96672e7634d2b41db785589b8048dd56452ff6b3f1b215638a3d189d677b9e597278ca5462b907179650ec49005f5d5345b16ac4 SHA512 da3a7ed5449817d475ab381949bf8e55d32abe4b319a0000960c3cdc38b5c62f909dc40c9a8ff8b18b75072429fb9da1c48754779c565f13aaafafac9ce9179d
 EBUILD parallel-1.12.1.ebuild 1719 BLAKE2B 623bca5065f52cf4cacaff1826493d2edbe268b9f540e4d877941843f05a237a0a9c37fa4e8ef729fcd714c7d76a042aecebf17647d97010cda40496e3384758 SHA512 6973d3bef49c096ee20093fb7e3860c72c319e02480dbeb4dd528336b751ecac2fc7688210a856558c94daa6b510f622335d8e918955f930dbb98a98deb80030
 MISC metadata.xml 342 BLAKE2B 0860273d70423cb92207369335e1f684ea623e1217d7aaf4d016d9aff9c02b0b8dc9af3654b523f77cbd8d92f7043887a97ff87abb79d3c65b66b0e6b40082fb SHA512 805eaecfea071b1d632ade7da42ed63717d2f829c4c99e29a4600b26a81e87c4032d7ee441b865d86f37faa13f455c9f2888dc8099178cf6211ae13d3e3e1835
diff --git a/dev-ruby/parallel/parallel-1.11.2.ebuild b/dev-ruby/parallel/parallel-1.11.2.ebuild
deleted file mode 100644
index fb6b05d0a0e7..000000000000
--- a/dev-ruby/parallel/parallel-1.11.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run any code in parallel Processes or Threads"
-HOMEPAGE="https://github.com/grosser/parallel"
-LICENSE="MIT"
-SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE="test"
-
-DEPEND+="test? ( sys-process/lsof )"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:4.2 dev-ruby/sqlite3 )"
-
-each_ruby_prepare() {
-	# Make sure the correct ruby is used for testing
-	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '1i require "tempfile"; gem "activerecord", "~>4.2.0"' spec/cases/helper.rb || die
-	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
-
-	# Avoid a failing spec regarding to pipes. The spec seems like it
-	# should always fail.
-	sed -e '/does not open unnecessary pipes/,/end/ s:^:#:' \
-		-i spec/parallel_spec.rb || die
-
-	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
-	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
-	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 43ec7ad3523f..7d2e21e297f3 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/greg/Manifest b/dev-scheme/greg/Manifest
index 56e3bfd56b65..2965b362baa2 100644
--- a/dev-scheme/greg/Manifest
+++ b/dev-scheme/greg/Manifest
@@ -1,4 +1,3 @@
-AUX 2.0.0-notest.patch 187 BLAKE2B 9e4bf736c1b24f247836226d07aa51598111235c0aa6478d2852a782c1d03007e93ecb0604cc7099ebe9bc980b0ad22101d8fd91277b899454de2791f044652f SHA512 c4de1e03d627964ef907e88b8a361a00298ba967b065aff4351958cd216fa113d89b4152b74eb179e09ab15aee4669186934b62865b67462884eb72a08267a82
 AUX greg-2.0.0-guile2.patch 656 BLAKE2B 3d900d3f54ac8eb728dc34b6d835272310dd1209b85f1750351596bac24ba8b0a5b46e87ccdeb17970ad1dd380716bd314047dde78c374ac16ce4d51c1ee479a SHA512 93c7316960df570a3611dbe1b4ccff9b25ccbaf173c947b1259f158ddfbe52faa47b334ac83af78829ad3ebb10efef40f6e5f8abc4ea1a26c904c4a895823a33
 AUX greg-2.0.0-test.patch 187 BLAKE2B 9e4bf736c1b24f247836226d07aa51598111235c0aa6478d2852a782c1d03007e93ecb0604cc7099ebe9bc980b0ad22101d8fd91277b899454de2791f044652f SHA512 c4de1e03d627964ef907e88b8a361a00298ba967b065aff4351958cd216fa113d89b4152b74eb179e09ab15aee4669186934b62865b67462884eb72a08267a82
 DIST greg-2.0.0.tar.gz 453598 BLAKE2B 8f14f292949c9e252a941fa2fddcdb29efafc6e43edb863d2df72178d77e8d7826cbe7a098110f7ec88e6ca3b2d1b8725f9c7c9623f1ac5c7a5d3a65fbef8b93 SHA512 d20523b4f6fcfcb183615866a3b322dad39579707f6979ad1edf11dac4c93f5c8dda109a4d832aae597b44397befe81afb6ae9be282556228ade1ad48e8a17eb
diff --git a/dev-scheme/greg/files/2.0.0-notest.patch b/dev-scheme/greg/files/2.0.0-notest.patch
deleted file mode 100644
index 26a6cdf1c0ad..000000000000
--- a/dev-scheme/greg/files/2.0.0-notest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 3cda45d..c61b34e 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -23,7 +23,6 @@
- 
- 
- all:
--	./test.sh
- 
- check:
- 	./test.sh
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index ef2df52a9f62..81593a881ab6 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/abntex/Manifest b/dev-tex/abntex/Manifest
index afc9f4b1b613..9b545054416d 100644
--- a/dev-tex/abntex/Manifest
+++ b/dev-tex/abntex/Manifest
@@ -1,4 +1,4 @@
 DIST abntex-0.9-beta2.tar.gz 159150 BLAKE2B 6dc7417e0652f8175929d31d6f03ae4948c5510f547944258a44d0dad7b4641108e6ec5165684ddf4f6107c37d8aa35991d271b4db667ad8afdf7b5cfdab3152 SHA512 00027c5a7a60b15f9e1bf2cb782d6bdf106fbbff33b1c0be13f6404de9e3c81957a27d7c843b209a1f3b4660eb43236ff601034741cd560e6d88274f04a4edb8
 DIST abntex-doc-0.9-beta2.tar.gz 1350153 BLAKE2B 16e916c88b324d969ac72ab4b7b59e258ecc56cc245d192a60c8c11317be1800e0f1df4e3324216b32baa7b1d9fe8a6bde81ec7a9deb18cb84cfac1f5db6ea02 SHA512 2084e4d3a613140ab53dab2c782e0b7e07294bf60615d79ac7b0a75fd6ae350f365401fb5722266c1e540ab8a94671299cabcd007f799be01c520f39d1af6878
-EBUILD abntex-0.9_beta2.ebuild 1404 BLAKE2B 17a083cab873de83d03c4b39cb5f6bf2988281e36bb6872c05d1309b9dc97c48a08d5766ac6babd75fd18de0bed575f97aec868300c03ed775b9c96661c667b5 SHA512 ff2670efbef002e704f71016f201b8df3f8ef87d338368f25aac8a830040c9838b3db3a2b2a02881771c229373b6b606e642ccc1f2c43fef925c155c48caf2b1
+EBUILD abntex-0.9_beta2-r1.ebuild 1223 BLAKE2B d1c566c6231d84b1cae5377a12b908ca0b0667fa10343be9e109651a449e474336ef423c9d32b85561f0f76a3c79bd5b03d3acd6b688b3bb66d3f81c58493d86 SHA512 606b112ffd4747cbde950d76120d7d0b2053c13e870abd8a0f8c6386ad73fb11cb232afcdf486f3fc931b128a6dc2227eec04921045db80d0e3872c1ae0255f2
 MISC metadata.xml 530 BLAKE2B e53a751233e50d245c6f3639e57e273dfd8ee0470236c16192e54f951f749ff1c4459016490063e339145efc500aad0154824078fe3ad907546e3acf1665e154 SHA512 84109b451aa326477d5b46a56c02b7bfcfd7d6a9b1da146befc11a5b91580894987223bcdd19c4179adfab4aec809a0b837723e5c5a73a54f899f6098e9bd5cc
diff --git a/dev-tex/abntex/abntex-0.9_beta2-r1.ebuild b/dev-tex/abntex/abntex-0.9_beta2-r1.ebuild
new file mode 100644
index 000000000000..e198e8baa33b
--- /dev/null
+++ b/dev-tex/abntex/abntex-0.9_beta2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit latex-package
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="LaTeX macros for writing documents following the ABNT norms"
+HOMEPAGE="http://abntex.codigolivre.org.br/ http://abntex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${PN}-doc-${MY_PV}.tar.gz )"
+
+LICENSE="LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples lyx"
+
+DEPEND="dev-texlive/texlive-latex
+	dev-texlive/texlive-latexrecommended
+	lyx? ( app-office/lyx )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P%-*}"
+
+src_prepare() {
+	# fix permissions
+	find . -type f -exec chmod 0644 "{}" + || die 'chmod 0644 failed.'
+	find . -type d -exec chmod 0755 "{}" + || die 'chmod 0755 failed.'
+	default
+}
+
+src_install() {
+	dobin bin/geratss
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r texmf/doc/*
+	fi
+
+	rm -rf texmf/doc || die
+
+	insinto /usr/share/texmf-site
+	doins -r texmf/*
+
+	if use lyx; then
+		insinto /usr/share/lyx
+		doins -r lyx/*
+	fi
+
+	dodoc LEIAME
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/docs
+		doins -r compiled.docs/*
+	fi
+}
diff --git a/dev-tex/abntex/abntex-0.9_beta2.ebuild b/dev-tex/abntex/abntex-0.9_beta2.ebuild
deleted file mode 100644
index a2c742a8a63c..000000000000
--- a/dev-tex/abntex/abntex-0.9_beta2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit latex-package
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="LaTeX macros for writing documents following the ABNT norms"
-HOMEPAGE="http://abntex.codigolivre.org.br/ http://abntex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-doc-${MY_PV}.tar.gz )"
-
-LICENSE="LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples lyx"
-
-DEPEND="dev-texlive/texlive-latex
-	dev-texlive/texlive-latexrecommended
-	lyx? ( app-office/lyx )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P%-*}"
-
-src_prepare() {
-	# fix permissions
-	find . -type f -exec chmod 0644 "{}" + || die 'chmod 0644 failed.'
-	find . -type d -exec chmod 0755 "{}" + || die 'chmod 0755 failed.'
-}
-
-src_install() {
-	dobin bin/geratss || die 'dobin failed.'
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r texmf/doc/* || die 'could not install examples.'
-	fi
-
-	rm -rf texmf/doc
-
-	insinto /usr/share/texmf-site
-	doins -r texmf/* || die 'could not install texmf.'
-
-	if use lyx; then
-		insinto /usr/share/lyx
-		doins -r lyx/* || die 'could not install lyx files.'
-	fi
-
-	dodoc LEIAME || die 'could not install LEIAME'
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/docs
-		doins -r compiled.docs/* || die "could not install doc"
-	fi
-}
diff --git a/dev-tex/hlatex/Manifest b/dev-tex/hlatex/Manifest
index 26f14ef5931b..56d56be8a265 100644
--- a/dev-tex/hlatex/Manifest
+++ b/dev-tex/hlatex/Manifest
@@ -14,5 +14,6 @@ DIST uhc-shinmun-1.0.tar.gz 4794977 BLAKE2B 84e1e3a872acf6897d34261a676fb810ef58
 DIST uhc-taza-1.0.tar.gz 1338672 BLAKE2B 8c91e9d1c0490c4e63760baa933f6639aa20fd441868d259f21839816e3abbaf6d7e664a0c76d6afb7bca06c86aa2c78e43a6de74273c158d32a2c4368a0e9f3 SHA512 87ae8ff615e76b1a570f14a4d8f29ae3e15a7dccb75c7b80c1e5bb64374c2b749090f9f6a706cfd74c36d39584549cd36bdbd2ede13c50a9c9d5c3b8a44346b8
 DIST uhc-vada-1.0.tar.gz 1225522 BLAKE2B f15ffe19bc9ae2ec83116ab700b12716bea53a8cdc5bb62e5362eff4e17d9feaa2c1decdbf0bc7e2ad1228cd96d95347e415ec91222db44d5d0687143b661b17 SHA512 663ea0a1d3f968dc30387cd7962962969af6c2ade41c6de585f24b116e79ce897539ddb412735bd19a7c1083a69bd975ba198b442ca25ea30d6811ebbb8421ad
 DIST uhc-yetgul-1.0.tar.gz 5198946 BLAKE2B a9795852f0a075b78896f76fe01301104b16b21fd8b44d5545f99c6bbaf038f64a25bd5805ca65b09d627162651814856fb997d933740e19e638e161f597df7d SHA512 e620bfc42eb30d3b3a60964a68071d6ea68a2a6a8f1c9e1d07a3a9c75dcfabb6b26beb5d65ba76c16aaee5f1cd42c87991033d581e49acc67bae923aefaf6ddd
+EBUILD hlatex-1.0.1-r1.ebuild 2416 BLAKE2B eb33e6e05777036a0c80bd9d84b64193107c899d32847a2ea615e40ae40d800286f9617b1a823d484a75c456ff832d8dafbe542a5e53ed19dc9c74f87b490af6 SHA512 74dc54c9331c202470a79c398cc3d36bbae76bd0c17096221012d6b061e372abba204091ff7a4324eb28772573e6f1bc186abe87932c2ac3eb87059d9ffc02de
 EBUILD hlatex-1.0.1.ebuild 2419 BLAKE2B b66e156f087752aa05ca78a1282d0702adf591e6395dca6253288e65d5034fd6e13295e2e1d77636046390a322fe1e2b008b5b32ee3fb729e7c09aebccd6f22d SHA512 34c079942f96facb7d3f14eca3a8d8a47574388130dc973979680135a37086f36b61cd998640295359e99f828e824ea9ab3ec0964c12aa0a2bb2fa231a77075d
 MISC metadata.xml 336 BLAKE2B b50f21b184d0548ece37497188f8d6cd0dd664ef669c7e64af31accefa53819e1a20dc8a40a7aff7d28546444ce26bd8eeca12acd9d9ea9459d8764a5ace1464 SHA512 e94ba5fcd5ceb62065d4bcc67d0ef1fa9053589073124a55a775324ea9bdab3d8af4aa3ba393f3388674c73fe9b58fd6598b815bc481a1b2caadf1dce11b75a2
diff --git a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..c1cf71c7a38a
--- /dev/null
+++ b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs latex-package
+
+MY_P="HLaTeX-${PV}"
+DESCRIPTION="HLaTeX is a LaTeX package to use Hangul with LaTeX"
+HOMEPAGE="http://project.ktug.or.kr/hlatex/"
+UHCFONTS="uhc-myoungjo-1.0.tar.gz
+	uhc-gothic-1.0.tar.gz
+	uhc-taza-1.0.tar.gz
+	uhc-graphic-1.0.tar.gz
+	uhc-gungseo-1.0.tar.gz
+	uhc-shinmun-1.0.tar.gz
+	uhc-pilgi-1.0.tar.gz
+	uhc-pen-1.0.tar.gz
+	uhc-bom-1.0.tar.gz
+	uhc-yetgul-1.0.tar.gz
+	uhc-jamo-1.0.tar.gz
+	uhc-vada-1.0.tar.gz
+	uhc-pilgia-1.0.tar.gz
+	uhc-dinaru-1.0.tar.gz"
+
+SRC_URI="ftp://ftp.ktug.or.kr/pub/ktug/hlatex/${MY_P}.tar.gz
+	ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz
+	${UHCFONTS//uhc-/ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S="${WORKDIR}/HLaTeX"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	unpack uhc-fonts-1.0.tar.gz
+	cd "${S}"/contrib
+	cat >Makefile <<-EOF
+CC=$(tc-getCC)
+all: hmakeindex hbibtex
+hmakeindex: hmakeindex.c
+hbibtex: hbibtex.c
+EOF
+}
+
+src_compile() {
+	cd "${S}"/contrib
+	emake
+}
+
+src_install() {
+	cd "${S}"/latex
+		insinto ${TEXMF}/tex/latex/hlatex
+		doins *
+
+	cd "${S}"/lambda
+		insinto ${TEXMF}/tex/lambda/hlatex
+		doins u8hangul.tex uhc-test.tex uhc*.fd
+
+		insinto ${TEXMF}/omega/otp/hlatex
+		doins hlatex.otp
+
+		insinto ${TEXMF}/omega/ocp/hlatex
+		doins hlatex.ocp
+
+	cd "${S}"/contrib
+		insinto ${TEXMF}/tex/latex/hlatex
+		doins hbname-k.tex khyper.sty showhkeys.sty showhtags.sty
+		doins hangulfn.sty hfn-k.tex
+
+		insinto ${TEXMF}/tex/lambda/hlatex
+		doins hbname-u.tex hfn-u.tex
+
+		insinto ${TEXMF}/bibtex/bst/hlatex
+		doins halpha.bst
+
+		insinto ${TEXMF}/makeindex
+		doins hind.ist hglo.ist
+
+		dobin hmakeindex hbibtex
+
+	cd "${S}"
+		dodoc ChangeLog.ko NEWS* README.en
+
+	cd "${WORKDIR}"/uhc-fonts-1.0
+		insinto ${TEXMF}/fonts/map/hlatex
+		doins uhc-base.map uhc-extra.map
+
+	cd "${ED}"/${TEXMF}/fonts
+	for X in ${UHCFONTS}
+	do
+		unpack ${X}
+	done
+}
+
+pkg_postinst() {
+	updmap-sys --enable Map=uhc-base.map
+	updmap-sys --enable Map=uhc-extra.map
+	texhash
+}
+
+pkg_postrm() {
+	if [ ! -e "${EPREFIX}"${TEXMF}/fonts/map/hlatex/uhc-base.map ] ; then
+		updmap-sys --disable Map=uhc-base.map
+	fi
+
+	if [ ! -e "${EPREFIX}"${TEXMF}/fonts/map/hlatex/uhc-extra.map ] ; then
+		updmap-sys --disable Map=uhc-extra.map
+	fi
+
+	texhash
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5a2b9846fd79..50778a16a909 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 1dea5537aab1..655688fb85f4 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,5 +1,5 @@
 DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
 DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
-EBUILD diffstat-1.60.ebuild 606 BLAKE2B 767166957e80cb255752be8a101c93cf8b5c72957dbf65305f6e5dc828eea46024e0e7d4820e0cf3249145097b8c23a2dd7727acfe3e17cc4c7b9153cbf00a00 SHA512 f9b668284eaa472eb843f727d18ec7d4d4a3a00306be366fb389f4fb3071d897bf88086739bf553b7f1c3383136841b23e169f435a5a323cc2760795d6281160
+EBUILD diffstat-1.60.ebuild 603 BLAKE2B 0b6336087524d39f4fc139734238e236a54c9f952b00ea01aaafaebf37144296cb453022019c9de0d3a57736e37fd4cc7db3be9114f2bb01208b14522fb5b5f5 SHA512 05f1b9e6c712aef48e86007a1ff059e6bfc7db45d0ed2714ca32bb852216d93edd08c709dea737872f6ad50eb0f7fa93f3900a1a8f3385e94936d79b04b8800e
 EBUILD diffstat-1.61.ebuild 476 BLAKE2B 9a57ba415f5a338f4c4c69b2e6bde145e3eeda76cc1245886a672c417e6a767fb51808e2fbcac8d72633b1477e2be28d6ea2cce5b59cc5bb8fa47423cb11a202 SHA512 adedfaa3c6e22c00afd84afcc3f6141e4ac26efd4ab3f73fe1f992ea78e26ff9a7b2d38e63456069a8e88f99b643e8ae2f0d4ae82386e2d6b398729d0325ccf9
 MISC metadata.xml 370 BLAKE2B da80af289cfaf95658c9a1b5ddde6229fff88a2f98550303c5617d94e65ab99cc11f295d077a25bbb4305f1c0f3933cedbca22e2072089930291aae68f231197 SHA512 f9979216cd41510953e4ad5ea2f7f6081fe730907ca15b0e48106079c0c44ca0fcd9fcaf3fc47aa11e0bd57135ab9dab0828148a37e51de5984612fd028521c6
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index d0628ec89c72..de0a11a90895 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 247c5d3c9aac..6cf3acd9f0ba 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,5 +1,7 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
 DIST drone-cli-0.8.0.tar.gz 1149494 BLAKE2B 6be4edf8a122919570319867d2981fd56fe644093f83216fc17ff4d17e6caa13f163748b6eec68eb6ebab86259bf10fc8636670248fb382120a72738b918ac9b SHA512 5dc9a9910a76e31f0f9f845e1d59a0dc8371463de295f35090efdc16230b1458cc2d2f8632e91c46d18efb0c154874c65388cf6a37cca72b72f08d56b61cae72
+DIST drone-cli-0.8.1.tar.gz 1150026 BLAKE2B 25197e3e8d15f07026251d68689fea1fab03329121b748bfd3c06d6310fb76de743934467e7c453492a7843c7ee0a925161e7f4dd912949490c4adad1d896dac SHA512 c3f157ae4f7deebc1641e73bbbf218da85d0f732143941c2c37a52fd6c7db0951d6ed6dc6d55920641a3b9a7a10537813442353890699075bdfd072601b82cd3
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
 EBUILD drone-cli-0.8.0.ebuild 784 BLAKE2B 18cb3725cfcd63ec71ecc2b060e642b6d7a1975a53aded45e14420e7f39992c52109ea943bb4b8f10116901f68cd9808c23e7b922bf089bf1e4a7e88970b2fd4 SHA512 3dcf6b16268b39b395db9e1b0164e74847ce411862de4f789a2d2c48a5844b39c54696df2306aaa868212d51e0024fc70dac1d90cfc1b69b1f9835ba57547ffd
+EBUILD drone-cli-0.8.1.ebuild 776 BLAKE2B 91e46038938be9e771d9e979f9663e9843e013f3cc4d1bd835270152374414b8b85a5eaec144ccf2e5b05c0f8830d35a7aa80d9cb5f64f6ad2ab90ffa01c73f7 SHA512 c95490546d157429a0bf1121a3e44794015d357ff3b9977325c89769c332311d469147fd620e38d8799ab1d4307f29170495169ec9d97b8fa7f42591506f87dd
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.8.1.ebuild b/dev-util/drone-cli/drone-cli-0.8.1.ebuild
new file mode 100644
index 000000000000..950e201a21ba
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-0.8.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+EGIT_COMMIT="1cb942f726e6c616bb78c85b70baa61ba01152a2"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index c32ff4b6f371..6943c3b5024b 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -3,5 +3,5 @@ AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
 EBUILD intltool-0.51.0-r1.ebuild 1011 BLAKE2B 7c77d87124a43a915f983811b363b2ea337d8f35f00bb826ae7f0bcb7952948d5e9bc3cbb39292cee37b9fd82478ecae9e941cfd736aad5990f9956e3d3c6cc8 SHA512 f2c21fc3cae62a6a18dfd5440f2b4499d3e2386a3c750c1d3d642f6759a51369ea14f6d4deb1e74a3c2eaa84f52c9106b87bfdfceb3855a16b3b6cd4f1e7397e
-EBUILD intltool-0.51.0-r2.ebuild 1013 BLAKE2B b8c0f3521ea1597af025d3bcd632c13fa57e6b6b7469e2be785f5ebd3b0373b467fb369650628539e57dc1d2df6b2688c7b84aaff807029b880ab5e7034e8e14 SHA512 7d1238a166f2f21e16e0bd15d4ffd6e8a02b48a9ea9f3b0ed430242af0f14a84e65f01dacbbcfcc6f306fb34b04f784379fda503e4684442cbddb9f56f92dfee
+EBUILD intltool-0.51.0-r2.ebuild 1010 BLAKE2B 71cbec40be07e6285b4ca62d41ce5e6052cec1d6da470e68b47da5489ac5ab64e5fe1c54ec846c4e7654ce09a4d2762908b10813dabf3d1535684e591789d1ab SHA512 2214bd9b25c12bf6886e63e54ec37fd00f16d2a2fb577753be70b0de3af9889952b411be08f08d47906dfcc7132c759141cefd1fc05f5c732f6fc49651999249
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index fac4bd791102..2bde1170cf16 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 88b452ddf14e..9a1073c574fd 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 96a270fff66d..7199cb0f9ebd 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -23,7 +23,7 @@ DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe1002
 DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
 DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
 DIST git-manpages-2.16.0.rc1.tar.xz 417108 BLAKE2B 8fe8c4fe68039c565af22b6f95ec3bd92e918857f7d18c504c74891bccd8e46c964f4d0acb794b47426f163f4151af7f50b5c979ca3b1d019257107ef26f7d47 SHA512 f14ad4b06f5125335e5300e65f96e854edaab95a3f79d5942aca15eb72820643650a6ebf9524925df7def2c1f6b359c14c3e8cc7ea94710ebf2c33de66f62deb
-EBUILD git-2.13.6.ebuild 19016 BLAKE2B 2ce31b1ec5d0347045270fe767e2a665b7e0dfa3af355c526eb4544aa73891d27ec58e56a877a4ad2a4ca84ed798d0dc19e6fddac3e3e6fb9c6c89e6bed9a7b5 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d
+EBUILD git-2.13.6.ebuild 19013 BLAKE2B 33cda14b40308cbafc3ad5895eea7126c27ef20dc8d8a4dd3c0740b52046096bac6d6ad4a9d9894513d1eadb379c323c0ecbe1bcbb470ab6e11d6950f4d2f504 SHA512 ba6f3f6a4bc384d8c7cd1061fec38d5037e0007d050061dbb854a705ae1d93ce93d9572feea6d97800169db178811ad2266499949c15ba37389f749a25552274
 EBUILD git-2.14.3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-2.15.1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
 EBUILD git-2.16.0_rc1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index 5046a24af691..81e7734629c8 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -38,7 +38,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 55b4cfb4f509..38633d1e78db 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 90157d1ff118..4e1842786fbd 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,4 +1,5 @@
+AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4663 BLAKE2B c2378082421db3271fbd350eb2162bd8f07b8aec19edc487080eba9fb77b3e0316ae7a0ab84b2df0d78b0e7afa9d1b7d602e9bab8a69cc58a7f7194d0cce746b SHA512 7ad78f21fc2bb0b9e1fe5a26f0568f068729da61ea2d531fb8f92b18ee4bdd0572b42a41baeac300f62a731ce41259d878390f3c9bb6ba6ff62c0ca90b05a74e
+EBUILD dolphin-5.0.ebuild 4448 BLAKE2B 4dcdfc0bb5c6ca3fbb60a18c16d8f35bc9833e677a9bfbb015ea7176e362b1be15d57d45b5cae478739872b4bac0743236789807b50d3d22c7b64f95aa659a74 SHA512 c233e2117543315b920fa79fa73c3dcf56b0f7fea102be1464c1830c4308c9de3e8751b747fbb4423e4adc5c18bef64df2845f725661941e42152c749edb7d9e
 EBUILD dolphin-9999.ebuild 4788 BLAKE2B 32c316edeeeb8a9c17f8dd610d12f00e4c7c26d7fa4eee5e63e78d22ca0a76a7666ea924de0c4ff7282446516d33032e4f183afc95887f3d206247285092301c SHA512 45bcc0bfbe7b1db17713f94a89be5df7146b720457ce4fe1f881ac981b4757c5e0125f9079b3fa10d4f313443919c469c790bfb095acbd107078fc2d6933f988
 MISC metadata.xml 836 BLAKE2B 786a1a9f4e7d76c0111bd9755f784a0bba5607465e2693986c6e2f37e0a32f9ceea84c902464ea47b66f84c183660d5767f569ae933c6b8774d47a15de4c6f30 SHA512 7bdcb2ba2f3a1fa247080a08da495274bea1f61bec1a88e824ebd44fb7e21e74e7ef52855c1c6fba07f12b278df19c0014ba98a5b6ec50f62c08b0ee31e5fc6b
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 66b0fe9c7dab..190053251053 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_B
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
+inherit cmake-utils desktop l10n pax-utils toolchain-funcs versionator wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 KEYWORDS="amd64"
@@ -17,15 +17,15 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
 
-RDEPEND=">=media-libs/libsfml-2.1
+RDEPEND="
+	>=media-libs/libsfml-2.1
 	>net-libs/enet-1.3.7
 	>=net-libs/mbedtls-2.1.1
 	dev-libs/lzo
-	media-libs/libpng:=
-	sys-libs/glibc
-	sys-libs/readline:=
+	media-libs/libpng:0=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	x11-libs/libXext
 	x11-libs/libXi
@@ -37,14 +37,17 @@ RDEPEND=">=media-libs/libsfml-2.1
 	bluetooth? ( net-wireless/bluez )
 	egl? ( media-libs/mesa[egl] )
 	evdev? (
-			dev-libs/libevdev
-			virtual/udev
+		dev-libs/libevdev
+		virtual/udev
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
 	)
-	ffmpeg? ( virtual/ffmpeg )
 	llvm? ( sys-devel/llvm )
 	openal? (
-			media-libs/openal
-			media-libs/libsoundtouch
+		media-libs/openal
+		media-libs/libsoundtouch
 	)
 	portaudio? ( media-libs/portaudio )
 	profile? ( dev-util/oprofile )
@@ -57,35 +60,20 @@ RDEPEND=">=media-libs/libsfml-2.1
 	sdl? ( media-libs/libsdl2[haptic,joystick] )
 	upnp? ( >=net-libs/miniupnpc-1.7 )
 	wxwidgets? (
-				dev-libs/glib:2
-				x11-libs/gtk+:2
-				x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)
-	"
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
+	)"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.8.8
-	>=sys-devel/gcc-4.9.0
 	app-arch/zip
 	media-libs/freetype
 	sys-devel/gettext
-	virtual/pkgconfig
-	"
-
-pkg_pretend() {
-
-	local ver=4.9.0
-	local msg="${PN} needs at least GCC ${ver} set to compile."
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! version_is_at_least ${ver} $(gcc-fullversion); then
-			eerror ${msg}
-			die ${msg}
-		fi
-	fi
+	virtual/pkgconfig"
 
-}
+PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch )
 
 src_prepare() {
+	cmake-utils_src_prepare
 
 	# Remove automatic dependencies to prevent building without flags enabled.
 	if use !alsa; then
@@ -139,13 +127,12 @@ src_prepare() {
 }
 
 src_configure() {
-
 	if use wxwidgets; then
 		need-wxwidgets unicode
 	fi
 
 	local mycmakeargs=(
-		"-DUSE_SHARED_ENET=ON"
+		-DUSE_SHARED_ENET=ON
 		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
 		$( cmake-utils_use log FASTLOG )
 		$( cmake-utils_use profile OPROFILING )
@@ -162,12 +149,7 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-
-	cmake-utils_src_compile
-}
 src_install() {
-
 	cmake-utils_src_install
 
 	dodoc Readme.md
diff --git a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
new file mode 100644
index 000000000000..d6e4c7a2dc0e
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
@@ -0,0 +1,49 @@
+Avoid clash with TS 18661-1:2014 macros
+https://bugs.gentoo.org/637986
+
+--- a/Source/Core/VideoBackends/OGL/RasterFont.cpp
++++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp
+@@ -15,7 +15,7 @@
+ namespace OGL
+ {
+ 
+-static const int CHAR_WIDTH = 8;
++static const int DOLPHIN_CHAR_WIDTH = 8;
+ static const int CHAR_HEIGHT = 13;
+ static const int CHAR_OFFSET = 32;
+ static const int CHAR_COUNT = 95;
+@@ -146,20 +146,20 @@
+ 	glGenTextures(1, &texture);
+ 	glActiveTexture(GL_TEXTURE8);
+ 	glBindTexture(GL_TEXTURE_2D, texture);
+-	std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
++	std::vector<u32> texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
+ 	for (int y = 0; y < CHAR_HEIGHT; y++)
+ 	{
+ 		for (int c = 0; c < CHAR_COUNT; c++)
+ 		{
+-			for (int x = 0; x < CHAR_WIDTH; x++)
++			for (int x = 0; x < DOLPHIN_CHAR_WIDTH; x++)
+ 			{
+-				bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
+-				texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
++				bool pixel = (0 != (rasters[c][y] & (1 << (DOLPHIN_CHAR_WIDTH - x - 1))));
++				texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * y + DOLPHIN_CHAR_WIDTH * c + x] = pixel ? -1 : 0;
+ 			}
+ 		}
+ 	}
+ 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
++	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, DOLPHIN_CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
+ 
+ 	// generate shader
+ 	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
+@@ -196,7 +196,7 @@
+ 	std::vector<GLfloat> vertices(text.length() * 6 * 4);
+ 
+ 	int usage = 0;
+-	GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
++	GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth);
+ 	GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
+ 	GLfloat border_x = 2.0f / GLfloat(bbWidth);
+ 	GLfloat border_y = 4.0f / GLfloat(bbHeight);
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index d9491330c11d..872b32c2d143 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,7 +1,8 @@
 AUX dosbox-0.74-gcc46.patch 274 BLAKE2B 6375a8c0752eed6481cfc987ac3b7c7f699d745498e619862223dcbf660eef21f7619ef5b8e2034d20ad09716714988875e30d1959fe29393fd96559a2d710df SHA512 3175ba75be568d24286501844073bebbd2ae2e770ca6bdd9d409b290ca7b9f98a8406b5b92b89a9965eeda8045f2ac9634aacf8eb01917cbf02087996de53177
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
+DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
 EBUILD dosbox-0.74_p20160629-r1.ebuild 1787 BLAKE2B 7a7c60b909d4a4b4e424d5baa03b5ca7247697c6d993f5aed8690d9eb35b708e62626febc56b94dbd7ca70ecbfd3b93ce4327128e2272a97f5ff1ddd26307a03 SHA512 f4e67047d01f2ca91fa446136ec2829c589c37f2cca664e1ff1292a5ec78fa8a44f78defcdfd23e556ffa2a2d3b2f9a403e4178f3dca36b5ea58307ca1c52889
 EBUILD dosbox-0.74_p20160629.ebuild 1074 BLAKE2B 1d8f874307886cd84f6573784e4d1af6117841c49242352a57109b82879a58ae12a8a512f40eb65fc64b3e294455d278671f3ee7dd46497569954219c566a8a6 SHA512 00edfb8cf1fa3b1f7bee6ef96b5dee033cf1ca48737e9f00a4ddbe09b29c717cf2ae1f10577ca29fa4b886ec7a28f2131e1e12dc41fed5a4c5831b0194ce58b8
-EBUILD dosbox-9999.ebuild 1884 BLAKE2B 582b65acfe45e658fb927280237b75639155ea47df3af948912a593f6533ca4a099112d865210a77c0f3dae70fdf7b9bceda330b226300526e2ed58cdea801e2 SHA512 33a434777efbd8a9e272a8206d6feb2da01a2e423774b54017bd716340ef3b4d349dff455e02d34055ac844ef66e49a2bd7397b027fcb2d4354fc4de83b05ce0
+EBUILD dosbox-9999.ebuild 1884 BLAKE2B d5fb6c6b1f123e83d960dd3ff7323845e9ab2673aa889c08d4dc660e18617503b56dfd765f405cb03d3509e88e1cb78242c96b37161a263b966c7fc54eec25a3 SHA512 9ae090a3377bc63b13cb6b6325ffdc36e1cd3a1df512f5c50d1334005a41893dbb6459e008594fe8550fb31948b1f149913bd641fc281fdffea2a7b7e5cfb970
 MISC metadata.xml 623 BLAKE2B 2ff1106b2288c775d3bcff26145af604b63edd350f28ff3fd9c8407a738910d080425fa635b6b03436b0b8c24dde9c7dbd342df1f1bacdfacc391246db565ac0 SHA512 a7aff1ef1c4c2c97e8287b3aec84c1c270b8d052e12d4719704a6732575f1f62e4f9024af3d4e1f234e18c3d47aec863bdf6e6472e03cabd24124e7473c28e87
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 82456d41531c..bceaab9e8150 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
+GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
 SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
 if [[ ${PV} = 9999 ]]; then
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 047248aaa086..1df8f332c9b5 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 569f859aaa02..5d9759f74045 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1,5 @@
 DIST openmw-0.42.0.tar.gz 4956838 BLAKE2B 5311a47bbbd917cc2fcf91f79c1f31896afa6cd54f3a1e75fc715c9e09362da9c9117a6c6b42a200047d6953ee4e5bf8ef80fe132f23806f5a354ac3ff634048 SHA512 f638e804e03e965db8e19cb37b3be67804202c1e43b0abf2730e0be104093edc31fc3656f90c570980b66ece4f5c889b44f0f59789e865327d221714a9ed65f3
+DIST openmw-0.43.0.tar.gz 5023421 BLAKE2B c99e3a23b22b642dea9e8f2d9414e00aa6a05c4331a9715882465781caca60cd857675d87079bafc3596783e257213bec9d6f1f4e78a3d795e973fb1d895811e SHA512 e902dd2274c05838bb1171f07d7a673fc7b85d1290a9e01c8ab89f1c279bd236332ecdc0f2b7944ec7209a0e6022ff472639b5724bf26904e3a2d338c7be401a
 EBUILD openmw-0.42.0.ebuild 3296 BLAKE2B 532585805ffde333028a0ac9cc16069a9538b99904ded6ec696c5ba81022cd118771c7cba55d26cde5af3020e5cc9a1dd2959935511b6361a391729bf694f141 SHA512 890eebd30fd66cc0c52c043afe686e21c32893c30d4ea29e1a41c3f00512cb77a848cafdbd47fe929accf70d46c5c0d206f223f7f9190e1903575117a915fad4
+EBUILD openmw-0.43.0.ebuild 3121 BLAKE2B 9121c44b4c377230f38dd51c1bd262b4d8f5fc4d61b104ba7916e12b2924bc273f4571a881d34d50c53b58a36c740a43320b2e93280843d80bcb36e91367825a SHA512 4ce6184f86c2dd1ee0d68c1258872c99357215e821471caa850f052b52c949907b8847815d2e34d8e4c9953d6c5495478720646b6cee270357e07220f5ac7926
 MISC metadata.xml 1044 BLAKE2B 132bf7783f4cdac33cfb9bffac4e8a0baf7380f8bb91b262c087ebab4848e6fc97dbac258d600836f1d447536077f063d0dc0ca7348179a61310806f5862ecfe SHA512 c47622fc66013a7c61b1f865619a77707b296b051df54bd75048073b6b5875d97fb300d490a5aba923cc369566ffb5f3dbab16451d1bf48f5f91de18ee7c2116
diff --git a/games-engines/openmw/openmw-0.43.0.ebuild b/games-engines/openmw/openmw-0.43.0.ebuild
new file mode 100644
index 000000000000..58000b29e43b
--- /dev/null
+++ b/games-engines/openmw/openmw-0.43.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils readme.gentoo-r1
+
+DESCRIPTION="Open source reimplementation of TES III: Morrowind"
+HOMEPAGE="https://openmw.org/"
+SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
+
+LICENSE="GPL-3 MIT BitstreamVera ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc devtools +qt5"
+
+RDEPEND="
+	>=dev-games/openscenegraph-3.3.4[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib]
+	dev-games/mygui
+	dev-libs/boost:=[threads]
+	dev-libs/tinyxml[stl]
+	media-libs/libsdl2[joystick,opengl,video,X]
+	media-libs/openal
+	media-video/ffmpeg:=
+	>=sci-physics/bullet-2.86
+	virtual/opengl
+	qt5? (
+		app-arch/unshield
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[doc] dev-python/sphinx )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# We don't install license files
+	sed -e '/LICDIR/d' \
+		-i CMakeLists.txt || die
+	# Use the system tinyxml headers
+	sed -e 's/"tinyxml.h"/<tinyxml.h>/g' \
+		-e 's/"tinystr.h"/<tinystr.h>/g' \
+		-i extern/oics/ICSPrerequisites.h || die
+}
+
+src_configure() {
+	use devtools && ! use qt5 && \
+		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
+
+	local mycmakeargs=(
+		-DBUILD_BSATOOL=$(usex devtools)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_ESMTOOL=$(usex devtools)
+		-DBUILD_LAUNCHER=$(usex qt5)
+		-DBUILD_NIFTEST=$(usex devtools)
+		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
+		-DBUILD_WIZARD=$(usex qt5)
+		-DBUILD_UNITTESTS=OFF
+		-DGLOBAL_DATA_PATH=/usr/share
+		-DICONDIR="/usr/share/icons/hicolor/256x256/apps"
+		-DMORROWIND_DATA_FILES="/usr/share/morrowind-data"
+		-DUSE_SYSTEM_TINYXML=ON
+		-DDESIRED_QT_VERSION=5
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
+			-name '*.md5' -type f -delete || die
+		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local DOC_CONTENTS="
+	You need the original Morrowind data files. If you haven't
+	installed them yet, you can install them straight via the
+	installation wizard which is the officially supported method
+	(either by using the launcher or by calling 'openmw-wizard'
+	directly).\n"
+
+	if ! use qt5; then
+		local DOC_CONTENTS+="\n\n
+		USE flag 'qt5' is disabled, 'openmw-launcher' and
+		'openmw-wizard' are not available. You are on your own for
+		making the Morrowind data files available and pointing
+		openmw at them.\n\n
+		Additionally; you must import the Morrowind.ini file before
+		running openmw with the Morrowind data files for the first
+		time. Typically this can be done like so:\n\n
+		\t mkdir -p ~/.config/openmw\n
+		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index a396ce330d7e..4e8d46f54235 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
index b4c6b5147b6a..52de7c18aea0 100644
--- a/games-util/qjoypad/Manifest
+++ b/games-util/qjoypad/Manifest
@@ -1,3 +1,3 @@
 DIST qjoypad-4.3.0.tar.gz 89134 BLAKE2B f035ac024176e352f2c0f88f0677cb4f30e643f64fd2f1214808c0273b0db8cf0a8b133e216b39fddf0ed9717c3e18955357e459ff30c494176ea7cf979b6943 SHA512 99febfc67fff149c476fffeed47eddd9e626e448afcb179eadc8dbe071da42ac692d153f3f43419c4280265527f5e84ede72cb4d59ba574819f7755e3d090e51
-EBUILD qjoypad-4.3.0.ebuild 804 BLAKE2B cb9da358351406e3a373fc6f4c75dafb7cdfa2564443bd559a65a537c717d41091ab42e594ab596b63312898fa96325247080f4af3d8382d93f28a1f8b83bf41 SHA512 4db14b7feafcccd93137c29fc8aa5d30bcba55eec31dca54327068508232e5c464c4ab84ebf6bbafa58e1d81005f5449b43f8cff318f39e071076a3b5070e04e
+EBUILD qjoypad-4.3.0.ebuild 829 BLAKE2B be2db77bbc5af4d7aa1ad7ff2077bcff954355ae7458e5a1b7ebebedfa1b292e8235421a816dbb58ad8deb3100d19eac462e66dfd7463732a84282ed19598caf SHA512 fca30244e3d74549fe5c3ddba8c9c3bf2e932bd833b892ee9f4be562d61bfeea3b2849badbefd9693233ba404c43939ebd8c75d5cd604f3d1400f5e1d06ba054
 MISC metadata.xml 330 BLAKE2B 60b6d79e8bd61ce2911a3ca77273e844d36cad02c50e88d7c0cb67fd30181f237a0c763ae53c79fe29d4f03f4c4e5d7fd2122af6156c3ee28902c2821099faf4 SHA512 007937b334543dcc52d271b9dd594d167b9f003af545c346c81aab34cdfdf5e3f13a7dca30d67044d41d092539e7f9c589e6cd0a6c026b32ac2d7e7b321f2bb3
diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0.ebuild
index 3f027a2a35af..c4578b2cd3d3 100644
--- a/games-util/qjoypad/qjoypad-4.3.0.ebuild
+++ b/games-util/qjoypad/qjoypad-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	x11-libs/libXtst
 "
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	x11-proto/inputproto
 	x11-proto/xextproto
 	x11-proto/xproto
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 90ee229e5471..4b402aa183fc 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 9ca469ec1162..6d84c6b7dc25 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-17.08.3.tar.xz 280448 BLAKE2B 639871f99310e94f936c2cf7784c5968274c40fd428334ad77c9480e88442ad55d7a4e432e936d34c477555b81e7f9c579b464a1f90ce32da29048548ec8735e SHA512 318be593363dc6710369555946f8152ec410a74a2b8821b5e10f7f1df8dedcd6faa1a4fd21255f0d9366760d2e5f61bd54b4b08a1bdb1f30a7409e4031c2a53c
-DIST akonadi-calendar-17.12.0.tar.xz 280020 BLAKE2B 2e7c4a05c6c5f4dbbbc678c87342cb355d9081dac9485d743fa88e14710cf13d76c8d164893f719fd729c584bea90a4c36f73dc2072a84ceaf362126dc30568c SHA512 e39db12740a2c1ed9541e034564eb7d93fa54398163f182a7409fe363ba6a46aedec5e0988c4da952a08d9b07c60f4c20a739454c18c9e48f9e57515142abe9d
+DIST akonadi-calendar-17.12.1.tar.xz 280016 BLAKE2B dec6b78b8c672d3e3451b24d681bd64e7fbb6f5f9fc75bd03150fd4be02914e70e3957ae74cb3c2e92ae6c161c4289a30a88d40a571d92a494e0b370961d9272 SHA512 c5d3fb041171b0649d38ccd431382f7fb2636328bfbd05c8ff05fcfa119a36ccb4d066c9e25cbb9bd36a08e4bc6005ba3758b0313d1bd57a0949fb548dbe4b03
 EBUILD akonadi-calendar-17.08.3.ebuild 1158 BLAKE2B c304e46beaba64b5cc94f0e99730b66fd4041598e15efe4aa07028a692ae661f46eef3a26e6f7bdce2fd95f96b4839ce5b928bdcb11ebc4e3ce06aa82d1dc02b SHA512 5b8f29ed924cd27191026dfe15f03164a97df58eb6b1c1a27e57f7ce3dae7626298c77db8b2111cc53343bc4e480cb7444f537f355c04b72d5375215b49ff1c5
-EBUILD akonadi-calendar-17.12.0.ebuild 1121 BLAKE2B 86b07e3d4b3210384ee07ee38745499d54393a24a1a957d730eedad40c843ed75ec2cc6e2602b8f0b4c6fd2204ce26b70bfeab6b8d44d283cd8de9c34769b377 SHA512 642cbf4cb3785e8a4650aa3d8b3ca1da00b02ceae0b6a32a14628d9e056fd4963b596bef33ac0649f2f54e507ab92fbaaaf71ef0942d98e5eb7b6bddbbba3186
+EBUILD akonadi-calendar-17.12.1.ebuild 1121 BLAKE2B b0c12f36b05d5f176a65f4a7c3ac3c475e181c6b5282dea999d6bd0645f6afd2e8fa1bf8fb85220960411343188ab216e91704bf1a5cf21cec8c81c794b3b4ec SHA512 70ec221bd6cf0eeefb4c4041d7e848a932e5c3a16792e2ed5da348038b9be9aec8bcf352d00e62ae93c918bb796e2ef252499fe3bdad10a1dce1ce04422388a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.0.ebuild
deleted file mode 100644
index a108a2ac29de..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild
new file mode 100644
index 000000000000..66563cc64656
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi calendar integration"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index a522f1604f7a..97eeea4be105 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-17.08.3.tar.xz 353516 BLAKE2B 628a80b4bccc01e98d4124180fdceb68742fb4b0ef822baf665215a700c6ceb16c98b5efa7ad18c894910fdc269087e874cb32f5b80ca4d1e1a904e007fa2974 SHA512 d3b8dc0c82b4258aac3c06d87d62c8ecf881fe62c31a9f77b4c050a3ee70e10d225660b08f7cbf4cf6c813ed2c1c5c321cdf0633e37cf8e21bf70a04bd133870
-DIST akonadi-contacts-17.12.0.tar.xz 345212 BLAKE2B 266ac67b7426a397e7e73888ffa1d061165ccb02d350456354d6f5d144fb2d3099db25d7921279c35ece665712a7ec80e4b926543e7bf66e7bf80bf1b91da701 SHA512 d4303ab3d5c5f82c652f88b90f6124ad18d7b6db62d9b1bc09f9308941459335e75eccb111a0ed5f766d3c767a469b6351c6d3fe63e7d7208dd417591eda0fc0
+DIST akonadi-contacts-17.12.1.tar.xz 345012 BLAKE2B a51c69515101cba7b052628b8554d6b3b88114c4d94fd1e5d05c994ac8c5b03d879d4773d223f90695dd48c5844a57e0c23f75578cfb17b802a35d6f8ccfabe8 SHA512 6cc74f87f27e9be0193252279b85095d2f453e57382ee95dd6439d2f2ae41a329bf8154f4fef6d82ab2262e76d0d80e41e8ca60371282ac1efa594699a3dfd28
 EBUILD akonadi-contacts-17.08.3.ebuild 1165 BLAKE2B fb9eede65ce8c2bd5d7ea7aec2307fc0f9d86ec5444980427e1eb3f8a41915d90d78e2b36146dc753b7afee4b2e40ea0e265f5a70a098ebb161c24b141da1002 SHA512 156432d40c1c5d701c2fe22d2e20308e1ffcc512dba07989e9a39747d0927ba01624b65c775191fa12db89ed5e54270a35166c48256acf247010b30f05394c20
-EBUILD akonadi-contacts-17.12.0.ebuild 1101 BLAKE2B 3a16272721d07029a12e1f3fdf4d80cae337ff5bf60164b68098e1f4e0a35eb33c75d937e5432f4116c59d1ba5923623174f4119010ba8d15f02aaced5162f35 SHA512 e7f13c0047664c2434d9557248316ddfd1ca0bc194a80266e337767a0459faf23d7e9fa18d6fd99125d40f2a2cb254d1bd944f377ed8486e21cac47062b75eb3
+EBUILD akonadi-contacts-17.12.1.ebuild 1060 BLAKE2B 41b680096f2e55da3dc5009fb34febd30ca607a26ba3f20c6ce74b178cb06f01a22863c6c1845c1594783ed2a2fe3e5c8b30893340a0a138d909dfe51407ce66 SHA512 2fb15e086cd6e6fb919ee65d7b9da4a5243123974fddc7a87879ecc457929cd7ca9aa9b7fbf227d5abb41c96b2c0e43da1adb68995bfb23d8b37a995bf383730
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.0.ebuild
deleted file mode 100644
index d0753226e758..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.1.ebuild
new file mode 100644
index 000000000000..7cf2a294e13d
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.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"
+inherit kde5
+
+DESCRIPTION="Library for akonadi contact integration"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 35c0bdf6522b..759ede034c99 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-17.08.3.tar.xz 434632 BLAKE2B 7873ce751e8af1af3b4b4859e495a1e4f4820e8899c9955200d6ba7412d5f5ea3c974d4a112c547e3dd429f59d4d2de2170fe76fa8320dd974d838f8800727f5 SHA512 dde89492fa2b2e2c0eff38e7cfa5d83607a843ff62f46a4042139b8922b4744b887428d1d00d68e4dbd6b09afec6194e3793c27c1dd005550af7cb8c85879351
-DIST akonadi-import-wizard-17.12.0.tar.xz 436280 BLAKE2B 6f4464ec7486bd43fe5c95e076ace9429780d8d22c33d7ea623436b78420320d240f488dc04c3d3783a8d98821d260d4aecea1f44d563470c540cab4bd977c43 SHA512 ce52f354c1fd881b076d8f1d66053c33a2d8a6069ecf048714ab83ce22835632c622dcf335f4179a1990ea16213559aa0126dc9ece27b77315d3b41ca51c59bc
+DIST akonadi-import-wizard-17.12.1.tar.xz 436392 BLAKE2B b5a906ec8a538f347e31fc20cb8088f5621f741699a0679983136fcce9881a24215b7eb3f57e75db64cfd48fc1201a8644637b1f97953fa84722cd84538ecc70 SHA512 4426df8df9da5a7cb812a0c8b97cd5e2b69a973fd41dc02193905d7dadd010759af99403c5886f002df6977c5abacf8810892a04ed8078b0a4588408b43d0849
 EBUILD akonadi-import-wizard-17.08.3.ebuild 1092 BLAKE2B 79c7cefcb40da652176dbed9bc3b814c842fde199101100108a880ff3cdaea44e6d1e03fab9bb21da5e1a943b2a5674611d7481436828e116a872ff432429872 SHA512 799993cdfdcef5ff984962bc5898c03e562c881e47c1952ae14493ad54697c95625b3e499c4aba2a83374f656dd50bf2167d9dbb5eb6481d6bdb07fec7bf5d2a
-EBUILD akonadi-import-wizard-17.12.0.ebuild 1094 BLAKE2B 8eabefd63ce4a02bc8d53e1e3f5ad6f8fa78ed2366c94766c431472c513f7c7dd1563c03936484b73a169c98f282f9b89cef263f4113992b8b4da32067ce68e9 SHA512 5eb1b63b4f7205564b4e03a56b5da8043e1832572e7c087bda7353a4c09e7baeb021bc3f1d4c19f24b98cd312de6fbb0473893d1506669522ec2e179a5406d31
+EBUILD akonadi-import-wizard-17.12.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-17.12.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.0.ebuild
deleted file mode 100644
index 44577f2fe089..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild
new file mode 100644
index 000000000000..711036b2177b
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 4839bce8168a..2c2ca40cdbd1 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-17.08.3.tar.xz 130840 BLAKE2B 27d639f6f6fb29544847b452dd67a352a4b7569371da4ce05a5ac0207c6209df16dc7532eafc659a62d53c7b631260feebd795964350a6940dcd131de2ba8d92 SHA512 2bd31750fa63705035dcdc56b4686ec0e22fc593baa6514e0803e6e4ce7ab4346edb5f1eab14f598e7d5c23569b842f7d733dfd53f9d60a64b3f6214de8742f6
-DIST akonadi-mime-17.12.0.tar.xz 130680 BLAKE2B 8bb3b0152f26ca570be202dd3d1403a3af8759ef30a54717d22003a86bf11096b7895ddf380dfb04b6380c5ddb8b6d50c447579cd92ceac0db3ec14ca1f50e5d SHA512 328dc0790265216784640ef8b77c90b4c5837ecb60597244c5e370c1474feeed2be991ed60f34dc426b52244d5a3da62d02e273c5dfa28fd8a48d5611784553d
+DIST akonadi-mime-17.12.1.tar.xz 130696 BLAKE2B c41c21893e484d9e460055e5e11b0618da609f95e5c1be1323c532442da97fdc6f10de4f02e4a4fb82e4e356b748d548a450abedbc92edd5a38d137316c45102 SHA512 bb1b91a0119dc3e916fa3da177163ca87915119d3827dfef652e150908ea552e3e423fc500d2ccec5ad95622bf5b7ec24b4f8705a0b4f5cf873aab91ef90b22e
 EBUILD akonadi-mime-17.08.3.ebuild 854 BLAKE2B e00f5f3937ca400397b770fa737be1fba026ea09f6cb91825f73baa77fd92fc76a784fe735943f80b2799124ab6e84044293d3ad236b9a0ebef7b4be1133df85 SHA512 8079f0e000153d63fa00b3edccc1b6fdb6eff4f847bea2752515c0659cfb868647924948a5e347f4a717e86ddc13db7a67b24df749ede2a775988d89c1f7ba61
-EBUILD akonadi-mime-17.12.0.ebuild 856 BLAKE2B 97f2d38376eb04276533b3a26c3648c4aa58495dd39ef34f6839a6c6f914f8eb1a23fda6d2e293dd12c476f9070a64bc4affc98d936572f3233d301787d74b52 SHA512 37a08f54c736187cd8085a075447cba0864524c4ab082157f9b32628d0b957b4d03c5d41f1162289ce553c55b786dfeac4cf2c1b7735fddd382509bdc708a6da
+EBUILD akonadi-mime-17.12.1.ebuild 856 BLAKE2B 5ef05ff978c12a119b1a5c89c9118a3ba298a89a3cace79d97ffb4251758f51b1d19da30914f393da02affc215efed74de32cb0306a6e5ac576dfddefa676b00 SHA512 7e16cf5c8019cf4f4ed3acb87e7950fdfee13b66868f1d8684df158d8d7a8e4225e3e5367010cd681d56cd3ca7633541eec29f08cb704a74756685a29b107665
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-17.12.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.12.0.ebuild
deleted file mode 100644
index 940f843339b1..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-17.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-17.12.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.12.1.ebuild
new file mode 100644
index 000000000000..828716b6dc54
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-17.12.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_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi mime types"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+ LGPL-2.1+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 5fb69dd259b9..168e3659657c 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-17.08.3.tar.xz 24728 BLAKE2B 6447bff50f623c54f155038b47e52394f6b6798cbd0485de45ef01ec9cb7c45e4c023f6ee0d577e3046f17df3c6ba2e6d363c4e93e2510a71119c5eb8009bd9c SHA512 ea7f19cb833d9a54fe8c52f02e4b87ee45a7cbe997b7b6974d9f8372d5e13cd6815be180d15c2aec9df6e490c028ac2f5c6d97cdc9a87b0e20c3b8b701261a68
-DIST akonadi-notes-17.12.0.tar.xz 24564 BLAKE2B cbff73ba535917d9bc071cd4a2209390d62c8d06848ffcfa6872b8beb1199d384f2443cd8b44da3fe508655a6b69ba3569fd9df1442311cd45e1a48cfc2785f5 SHA512 6163fc18c42ca067d3ae87b5af2bb34700d67b01970a1835c487096d0f42bc0b002e876b2d5b577b3a288810a2ae56c4d8090404c67aecdc4d7320bdb2b1480b
+DIST akonadi-notes-17.12.1.tar.xz 24556 BLAKE2B 733b4186fe78e57dd77a6a16ccfb7acf67beddf55ca7d41c09482c28160f5187f7f9ed1cd0055d3de2b31e3fcb97b0a285d102bcb3ba0efd779ee7c8a02cd9c8 SHA512 1514103b64f4eed44b777c06d6149f3907b93a4d589812bb0150db2690d9382b16c4073b9bc586e2d23a653e95c475e04f16e5a435308c4849732884fc0434a5
 EBUILD akonadi-notes-17.08.3.ebuild 565 BLAKE2B 090781ce229840a81506e8c174e72fbc0b316c9d1259f9fc02a249cc1d360a8b497e943f8e9e23abe780493b15f6d39fbc32d631f555ed5de4377ddbb86fb537 SHA512 90a63b2aa30e9eb5ff2dc83dd368d3687eb2e523a6534d15ea349ad68e34be5a635d03da59628c3938d99b13663cde7e4ab1bde4fe753b4610851680480cbb0e
-EBUILD akonadi-notes-17.12.0.ebuild 567 BLAKE2B 9615b5ae3ee175e5b42509c1ef96341649df16d2c3f50881691366f413516518434ca5c353d10ca1e14836e1333b92d5330851fe0b293058ee2712cf0bf917dc SHA512 00ea87fd2dbea2072e7adf3d9a0394b94f56405aaad834219bef0ff3a2381bcf71924200ecf81d4122993d5b1df6c86b787907383f5e968fb942be63d8d0d7c6
+EBUILD akonadi-notes-17.12.1.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-17.12.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.12.0.ebuild
deleted file mode 100644
index 3692761686ca..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep akonadi)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild
new file mode 100644
index 000000000000..0afe6508a57e
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi notes integration"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep akonadi)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 6f60f3bda97c..d364ad566eb8 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-17.08.3.tar.xz 81288 BLAKE2B 04342e552c47fb9e2d94e13715b4d6b564b02bf9704671ada211f353fc3554b7fc01600ff6c4b3e03cf6c2edd4f525a2c01e2b9e8a4479ea8b28de26ad2b79d5 SHA512 e76e0f2a4f0c26b353e31c8cfeb29f6a1e342101b58925d741479193955171e7698019e1a0117348694d7f1256c777cbce9c43033e8b7336cacef0e2c87f9c77
-DIST akonadi-search-17.12.0.tar.xz 81452 BLAKE2B ea39dfc5632c2a16f48c68d8738cecfb8d789ac97a667fd944d09e17a00650ff50c53bc28394db4b406849c0f02d4c3b01ef30a3c35bc38aef701ae5ad8564a5 SHA512 d9819cc5e1220b431179e3313f7fd2fbf5ab871482b1bb1935b84e8850d895a9908123d0fed2a9091ef7d450df170fdeb667a2a3331e2fb29606479dc8a47e39
+DIST akonadi-search-17.12.1.tar.xz 81600 BLAKE2B 56a2a27ca37af5e1a74d595bda34e9fdbb7672f9409d8d0b10cfe1bfc157bb198274f3ca63b3ba7e534a5210faae5b45021f42e88fde59886b6fc21d38851095 SHA512 67ff01fd3e5c0b488d4eab73c05369f2dce5fcdcf38304747c68705b10d596c0222664a13100e123bd366c29ccc98ab8d33922f75813085c0aba34539239cfa7
 EBUILD akonadi-search-17.08.3.ebuild 976 BLAKE2B 13bf3b907e3cdf1cfd40785f90c9f9be30a75c1dc4828fa3bd23168e637cb6fdc723873819176b801b690eb5dc919a04323734ca0b08d592966ff0c93e0eca46 SHA512 1b0315bbd84210dd18094be5a058523ce0ca647b6b132642ffc766beebf1c35bf4e1b2692db772873e27b1745a44053a0acbb9283faf080116ffb53fbc195cb4
-EBUILD akonadi-search-17.12.0.ebuild 1085 BLAKE2B 6f3e305cc83fc0e7e258d8f04cd7672a2a347e127160181622f5236e5972bb2919f4937e7775cd34dfebc1a9446977566194ff4abac92689ca3c3d3057929c8a SHA512 43c58328684563f17fe61360369c9c4908f8b41468ca5e1d9e6db2f4d33a182c63ea07ee36359a9031a67839988ca3db85759d17b4096781b107fefec0bcead3
+EBUILD akonadi-search-17.12.1.ebuild 1085 BLAKE2B 6f3e305cc83fc0e7e258d8f04cd7672a2a347e127160181622f5236e5972bb2919f4937e7775cd34dfebc1a9446977566194ff4abac92689ca3c3d3057929c8a SHA512 43c58328684563f17fe61360369c9c4908f8b41468ca5e1d9e6db2f4d33a182c63ea07ee36359a9031a67839988ca3db85759d17b4096781b107fefec0bcead3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-17.12.0.ebuild b/kde-apps/akonadi-search/akonadi-search-17.12.1.ebuild
index 5504a5b85b7b..5504a5b85b7b 100644
--- a/kde-apps/akonadi-search/akonadi-search-17.12.0.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-17.12.1.ebuild
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 358e0f4b45c0..e6c12dc0b52f 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
 DIST akonadi-17.08.3.tar.xz 1427896 BLAKE2B 37e19d5afb0911bf2002392e0579ea33429a5dc8ec5ddbf3c8e8fa5ec21b014dea5267e353cf5ab94927fa8444cacf9948c001de34a9acc730a891b96da7c0a5 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb
-DIST akonadi-17.12.0.tar.xz 1521468 BLAKE2B 3869b2446df6dfd721401f3edaf93d6866c61a3e5db2b09897ecd4b95b5e47be2b83acd3f14f39f13f35b35b6a2d43f3ea0cf15ef76ba24333da047bc8926f8b SHA512 106fe248554dd44cab2cdb3a6d1ebe1cc35f64c5862b631c7d13728d1d78ff9f17a981c363332d30ef85876130b6c2e5f40709c8f7bae9d03f646eb3cfc4717a
+DIST akonadi-17.12.1.tar.xz 1521928 BLAKE2B 9da0f21dfa43578fcef90522c007255a0a039d03d0bdfdfa5dcce52b572a6433800bf55149fb40a75385ee062d64e72d241e11f6fc8277d11414dba61d4e0423 SHA512 5e6ea993b98ee72a5c65156e13734da3b8b34438a1a6b791f616e50eb6274328d9f6331bf2b4b9cd2216ce7977a875174757fbd7c7d1d366759303ce89be8ea5
 EBUILD akonadi-17.08.3.ebuild 2954 BLAKE2B 6767c7c38275bca9ab36869e077a1dda34e278ff0f162f25e50031f46ea2df202aa934a62ef286e13dae428f741dfedab53db0391898e0b73eb236a757555a55 SHA512 ef19796ef4ac0152e6eb105dbad17373fdf22bf034385d06f4cb9c6cf435285d7469ea1b2f93bd6ee52591c74ea0497d41d1432cf702ea3cc2b786718b208c3a
-EBUILD akonadi-17.12.0.ebuild 2915 BLAKE2B 052fedb44efccc495b2280f477a2297b05e149456a364a281a1f84eb5dbc0ea2bce8508a422739dca03862ba494168d9d1ea84554a001d8564e669a20289b09c SHA512 f8f34e914d442e62941815be0e850f991028380a706ed001dca57f6a000b44c03e484725fbdb9d2c5e1faacd1c4c0cd6474aea4578ce72153bd34220a7862552
+EBUILD akonadi-17.12.1.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-17.12.0.ebuild b/kde-apps/akonadi/akonadi-17.12.0.ebuild
deleted file mode 100644
index 500b3ba224a3..000000000000
--- a/kde-apps/akonadi/akonadi-17.12.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kapptemplate-17.11.80
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	kde5_src_install
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-17.12.1.ebuild b/kde-apps/akonadi/akonadi-17.12.1.ebuild
new file mode 100644
index 000000000000..99c2e48ae5e8
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-17.12.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	sqlite? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-17.11.80
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index dc3e71de9977..ddf678ea99a3 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-17.08.3.tar.xz 185196 BLAKE2B fb630eb12653f8a6d8f4064f0fa6a0deaf6766959db4d55f6a6526be504023d4a08954186924063bc4c6aca00d1523f46517d64b6f81da0f43e0a5878d7815dc SHA512 a9de6c25c9b7dea29595e5ed815e25cd37b715afa2c754c9920cf9c6be4755d5bcf5376cad82853fad75feb1540d29afb9691731c09ec057571e8ed860bf1563
-DIST akonadiconsole-17.12.0.tar.xz 185452 BLAKE2B 6fc92940582a261a77f0b830f0b5cbea27648a92062c202cababe3a21ddd113e4817fff7544da43621413ae63eefb8623b8c842a92309a254fe78308209eccd2 SHA512 df58a0940b51162829900dc33b754b9aab9701654271f5631bd8b1959a2a777372e5f7bc09ffa9571b1c0731a59181a1bdef217f1609c650bb70589a9e5d74f8
+DIST akonadiconsole-17.12.1.tar.xz 185432 BLAKE2B 9a5f9832aceee800036e24d9140166ac9699fa6549dcb0b41166ad5d94bfd35abb61f3b8fb65d25f2c1d4737a24675b93c74c458623b01796c7380fa16916be0 SHA512 d612c31db21086f301bfa0e60051603655f088edbaf1f3011e6ed485b5657764c8075eb29b1072ee0a3f2c945726e3c545812fb930353310117da9d54bdbf7ea
 EBUILD akonadiconsole-17.08.3.ebuild 1215 BLAKE2B 6792c88ca4d602d610396e7cfc1ffe12b414b809d3533148beb92fb38632e664fe5d877958632071420abf2d312fd099d539ac183ea0587d5038ed88b1b03938 SHA512 8e9e1551abdee13935394e77c79e99eb1021ba3ec44f1780701381044a4274f954d49df0654948304e6c11296906b4b010a254bc43c107220eb03bec56a6addc
-EBUILD akonadiconsole-17.12.0.ebuild 1259 BLAKE2B e3eb6265789d4f34ae3a080df8af4fde025cdc5d737fc73b108979eea1879fde9b4373dc3b3be139c9ed5b2e24550109be2dadc5689b5241de6c40b0dbdf2772 SHA512 b755210e71e1d63f673e3ffdd8e94f24a2db6c8ecf0588fe255ff7f6defa4b89ec9b63f18c8b0c14fdcd22e9f1bd8a331704b1e022ebe5d0d28c51907687d398
+EBUILD akonadiconsole-17.12.1.ebuild 1259 BLAKE2B 9f584132d63df1c6a73f552d657eff95704ea14770f29c9454f9c69fa80b5c32495ec20697f21f36970e8813102e432ccc022c33c58fb4d9217f200a05dc454b SHA512 8e7ac7d6247985ef91099cb24944a48ecffceeec9016e49ba667411cafd50ba6453ae7ab5b4939492e5329dcc8046620a87af8600ae9014ce97f3b5e2e10e35a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-17.12.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-17.12.0.ebuild
deleted file mode 100644
index c566b97d4356..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-17.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild
new file mode 100644
index 000000000000..d52c05a1db49
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Application for debugging Akonadi Resources"
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index d0d1dbe4549f..e45cbd9d7d92 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,5 @@
 DIST akregator-17.08.3.tar.xz 2248228 BLAKE2B a0542cc6a29f14af066507a64a1b5f70c8b95345bf2245d124c7e1b55c39e67e81d87e1b929a96ceb41947fb98cfa14fb3b0bc2654ead5f5516245fa7949fb78 SHA512 1415eea92cd26d6aa39e373d4177b09739479cb8f168f16ffaede7abf47c5a3b5a2e349bb583428ee210a44736cc4d27dde60fab69edf56e0621062512169ca5
-DIST akregator-17.12.0.tar.xz 2253244 BLAKE2B bca80c348084616359669591012a60dbef2abd1be6ce7dcb3c53048258e32d1510b9559c7fa6dc2b7ca3879dec95626b8627ceaa88808d9137f246d10a1f6672 SHA512 cd989bd8890ef4f77106c38f01feda7102b157356902b2109089b7004a3a070117608708abe60d1c59bd2d8b71238c8c2efa3846e1598f62f89717ac1ec51788
+DIST akregator-17.12.1.tar.xz 2253308 BLAKE2B 05d115a568b8979fb834796f4b4ac16d277bc34dfa2f86032a561804c997ccb601d5f96e45b5b5d617e9db4ba8f668f5f16098979aca1dec091b1013425e3237 SHA512 ec52857cae2a07c4fdb0ebebadd8c6212990d5a9c493f380822339c4f5c8e6b2662d81c7f9f1829583b0798af2317aaa2ab1f5b1b7d7bbfe3839f3daf848232a
 EBUILD akregator-17.08.3.ebuild 1510 BLAKE2B 8e9d46795002a181292daecae419209482ea2b8bf1a6aa512acdc8b0c8123de6620fa56e33e98096271ef8b237a0135ea94083761ea5ab0e734f646ecd7c56be SHA512 12851a81aad27b10ec955597b38252f12637e28b75979d20823658adec4c463145cec01f2c300e5417fa27038924228e8d8bb680b4b65ba38c0029a3bc019a80
-EBUILD akregator-17.12.0.ebuild 1440 BLAKE2B 0d12bdc077a24bf980d3c7591b6ef6a94a5b5ec30cd12e1d9ce2e64b2a199ee866e6e546b54a8ef57b98009d7e540f3942683ede21f0f81004ab95097d79903c SHA512 454c1ac1ca55921116d46b50ba4989df9527409b2905e45b1395eae073438a5b5f0a2b733fe9fed976248f293493ba1e06b2a4cb64b8b8bca95c3fb9de0d48eb
+EBUILD akregator-17.12.1.ebuild 1440 BLAKE2B 191a086fe96b658b26a8b40bccc592665ee97e7dec76e339c4b1bfe12b058b5bbab03a094d0745f38c99d960274acc47d499aa8fe3a03fdb4a7eb9773c5f4fe3 SHA512 524c50abd59ee1cf89d4350bf0625cf993a005357ca30a3ff144e8320d503816ffe0da22385a587cf6535da18e9da52eca566b568fb58e2939f3bb379346fb93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-17.12.0.ebuild b/kde-apps/akregator/akregator-17.12.0.ebuild
deleted file mode 100644
index 8d38fec2e0a6..000000000000
--- a/kde-apps/akregator/akregator-17.12.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akregator/akregator-17.12.1.ebuild b/kde-apps/akregator/akregator-17.12.1.ebuild
new file mode 100644
index 000000000000..861bc0c9dc32
--- /dev/null
+++ b/kde-apps/akregator/akregator-17.12.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/grantlee:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index a49b2508b820..e6c525987f73 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-17.08.3.tar.xz 329800 BLAKE2B 33c08be1b6459a6949eac99598b05ecafd24718769e97457eb881dd534a93dd9553a2a055170250ac37ac6f89cbee3e5e39fc207d5b8454f94923d670fb3127f SHA512 bc7f8b0d53ffd4fac7a24b457e4732c557589a55f0722e2fa24134563ba124dc89774f39c158d8b2bd5fedee7656f224b7e60b4f87c0246589b84f09d20e991f
-DIST analitza-17.12.0.tar.xz 331168 BLAKE2B e823f496dc87db648b869b10fb1439416481c9ae9fd64786950eb4bc881c117dcc04406e9b3ad72ddb76ade0c3e00f32f52eaca3ad7c591b3a6144fc391808eb SHA512 afcd93067f2d8a728f56f4e800d76d321fcb67a20327aa2c39116eb4f68cd74fc3320a49aae5ece16f0dfe1c13b4faf51db8eb3281d340faad8575f44d5dedc6
+DIST analitza-17.12.1.tar.xz 331232 BLAKE2B be4dfc81063dc7994b17555677fee2079db843c721a713940445e57148752cd880074b4f2e37abc3ef0408285daa38e700f8a7e60c4dd3f99b8399640595d4db SHA512 e02fd9d107e898e1ad076568bea4893a6c82f8e2a9dfb7c5db031f750e8715318dd63a2f5ed6c8b1cf35ceb4634fde07f0e9a2d2e7af2366dde966372ec5a2a9
 EBUILD analitza-17.08.3-r1.ebuild 812 BLAKE2B d3331ed979c5027629376ac736663b65f22623aa13d535b399c662b2e939ffea243e0d16a26b8d1b864f1e9dd1bd2b0a699fa48cecbcb410874f62a91fc51f63 SHA512 75366dc6fef5d9d7224cbc93efb0a8b1b4253ff71fd22a97a071211cecf033b9099f78952bc8e587bf17866ced196b5e46245f5c39310bd572ddb1beabd6d38b
-EBUILD analitza-17.12.0.ebuild 784 BLAKE2B c99a57ebbba72931f97c1903c6d1518eec89495545ddda705a3f833e5b2ac4dee6b6ccc2a95cab8d0cd11ab7ce4aa7ae56c5cbeec55dd0d8e5b9930c8912f43d SHA512 f2f3088aae385fae1fef4f3cba0e61d569ec1d27d5b4d7e5ca96f0ff32ae2c789b673e2ed0d716da3ac6b1355593c4598f50957e0dd6c861f67f70c2c7f2ae1b
+EBUILD analitza-17.12.1.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-17.12.0.ebuild b/kde-apps/analitza/analitza-17.12.0.ebuild
deleted file mode 100644
index aa5d3cf7892d..000000000000
--- a/kde-apps/analitza/analitza-17.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="~amd64 ~x86"
-IUSE="eigen nls"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	eigen? ( dev-cpp/eigen:3 )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -i \
-			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
-			analitzaplot/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eigen Eigen3)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/analitza/analitza-17.12.1.ebuild b/kde-apps/analitza/analitza-17.12.1.ebuild
new file mode 100644
index 000000000000..dc538401ed67
--- /dev/null
+++ b/kde-apps/analitza/analitza-17.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE library for mathematical features"
+KEYWORDS="~amd64 ~x86"
+IUSE="eigen nls"
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	eigen? ( dev-cpp/eigen:3 )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -i \
+			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
+			analitzaplot/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eigen Eigen3)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index dc34a40cbebc..c7b68ae24845 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-17.08.3.tar.xz 1966132 BLAKE2B ec17cdd3d9682cbf2f533bb159fcc219c91426997120ac03fa4726123701b6e1d98686cdaa07330e541bd2a1189a920292c13932df824bb9855bc93c38c7c605 SHA512 c28eda02f561391a21723286de2b71b9d985a07edfabd510b690927ac598da7464b56ba6132bb0362a6fd7ddb35d99bcbeb8ef74b801cfbba22f6f6d91262fb8
-DIST ark-17.12.0.tar.xz 1969924 BLAKE2B 98f686d81a0531f670f9a212ed685710eacf9bcf79d865b6690ce1e9401200151d52db00f96acc7cd5aa28100370c01674d7ed23d611bc4f9a27eae2c0d8ee31 SHA512 f4e95fe8fa87e285172ba9a7a51c09fc05684d7f6093dd5059fc04367718d57dc0620c00272242fdc04a0b8be9f9d8d99db56fb21067e39401d80e5576a8a6a8
+DIST ark-17.12.1.tar.xz 1970844 BLAKE2B 5f758bd3d555a75e1c50b29292bb28f637184d7b7af9de5193ab24348845135cc6486a196d16320d11b108eb3f7c83eeedf2a0afa46019a8c09b6f1ea9bb104a SHA512 445b98bc1fe6484cb5f2b6fb78a2d33e6d0d1898968fbcea43574567af3b3d8847fe674a2bdb342bf8ca96b862bb2de25b4f06e82715a3d99899d1279b8a9fca
 EBUILD ark-17.08.3.ebuild 1869 BLAKE2B 9abc58e04fac49d6f8e9bf24eb058f59d00f179580e8d56821fbccfcafa90b9f2a46c0c0e909d9ea05d57af1c1ccffbec63a0cbfa3fa16f0ff493b480054525b SHA512 e89980b83e2fed67bb018f49ee75b1f31caa2dc8f9fa848925d3392eafe974a6b9d63df7cc46fe7aa340e562347f7da5efc46a7aa242e8900166296b77ca42cc
-EBUILD ark-17.12.0.ebuild 1886 BLAKE2B 97bc9bfa239298acacbddda8ed7511c1384f610a62d4125d0d9ef4e1429f34fe01adaf75763edb8b3a24a1c1676fcf8664cc035d0b4e83513e1647155dccdc6b SHA512 b79150bb7f72c09df18e532a16c8b1c469369fc64a1a7cc810a313f000a62d5cc793a1efd587bf9e08d056e433d8861c9810dbbcf7f022dad5b649271024e8f2
+EBUILD ark-17.12.1.ebuild 1886 BLAKE2B 6b2e6a929632a753d1858b11279944fd7bb6bde058f128420156c3f7902ff388136ba70930c0a61403b835650e060d77a1094111cac6ad8c03f70f6d58cc28fb SHA512 468f51669409765b049716e85b8ef258acbf2510f43984b8e98d7efe066fdd335a987f3687b85e2fea7141aa6c6b171baeb973b166b5927355a4678e645d3497
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-17.12.0.ebuild b/kde-apps/ark/ark-17.12.0.ebuild
deleted file mode 100644
index 7b43f18dbf93..000000000000
--- a/kde-apps/ark/ark-17.12.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 zlib"
-
-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)
-		$(cmake-utils_use_find_package zlib ZLIB)
-	)
-
-	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-17.12.1.ebuild b/kde-apps/ark/ark-17.12.1.ebuild
new file mode 100644
index 000000000000..c95527b9545e
--- /dev/null
+++ b/kde-apps/ark/ark-17.12.1.ebuild
@@ -0,0 +1,76 @@
+# 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 zlib"
+
+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)
+		$(cmake-utils_use_find_package zlib ZLIB)
+	)
+
+	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/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 4ee390b04e3d..e183e379652e 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-17.08.3.tar.xz 3749500 BLAKE2B 99cce8d58f10ccaecaeb649b9f59036d4d1d4826e10e3b196e523818cdb925414917a53511640491c5d68a86d6d0a93890af723b54ea893fe6c44a5a355dab7a SHA512 8ee17dbb4a8d3e0ff0537f856a7eb8c918cb909852cf5c48b70c0e281bfb104d3c231053d2aad9368f82182c628c92c267b4f6946164417efea24c589d343ca2
-DIST artikulate-17.12.0.tar.xz 3746568 BLAKE2B 971e8b1ec53f03860136fb7f2d85dffeb8260f7d290f27d14559379c6de59d0c61cb4566253e79c92d0c49b83665e043dfe86966ef47898035d6f417cb39d382 SHA512 7c17d3112d04593cd1042e356b3b95fd2e0f3066dc1bb8dc1812032df7495d8afd15fa661c698386e5228a90804cd1d9d44163377a408623d69f8716f65355f1
+DIST artikulate-17.12.1.tar.xz 3746124 BLAKE2B fb02fb203cea77e4c20eef77b6b0c4bc62a30b40754ca8de471f5b236b74f0af55b292f5dbbfff6b162558bf4c81afdd7d454b700995ed4768f3cd49ca3c3a5c SHA512 263f9fe1ee053cf546e647f4c805d4b10cd1d71cd14908e20486d68434f964af0fc7e5b641d15529fb18f09608bfe22abcef59c5b93f27f9b0efe4a9646d00d2
 EBUILD artikulate-17.08.3.ebuild 1082 BLAKE2B b89446002dbcf972fc79e76c847bdd146b9b276743d845dae99380a1175af4209038721573b720081c41e8b8b33e2b5f80bc0dd20a160899ccd9f2e836d53fd9 SHA512 539f8270c4155cd134e7119daee810c7c92eef4dcb42c09acd62bfaa1e53c5e4ee0f49378e0516e566d203116d96e31ea746ecd09decf28f1a1b5bd26c2efcf3
-EBUILD artikulate-17.12.0.ebuild 1084 BLAKE2B e78231412a10384a6e337ece05b5144255a1cc0e6d314eaa88da606564a4f4ec75f571f908d37f1a3847560b44d0cb60de1c0172875d263f32d58308f90057da SHA512 ab65310123efe64f347affdcc42c21b1700fef5b42e38634817de7f4d7e54a6ca263e243099390b8de1e3d0aab5c2204016de17fa505924703b4081d44f5b801
+EBUILD artikulate-17.12.1.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-17.12.0.ebuild b/kde-apps/artikulate/artikulate-17.12.0.ebuild
deleted file mode 100644
index 25e55e93d221..000000000000
--- a/kde-apps/artikulate/artikulate-17.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gstreamer qtmedia"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-17.12.1.ebuild b/kde-apps/artikulate/artikulate-17.12.1.ebuild
new file mode 100644
index 000000000000..9c910d95fd15
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer qtmedia"
+
+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
+		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 77b097887c29..29d9c3a545b1 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
 DIST audiocd-kio-17.08.3.tar.xz 247916 BLAKE2B b95475ff9080af1ba4f06952913c7d9ef8876e4a676237ff916baa33d8950cffad5e529079185fc5af88028b72339f0552a5bd032f941b2ba36ff6da34bed3d4 SHA512 000e344e0a9b8bfc09fdb57f0fa58b996a1a0d8a24b08dcf90210a519c2157774d666e1280291762c9b7bea45656cc93bcc5ae661103e4648260aae5ea4d7a26
-DIST audiocd-kio-17.12.0.tar.xz 247912 BLAKE2B 1efbc4cc844b41bc60cbf5a2090fe1143115bf2aa2004659e2559f6e4fd2fc3ba0fa360449b4840c0c0d0cab4766af886e6250866090166b3a404974e93501d9 SHA512 715bee94c06fa6025aa4165d246927e4ce5f731e7d3d19b6d00bab898d81f8545b4922583f38d1f910e916fab1355cf5d0f5cab42e13a518ccecf25348b452a3
+DIST audiocd-kio-17.12.1.tar.xz 247772 BLAKE2B 99ab12d7753c813f768a190a481cf314b246407913004743bcfcc7ccec1fb76e161c19c56e752aa780ac74a2e41eca8ea13571a5b4367aefc6db6b8b98baa040 SHA512 783093e7645cc41731aee1ef38778e2383776c34738b21f8545828996b7c16911114e1309bd863dbcdeb6b3e1f004286b705882ec1530ca4ee050b942e5010f0
 EBUILD audiocd-kio-17.08.3.ebuild 918 BLAKE2B 4670c30e80a156d993ba1d7b2e170ba0f273c2440413fd808415c4f78dfeb97a1826ccf76f52702d03ffaf3befbe349b7f9bada45bc0ae80dac55206a5120ecd SHA512 fc9b602abb71f8b7495424f8541b7c248769de3034cdb22c43ce7f91621fbe5a360b1f2ffbe08449767396498200c0595e91c8be80ad2994907094997096c7b4
-EBUILD audiocd-kio-17.12.0.ebuild 920 BLAKE2B cc21a6d144c333804b8c9b43263c4eb4c52a763b53b820c6dec54407c53e4727e20171c6f7f8e08208829a61fabb4c7cfc9571405133321cc3a67c875af423aa SHA512 620eaea133805deb24e79e5fb5db842813665ac290936630a76d7ce73842c7b4ceaa71821a417c8b4f8d8dd97ba0a4e8422de76ec12c05d0fd9d23754550a765
+EBUILD audiocd-kio-17.12.1.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-17.12.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-17.12.0.ebuild
deleted file mode 100644
index 26ad93361db8..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-17.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="kioslave for accessing audio CDs"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	$(add_qt_dep qtwidgets)
-	media-sound/cdparanoia
-	flac? ( >=media-libs/flac-1.1.2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flac FLAC)
-		$(cmake-utils_use_find_package vorbis OggVorbis)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild
new file mode 100644
index 000000000000..6bd5adfbc365
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="kioslave for accessing audio CDs"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac vorbis"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	$(add_qt_dep qtwidgets)
+	media-sound/cdparanoia
+	flac? ( >=media-libs/flac-1.1.2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package flac FLAC)
+		$(cmake-utils_use_find_package vorbis OggVorbis)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 39cedc3e03c7..463387a9c297 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-17.08.3.tar.xz 152288 BLAKE2B 0cd9403cb8c730f27db69b03d24434638f0b3d35a5fcc8b08e573968cfbd7012ad4f455224f4841736e59edc589845119b27ad0905970dca8540eb5960d5e0b9 SHA512 5b218230c0778906d35c5070dbb91c84a708c7784059083ad972d6d20931388f531306c700fdfea4a58562b2573ed449cae4cb5bda2ac1bf77024f2827199e82
-DIST baloo-widgets-17.12.0.tar.xz 152296 BLAKE2B e361b88e037e82e3d7fcd912e13aa6d2940f290739c36f625471d13596431901b617ee4a1bcffea3a8b70fd96942d5b9fffd678f66ebf7604d09b3d0e60109d0 SHA512 f6ae9715dea5edd3f44b27d5bc9e742da8b12956f098640549b3d32548f57a53ad8be93d77434c16231fb2692e2d206a14bb456d1f456c57c2bf08333bba3efe
+DIST baloo-widgets-17.12.1.tar.xz 152260 BLAKE2B ee9d06d77fc5a41207ad33b8b9f82e0089dbe388ffe0c85e905b9a19d72369c2b9a89c3f58f723e96d14ee3d1f983712b8454dcc58627e4492804f5d03ce0308 SHA512 b8f54014c3d3a3f2250034b56e5f4724b85f86e957bdb358251fe5fb7339c3bf950bf8874cf8730f5f9bc8ae46391ac61ad881159fe2845afb2402dbe06eb6eb
 EBUILD baloo-widgets-17.08.3.ebuild 597 BLAKE2B db062748314ae4d4006cca01debe9fbb1ed4c0a4218bc59f977e6dafb5f7d0f4e0e48d22f879c1d4bd32b38da627b7cd6f2fd892c0731a2c3e508955e9bf110c SHA512 afcaee8bc11f72719dea6c08898f3cb6d432807670013a564a3d975d2ca8f7f55d0cb97a5ed4fa41e5cd65bd6012a83bf6f3a3eb5bf8169469a91abf52c3c91d
-EBUILD baloo-widgets-17.12.0.ebuild 599 BLAKE2B 9a0a11acf89a8bbb703c0000e24d50716126f33baf4d5f7d4b42a4579cf88a17a97da9cda811f4a3f8184aef36b61dbc5e3183cb81d456ed41dca2a7b6aeca3c SHA512 af8ff27bddc48755c89ca670ecf3b857df7a33bb152933ede196ae2827d19960f8532fe584d859fbfc1058fb949fb52b8b01cb84cb5b33df01b2df2c3ea044f9
+EBUILD baloo-widgets-17.12.1.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-17.12.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-17.12.0.ebuild
deleted file mode 100644
index 831bb3b5bbdd..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Widget library for baloo"
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild
new file mode 100644
index 000000000000..585c9262ec1e
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Widget library for baloo"
+LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index a648bd2ebf4f..1948b931063f 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-17.08.3.tar.xz 2505448 BLAKE2B 17c568e461325d779c8217476bbc882142152c642980ac72b0e945cb7b38d8f594c685800d6f16dfb2aca317af7f4d139bf4f32853a3ed0e715f7cc80a3d10ef SHA512 bb4d8c9ec10cb5ba83411217d137f30ffb4a8975e686f8434133134bd18d68fdbb6eab8952eaff6641935fecba19986568281dfbc8cf36fc0a665c7cbcfedebc
-DIST blinken-17.12.0.tar.xz 2505804 BLAKE2B cd4e702f7ec1985dbc624138fb2bdfaeb78f879045586bc0e0c4acdc9d8f31e16598ea8c440e2e642689e650547f755ac11a471163ccf294e3b40a3aace41e5f SHA512 724c48fd6d4a2faf81558d6eaec81d0e8a30c74dea3b11f6dd8bf9aa00fa87441fc294cc0a6f60ceb8a3561c8122d51265adcfe1c7cdc837e790d70b88f33e93
+DIST blinken-17.12.1.tar.xz 2505872 BLAKE2B 4d6049c3d028e11300e7b3d8db899f52ebf103d1997cd5d568e74ddd124f9cb4013e3790111286f08ceec5c759e11aebca7800f530d9bdd0b07f61d31809be95 SHA512 d86fd9aa8b1ef4eb447235c5b44a9dd0b789a96be364dbe2a1ffae15b1bb1ec153dad7bc09f10a4b36b789369f957d5ad57197acda0a79dcf54f68a4b13eb0c2
 EBUILD blinken-17.08.3.ebuild 768 BLAKE2B 367f60576b32adb4e0c1ff7d84ecb2c38be4d38dabf8ee2505323d9e9ed336400330eabfa1596ab6b2613e893fbdfd8ed633ff3a4d9e4242f59bda555fb595e9 SHA512 b643e666cf7409dfb0e1356e32bbd9eeef3ccfd6d2e51dea0fe5f8182d4e1894811e48c23cc4b384adcce2dec0b9a1c206e725b10567b091827e003df65d3e82
-EBUILD blinken-17.12.0.ebuild 770 BLAKE2B 59a745cacaa2e066d7184e7d3e0455bcfd754955a70d2f0bc7bf728f7dca074aace3a5a22581fb9afab4c7b8be82d673518f490da9b2c09f497472f3cae326a3 SHA512 e94a5fbfdfee07107c10d448c048dfbc1a37f0e770097df1445b64c7b31a8567d5dec25cc1887ad769434bfe011cb1d3bbe1934bc4836cad0335c4b91f405fef
+EBUILD blinken-17.12.1.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-17.12.0.ebuild b/kde-apps/blinken/blinken-17.12.0.ebuild
deleted file mode 100644
index 76feb5471b61..000000000000
--- a/kde-apps/blinken/blinken-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE version of the Simon Says game"
-HOMEPAGE="https://www.kde.org/applications/education/blinken
-https://edu.kde.org/blinken/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde5_src_install
-
-	rm "${ED}"usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/blinken/blinken-17.12.1.ebuild b/kde-apps/blinken/blinken-17.12.1.ebuild
new file mode 100644
index 000000000000..691085603aae
--- /dev/null
+++ b/kde-apps/blinken/blinken-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# 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 version of the Simon Says game"
+HOMEPAGE="https://www.kde.org/applications/education/blinken
+https://edu.kde.org/blinken/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+
+	rm "${ED}"usr/share/${PN}/README.packagers || die
+}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 8dd39d22952d..43cc9d367958 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-17.08.3.tar.xz 754600 BLAKE2B 8fe272d55026e8925e7587ffc8bf8465ab765805940eed318f4d3accd3876325f7a03a9e993945966e83c78e555699d79fe2a99e87470f6e355a7de6d69e7b87 SHA512 2fb6ad0b91062bfbb8e861493788f4f042d7a2244a0a93d3070109ba30e43653825dd060e65debaddbe7c26f416248e8ca68a2282a9e375fcc225750f35f7520
-DIST bomber-17.12.0.tar.xz 754084 BLAKE2B 5df6244a6aa38a06a44dbc749bca6e335773d47282aca615af83bfd2ae03aa0f141f8f32c1be3715e7ea1c40bdba74c1ed7a1db0414911352d34f0ca2f0466fc SHA512 bac8582cd6afc4639c2d5581f81a182e8ebdc5202c7c4dc685fc2cece0257984f5965c5184a79c9e4498e9cd834a704f299e47f9be7b9a2dce57272bada7b399
+DIST bomber-17.12.1.tar.xz 753892 BLAKE2B bb6c68b8d9e89f66bee395fd485afc0c9bbe948f5487b9019a4d3440e1da2678b69ca3aa72150a216b4f4f6e378b16266043e3d95ae7777238a124733fa6d1f3 SHA512 b294c8024de866342ae61c31c8e183306883655f6571b0868466a481fedbcd205b011f206dbb0cee6785c20c1446c09d189c135770814c7bcacc32b4520d74e1
 EBUILD bomber-17.08.3.ebuild 685 BLAKE2B b7019f66e915f0383f5a207c8695bcced698b2a2f097904f7a3625ebc9e6131b8bf536d9ee42c984dadfb9e468d50dcab9eb772c3a7c90bcc8b80b422c402774 SHA512 bc2b8ee4d40c5b394cef4210faeea9feb6f6566c7fe198fa331dc696bec0da7c544a922b1325bef0e4538fac39cd18808b3101bfaf744a9ca8f5b60719ef98ec
-EBUILD bomber-17.12.0.ebuild 687 BLAKE2B 26183e0cda8cf688f44d41d64932e5417dea2504d5b983edeb218b126b4a919fef3c067438d59b2ad50521fd31679d1f441efae110a902003eda099845ca4816 SHA512 2fb47984b4238359fb7579452fce92ca3fcbf153791b19450d5e839a08a063eabc5803b8246ab7ffc820fb0c54a73940463389d1538af5c37190b0ee3f181d3c
+EBUILD bomber-17.12.1.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-17.12.0.ebuild b/kde-apps/bomber/bomber-17.12.0.ebuild
deleted file mode 100644
index bfc0bd1cbc78..000000000000
--- a/kde-apps/bomber/bomber-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE arcade bombing game"
-HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bomber/bomber-17.12.1.ebuild b/kde-apps/bomber/bomber-17.12.1.ebuild
new file mode 100644
index 000000000000..1131554ae2a1
--- /dev/null
+++ b/kde-apps/bomber/bomber-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# 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 arcade bombing game"
+HOMEPAGE="https://www.kde.org/applications/games/bomber/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 59ea99b9f025..2507717930f7 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-17.08.3.tar.xz 186460 BLAKE2B dfb74374515a7b5cf88f618e5db04121d776656131ae6aafd63267c8da390092ae9c5793ef6ad47427f2a81503113694f16aed54f7948dd761306bb0af5528a6 SHA512 6d37cd6e687d2ac1c36bb3a9503bbfffc926c5b4d572327315bbdf70db42d956b45390dad74b839d8e6f7a641146ba25c5f84dc67640e1666e0fba19b2760013
-DIST bovo-17.12.0.tar.xz 186480 BLAKE2B f9fc5822d0fd8a766d426e1e2864658522839eea3c23d86bad64a15ed0a6ad144800056480ed7c9754c690b2abc0b2aa4845a8ba38ebf58e18af211083136f28 SHA512 5f0917133f84b7f26fe1171aeaa8a6e6734f306bc210e17094d741814939d43a4656794899f435e7c99a013c0e7f30e45e3e37945da714fdb0dd1e4c107d4ff4
+DIST bovo-17.12.1.tar.xz 186448 BLAKE2B e106cf278b9768f29905551454c9c0eea46d4896de792ad9a70b464952effcaacdc53ff79e1f8426eabd3f8efb31f9338456189e4d681c158d7b01db2c3f9884 SHA512 d162ada28c13f6983220e7ca0fb0c1a6276878d7167d4fdf91550c1e4dfce0ad3c23f3c24699d3e302fd63518af36311da9c212e62912336b3d2999a60cce6ff
 EBUILD bovo-17.08.3.ebuild 702 BLAKE2B 619059ba09022f6c858938b261368c2e662b7996c00fca2b832590bcc814f86ca63e62dc5a464014932d925372ae1ac091cf969acf198035eb9c1ceb975e96ad SHA512 56399e966cc24be1aad11b8e1442e66918d0404e43c7247c30e5794c939dcebb8becfc0647ed54145ae4996c33b20bd1b56eb02f2a824d3e38f34dce4063bf10
-EBUILD bovo-17.12.0.ebuild 704 BLAKE2B 0da9545adf9dfef2506fc3c53f454e6a10442df7b02ba21623485b8c68bf629dd390dc6600a230646cfdcc836bed958681cdbf5cbfd31695a550c4673ec7c7d4 SHA512 28a4c02ec36e77db2998e0b23c56267e2a0020f9e0e292eaaeeda04abdf156ea2368975ae10a6bae947f8ee8a72310dd9df90849428bed637a5f0ed37dea5ebb
+EBUILD bovo-17.12.1.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-17.12.0.ebuild b/kde-apps/bovo/bovo-17.12.0.ebuild
deleted file mode 100644
index a716c5fdc79b..000000000000
--- a/kde-apps/bovo/bovo-17.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/bovo/bovo-17.12.1.ebuild b/kde-apps/bovo/bovo-17.12.1.ebuild
new file mode 100644
index 000000000000..8f3de523e8a3
--- /dev/null
+++ b/kde-apps/bovo/bovo-17.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Five-in-a-row Board Game"
+HOMEPAGE="https://www.kde.org/applications/games/bovo/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index d4178c339556..cc6d4125289a 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.08.3.tar.xz 223524 BLAKE2B 27b584a5a06c7d5388c4a182f824005e8905b54773dfca8c010faba4d254a73d794ed4b1eebdc516ba7a100d0e3b841f37b4a23e2efeeec6416813c2ed63f949 SHA512 9ff26e19f7fcbedb76698d40f781c4e96f97c6441e5002b3fa0d63b22558563ae8f25f8343b05acc400af2fa5e96b7f96c4fa3a9ffc82cbf5d01cf21e002cd40
-DIST akonadi-calendar-tools-17.12.0.tar.xz 224588 BLAKE2B c9d991270f00e9abcc84317d01ad605a47c917d366a6b6108b07fc76c7dc57b7db9102ac97b3b38b84e89eb24f3a63f28d289c9f5eb6aab0c18cd4e65b09e40b SHA512 f76b0d6417bcb17b62da0612c55da54878951112da9060ebf66505e6ddccd9d28caa6e2c6cd4d571e4496a2b6bfba6bb7f680e3f74ecac7e1ece521401358fdf
+DIST akonadi-calendar-tools-17.12.1.tar.xz 224584 BLAKE2B ca816ecc8deb68032b3063cdb777e92b4dc94b9eba782e285a99eacc40742e412f55c6c6f9fca3797b20692a2f516cd2414a0425a2a40a6a3b0ca8bf5bb614e1 SHA512 a7a30b833a835921b071a6288507f131b3688de38262d5fa6f49acfb32148d1625abd5c3e777af6452166d54d374e2991b02c11d328f9aec2ab337581ca38311
 EBUILD calendarjanitor-17.08.3.ebuild 1029 BLAKE2B acdd23c3b1b8ca3990583b5a5418c43a764412b48ccb095dc8cabab3078481e7f66267090589db86212afaeaa3a36c9ca96199c36861d182ce01f0cb853e3427 SHA512 55efd1798069155678bb6cdb3b532cd006efc3ce2005b723d8a86d4337675f131dbb516702643ceadf4f63aa5aabd7b3d09a897b50271af9856dbba199282288
-EBUILD calendarjanitor-17.12.0.ebuild 1031 BLAKE2B f06e2fbb2945ddd1398fb5eeb7e6c2d3f4abc5aec3a782f3a0f2ae34555edb617966eb59a8d50d45c4953eb2fedc4a7bc230063791f4e0425438b2a7823bac59 SHA512 e8ff76aab977e80224032f068548f286ae6dfcb0da993b4acfe29fe215f8a1623c66edb253fb94a836f879e29e39bd734e48f85cdf0bca1dd9572ab21ab784a1
+EBUILD calendarjanitor-17.12.1.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.12.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.12.0.ebuild
deleted file mode 100644
index 8363967d9d1b..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-17.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="false"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.12.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.12.1.ebuild
new file mode 100644
index 000000000000..026dab8a1418
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.12.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_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="false"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	cmake_comment_add_subdirectory doc konsolekalendar
+	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
+
+	# delete colliding konsolekalendar translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/konsolekalendar.po || die
+		rm -rf po/*/docs/konsolekalendar || die
+	fi
+}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index d66fe551871e..c152dfb4061b 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-17.08.3.tar.xz 644224 BLAKE2B 3a995ccb6db2d33abc7264fe0f50ac33b21dc44d76c0008652fdbc1ad7b7187da56879f17e3bc636b7810d679a27a6dcb53cd9a6beed815d4dcf61aaa84f73af SHA512 f7cf312d4e1970fd5d701c26e035443d3505fdbc97d6ca3f4c95c9f193014b3537f09d36c66d159981d22c188c38008ba359a70cf76eac2c3fe291441ee17587
-DIST calendarsupport-17.12.0.tar.xz 644800 BLAKE2B 716c4ffcb3a0b0d87ef117a536997c725b22eba3dc1ec2f800891e7c506db3b1440b815f3863a30e5eff0ef7d896e457fca74312f7f15bd39e82bd4df5b97ca8 SHA512 3988a731be0c89bf1fa2a5b214317e468ee021dce81c7ff86df461fe883304e83fae997ed617989a8274e0cfba7597aa9903792a0e04a220f8a64499928bbc26
+DIST calendarsupport-17.12.1.tar.xz 644840 BLAKE2B 2fd723c13bf89d3047c1dda3ba16550edf27d209f6aab9c01709315045a9e81eb62e37c57124a952d0677b03cd7163def266d91942e3f79d1da345f9e3dd9a74 SHA512 689d9b6b1d68542f586199297d3713bf052878440f3e4b76b97f78c11b2c69efa567a6252d582d09612922628560d870b342db6b143578a4a76f8ebc567199e2
 EBUILD calendarsupport-17.08.3.ebuild 1192 BLAKE2B 7816a15d93e0ede8d94e7667d93c37f7427fac14ba99634fce55f04b88e9a956daf6e3c61484bd71100f2f59e19827d3744951929f5e592ddfe4ea223a829d62 SHA512 1c982180928d0dfe38b75f118f28e21b0805619d39249957cc0b13582bb533bbcf1f8eaebc788b3bd0eb858a607613059d6def8cfc0ebe45ab7bb8b46777bcb7
-EBUILD calendarsupport-17.12.0.ebuild 1098 BLAKE2B eee4bb3bb4d846d4c378b9219e18d327a301e795743c4bc8ca1323b33a2cf127a39a6f59bf0f024ab29aa1d809e9e51d1d9c2d41bb3f57de923719faf097a5f4 SHA512 633da83e0211076b440307582cb11a080ff129a015de4c1c06f2ab6f0ba9ac4923c22a5bcd005180d3d840ce53b1517c19a02e8909264454efd79e97bef81c9e
+EBUILD calendarsupport-17.12.1.ebuild 1098 BLAKE2B 3fc32a388183d2afab5e56acae48cc3898a72ea9458fd869fd1aab08f5d52329120689668edb29202fd5a5b243827fe9207136bbcc411555294fadecbdc12db3 SHA512 d39e71b23195e5d7dc54257b2480c43ebff33fe8b8baafd3f97bf889b39c6bd519eb1d62a6474548dd048094dfaa8b697ca57c70ab846c60d91018026f640bb8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.0.ebuild b/kde-apps/calendarsupport/calendarsupport-17.12.0.ebuild
deleted file mode 100644
index 87a84e755053..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild b/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild
new file mode 100644
index 000000000000..cbb63540f6a6
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Calendar support library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 62368083cadf..a7d56ffa9646 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,8 +1,8 @@
 AUX cantor-16.12.2-bashism.patch 466 BLAKE2B 44e67660315f213cceeb06456a2c38d653b515f99f16e3e02e8f4e3a771354abab701946efc63c07eadf65bdd3cef59646a0562c697189ea119830d4529c636b SHA512 c04ef31c1351f2babf247154a25d191c1374f245a01da886c7141449c92d49d273075c72a369e9129db696417d7f85c7475cc0b615a3b438b7aa576116127393
 DIST cantor-16.12.3.tar.xz 378460 BLAKE2B 189ab04d6fda6864d1827abbd7689b87f59e784ed838613b8d00c44774b9672afad7456665310cc39d95345c5845b60f44708a28550842d14104948333a1e9af SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768
 DIST cantor-17.08.3.tar.xz 1062400 BLAKE2B c9ee9ca23679566c7e8b1895a6ef5a332d486f8abea75242529cd5a5f99f506cd1b3dfef5591a6275272a5a0b8441ff9ef1cf8621c236a7357c5391d187e60be SHA512 92d40921b4121e7053381f071eaf08ba2a5bfdd42272ff749db726aa300878561b8079118a0ea61173269abb04fa1cbfeb8dba27da8701ecd2b17876c64a108b
-DIST cantor-17.12.0.tar.xz 1064392 BLAKE2B 537e6491a705bec0ca8d8aedafab34685b2b92042b8faf57685326375166f6e61ab0bf07307e5c0bb0f7b8e2590929e2e79712196295a40fe09e3ecf26f35215 SHA512 a2bbf4f5fffe2b732260faaf84e6fa2bf3338f5ce6b6943b247ef87ff643751a497c31221816ce4e5cf2f921bb946fd7075e750eba8750cc96448bb9ad400410
+DIST cantor-17.12.1.tar.xz 1064476 BLAKE2B 64eb91b1f0f033c5d6d33c21c9077cac1eb3ccfe33f25047dd18af8fec029cf1b5b26c5f68908eb3d12741ea48857639bb38db97748e48a6880993d37568711a SHA512 d15d9699e05a01fe5f376942dd39fdc9f6e8189819d44b11dbadb7ac43638766a233a361d107aa572e16df598eec4e220bfb9740d741d60a10ea7b00bb6fe095
 EBUILD cantor-16.12.3.ebuild 3151 BLAKE2B c53fa28f4d88114caf131e2655392d7c17885d41515d4dc182b31749041235869b65ebc31c053b85926eec0227d9b8da1eae03c5809c9a11bc29a899c3a3fb0e SHA512 c1a1f20d839bccefe81d5189865324c917a46b3f2acaea8583310950e9f9eb16cc6f0b8f675f10148bce92554ff8c2f235dce8bf347ccee5838e5d4ef5c464b8
 EBUILD cantor-17.08.3.ebuild 3143 BLAKE2B 0d62ce2827824722dfae67bdb336f3e8cab3286d531d760dd94475fba809d4d23c76cf02860cc43df394f7b4e5d71a6e54ac80b3142d6496b1609aea6cfcd9d3 SHA512 e4e6b053a23b08a21775b42a7e6022c9c57245570d3d252a9b486bfa419f17e072b2907218731a41538cf44555b260d07206dd7f891891e8210717bddbb0c5e0
-EBUILD cantor-17.12.0.ebuild 3145 BLAKE2B 420a8c3c9207b983bd5bc20ae6faccee694d0a2e38b01b0e6b87d500412dee4f4f04fc1e3b6d4883ef77052489588cbdafde2f84862cf6073e98cf2aae45e43b SHA512 0356c7dc7d0b18ba7156095a743c63472a1dae86f799d0774030e84e3ea53a907a2463862b3c66419084d322991335651a8ee16081c1ac9350b233b58d98c829
+EBUILD cantor-17.12.1.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-17.12.0.ebuild b/kde-apps/cantor/cantor-17.12.0.ebuild
deleted file mode 100644
index 1aa548e3c436..000000000000
--- a/kde-apps/cantor/cantor-17.12.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+analitza julia lua postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	analitza? ( $(add_kdeapps_dep analitza) )
-	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	kde5_pkg_pretend
-
-	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
-		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
-		einfo "You have decided to build ${PN} with no backend."
-		einfo "To have this application functional, please enable one of the backends via USE flag:"
-		einfo "    analitza, lua, python, qalculate"
-		einfo "Alternatively, install one of these:"
-		einfo "    # emerge sci-mathematics/maxima (bug #619534)"
-		einfo "    # emerge sci-mathematics/octave"
-		einfo "Experimental available USE flags:"
-		einfo "    julia (not stable, bug #613576), R (bug #619534)"
-		einfo
-	fi
-
-	if ! has_version virtual/latex-base; then
-		einfo "For LaTeX support:"
-		einfo "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
-	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
-		-i src/backends/CMakeLists.txt || die
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package analitza Analitza5)
-		$(cmake-utils_use_find_package julia Julia)
-		$(cmake-utils_use_find_package lua LuaJIT)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package python PythonLibs)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/cantor/cantor-17.12.1.ebuild b/kde-apps/cantor/cantor-17.12.1.ebuild
new file mode 100644
index 000000000000..cd2bf41394b4
--- /dev/null
+++ b/kde-apps/cantor/cantor-17.12.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+analitza julia lua postscript python qalculate R"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	analitza? ( $(add_kdeapps_dep analitza) )
+	julia? ( dev-lang/julia )
+	lua? ( dev-lang/luajit:2 )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+pkg_pretend() {
+	kde5_pkg_pretend
+
+	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
+		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
+		einfo "You have decided to build ${PN} with no backend."
+		einfo "To have this application functional, please enable one of the backends via USE flag:"
+		einfo "    analitza, lua, python, qalculate"
+		einfo "Alternatively, install one of these:"
+		einfo "    # emerge sci-mathematics/maxima (bug #619534)"
+		einfo "    # emerge sci-mathematics/octave"
+		einfo "Experimental available USE flags:"
+		einfo "    julia (not stable, bug #613576), R (bug #619534)"
+		einfo
+	fi
+
+	if ! has_version virtual/latex-base; then
+		einfo "For LaTeX support:"
+		einfo "    # emerge virtual/latex-base"
+	fi
+}
+
+pkg_setup() {
+	use python && python_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
+		-i src/backends/CMakeLists.txt || die
+}
+
+src_configure() {
+	use julia && addpredict /proc/self/mem # bug 602894
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package analitza Analitza5)
+		$(cmake-utils_use_find_package julia Julia)
+		$(cmake-utils_use_find_package lua LuaJIT)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package python PythonLibs)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index d5dca2089757..999daee78b97 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-17.08.3.tar.xz 1905528 BLAKE2B f6780929aebebbda7ea1cfabc239d9b293c3de50363c9677b2bb6cb2486a4d239febc066d24c52d99716ccc8c2a7442f29b096da90d3db88be0af489d78f23be SHA512 0e9c5136745da6b6a7ace7bc009b87d697915b7fc39689c6c4b562d8a2e70212091e650043cf30abd453f1c59c64b4580e2df61ea5af3551ac3c9d45c15aa263
-DIST cervisia-17.12.0.tar.xz 1905988 BLAKE2B 7a415fcf17e88d8bb2360772c0c1d28d3c62f7b45e91be9d7b94305f0bd7f4d50ff600c8e533c887f9c6f380df5b5c5cddd46458be4aa51ebd903e25b6341987 SHA512 8e3a0b10822624228653da8b60516cff7c294b8c2012cba118524c0f1924c7ab07269bc56427b91ce8fc9171918ea3ddee8c569878c74247536eb765ac4e6f9f
+DIST cervisia-17.12.1.tar.xz 1905836 BLAKE2B 8e7faa64a635767ddd8fc9bc2ad4882d624ec43d0a97d056a272f4879102dbf4e541065d35f38cd7d126e941a5dc05e207940426e47387b608cdd50ab72c7fb5 SHA512 eb4e2b615a73e5e59c9c6d38346721658f2864c8cacd32c08dbb555e767d0dd21967fa17bc98c524211d84f87b2b849ec9d23108795f6436dcef49c23c405e04
 EBUILD cervisia-17.08.3.ebuild 899 BLAKE2B c9e548c35aec8de47377ed41f26792cbd64e6dbe186b4b7a0b96f91f4aa36b983f8c3e6a0b260a92581e6ba42d27257b28c7201c7dc00b2bcc3c8ec121e09162 SHA512 683851aed8d3e486fe348f1c644d583126c9b2ae11ebf89bf91f721613188831a007d9fcb9266750fe07c890bff1fbbd307fac8da683d9bf15baaa787e417b34
-EBUILD cervisia-17.12.0.ebuild 901 BLAKE2B bb695a7a895597c19675b4c9ab986ac790e348454f0d76bc87fcd370e60dacc2e558f1ca7e2fa99a5f08c2b1d0deba9e7c11aa657ac1d476edabd969a549624e SHA512 7ac1901877596ca1c5746bf32b0f9c7b10640f0616ec8f9a45e0b8e26a8f1fdb43de2d0e26a64aacbfba7c8b91d8cf9979211da27d1e1c4a018c946f2396899e
+EBUILD cervisia-17.12.1.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-17.12.0.ebuild b/kde-apps/cervisia/cervisia-17.12.0.ebuild
deleted file mode 100644
index 7da6c95382e9..000000000000
--- a/kde-apps/cervisia/cervisia-17.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/cervisia/cervisia-17.12.1.ebuild b/kde-apps/cervisia/cervisia-17.12.1.ebuild
new file mode 100644
index 000000000000..fe35d7708a72
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-17.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="CVS frontend by KDE"
+HOMEPAGE="https://www.kde.org/applications/development/cervisia"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+"
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index 4940727b4824..81403e435e57 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-17.08.3.tar.xz 187084 BLAKE2B abe392d68e622c8cc02aaae31d71ffa28bc19544e7b9306ae3cfcc73a18ae9d4b453626274158d94d52140bff16e39c987a68423d4e24dfcac38efcab65cefef SHA512 49bd9b9059a129e9276d2cc216679abbdec595a98aa3ee950164fafcef30a2206b18e3b7487a6665aa3da6c643d92017309fedcfad0caacdadd7433126690970
-DIST dolphin-plugins-17.12.0.tar.xz 187108 BLAKE2B 828bc8e728b28b8ba20f664055e090809b0901dc3444f6d1a1c4bdf79d65b8059cf73b379acd23a5d6eec85ebb59f278b2f7d797962777cf0b12803cbb9f76bc SHA512 551406733c97d0a4a0bb4d0567ce0351c64c33db501afad2c7ab49436d67e512c5d3ad34e7f5544765c09aba853ae31a48c1eeac81722f83485d91b41c22a586
+DIST dolphin-plugins-17.12.1.tar.xz 187316 BLAKE2B 36c1f8e264daa021f27aea9675784443d7d223f779822d05e077e93c232ba828527042507ee081758c958a9cf9aaad6d0f5a1551a30941b9ac9820fbfd6127bc SHA512 e0e63cac17211ab8390e62274ba69e5706dd0ff3df5a3c91adbfb4cc276cd79f73e6209b7c1fc8c1d4ffd804a974547d58f79bd1a4cf7363783a9eb1a510a8cf
 EBUILD dolphin-plugins-17.08.3.ebuild 1841 BLAKE2B 8471e65d62c01837a46cee08ae434db7cfac3cbd67703456f393ea564da8ba1ff328b581b817255918a1d719a827a77fdf8ec5042521dd4d00e3abf4c999176b SHA512 7bec4439e60cd13a01eb08098859a685d11022435f091b06bb9ef93eb60976305b026d8efa36e7f42e749e7b2b7764d1fab4065cc65b30812246f0e1afbbb255
-EBUILD dolphin-plugins-17.12.0.ebuild 1843 BLAKE2B a5820fbb19bceecda70a4ea91d1ba24ab55d28e8a91dfeb5a78cdaa4998dc81bb8588e07f81fc582e73efdbbc457af45e8ce2461fec035604cf8c696dcff2001 SHA512 e23634c253d8004792ee7db90a209fd20e2755b7bbad9acd1af0f40d5ec1bbcaf120eb9a8c8c8b84830473c67e52cfa96cb262f707faefd2960e6e741a56fe1e
+EBUILD dolphin-plugins-17.12.1.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.0.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.0.ebuild
deleted file mode 100644
index a370260ca5a1..000000000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false"
-inherit kde5
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~x86"
-IUSE="bazaar dropbox git mercurial subversion"
-
-# FIXME: required in root CMakeLists.txt, but:
-# kdelibs4support only required by git?
-# kxmlgui, qtnetwork only required by dropbox?
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	git? (
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep ktextwidgets)
-	)
-	mercurial? (
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep ktexteditor)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kompare)
-	bazaar? ( dev-vcs/bzr )
-	dropbox? ( net-misc/dropbox-cli )
-	git? ( dev-vcs/git )
-	subversion? ( dev-vcs/subversion )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_bazaar=$(usex bazaar)
-		-DBUILD_dropbox=$(usex dropbox)
-		-DBUILD_git=$(usex git)
-		-DBUILD_hg=$(usex mercurial)
-		-DBUILD_svn=$(usex subversion)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	{ use bazaar || use dropbox || use git || use subversion || use mercurial; } && kde5_src_install
-}
-
-pkg_postinst() {
-	if ! use bazaar && ! use dropbox && ! use git && ! use subversion && ! use mercurial; then
-		einfo
-		einfo "You have disabled all plugin use flags. If you want to have vcs"
-		einfo "integration in dolphin, enable those of your needs."
-		einfo
-	fi
-}
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild
new file mode 100644
index 000000000000..125d149d68cf
--- /dev/null
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+inherit kde5
+
+DESCRIPTION="Extra Dolphin plugins"
+KEYWORDS="~amd64 ~x86"
+IUSE="bazaar dropbox git mercurial subversion"
+
+# FIXME: required in root CMakeLists.txt, but:
+# kdelibs4support only required by git?
+# kxmlgui, qtnetwork only required by dropbox?
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	git? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep ktextwidgets)
+	)
+	mercurial? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep ktexteditor)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kompare)
+	bazaar? ( dev-vcs/bzr )
+	dropbox? ( net-misc/dropbox-cli )
+	git? ( dev-vcs/git )
+	subversion? ( dev-vcs/subversion )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_bazaar=$(usex bazaar)
+		-DBUILD_dropbox=$(usex dropbox)
+		-DBUILD_git=$(usex git)
+		-DBUILD_hg=$(usex mercurial)
+		-DBUILD_svn=$(usex subversion)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	{ use bazaar || use dropbox || use git || use subversion || use mercurial; } && kde5_src_install
+}
+
+pkg_postinst() {
+	if ! use bazaar && ! use dropbox && ! use git && ! use subversion && ! use mercurial; then
+		einfo
+		einfo "You have disabled all plugin use flags. If you want to have vcs"
+		einfo "integration in dolphin, enable those of your needs."
+		einfo
+	fi
+}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 5b724f6d0991..30f2fbedc108 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-17.08.3.tar.xz 4832732 BLAKE2B 8fcb23bdac474ed4c0e8cb220f28443ae759ed5d818935ec96eee02121855173ef905938dbf0ef024daafd3e946bc1c544a3b82a10447aadd5fc3a17eb4de241 SHA512 c2b0a41b29bc0370b7e9614edb5cf80585748c3fe2179b40799e5922dd7370c75608b756384d2155b1a1a7e8cec599e94539174a615239303bd6ee002050b662
-DIST dolphin-17.12.0.tar.xz 4840308 BLAKE2B 0f03354a855c06150793c95cea07c5a12d8c92e1fbe55e3fa00e9e98de9519f7582fb9091e71b82a0c5849abeac4167a3805f4c4442344d08f0b307afbefa8b1 SHA512 bd6ba516da2e963963b35413d2fc02250bef4e20791316d62478341d37ed6f1a7b850f1d4b5d838daa485ae7c90ea04bc983611c4ebb9ee614dc93c9449f5fe9
+DIST dolphin-17.12.1.tar.xz 4840748 BLAKE2B 803f27c3a8b5bd0dfa1ca9eab01c3a3ea7c28479ad7c4ace72b74b1a5565adeda5ff8c1a6f25625bd3dfc263605401808c595613d834d89ac0b433286130c6a3 SHA512 0780eeb1bb730ac797532cf52411ad1036633565ed1e098b35828252f1a393554489367a136029b5b43f4783c4b5f16dbde1ab38314df997f206a91ddb540837
 EBUILD dolphin-17.08.3.ebuild 2230 BLAKE2B 3d8c7e7c23da9441de0cc948df6db2879d633e71bc0b573501dfcdfa651d5f76fdc674278bece6f36ce8785e80ea40e2f15bfeb8c6a0317c8b56a71fa16dff29 SHA512 3b1c38355522d0c5d8ce83ef9f5ba69ad5745db4b157e649773cf6dc9f5e9b4414728e6ea77e8d8ea33d0ef3fbc241bc48edebef2bd36609b79a7840de476c53
-EBUILD dolphin-17.12.0.ebuild 2232 BLAKE2B a9942485ab4e540b38e46246b6b86423db5eb337a062decd5b292891c2bf37ef2cab3c1cf68760137e63748a17aa6a18841750c2e81f2b72e6f4a73a2a211acb SHA512 ff6b166f97e27a3591efaa90e5327384e8d47aaed34da6b2d02012b8256f010eef8d55c0e87c880366698a6e206f02b41a50e89a832c3b2995754d828bddeff0
+EBUILD dolphin-17.12.1.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
 MISC metadata.xml 331 BLAKE2B a91c4bcb2198a9547445e94220760e327f2cfd2225e4189b4d5ec23ade31bd0c2560403cd085d91430fcde303df0cf25477b840aeda3010f332a3f053aa5aeaf SHA512 2946556cf6d92f1d2c33c44b4b261003d6e26f2829944082422afceab77f7a504dac7cc945fddaa0539953884b57a41dcc8f2f8b972b48fb4dca502b8a92d367
diff --git a/kde-apps/dolphin/dolphin-17.12.0.ebuild b/kde-apps/dolphin/dolphin-17.12.0.ebuild
deleted file mode 100644
index 7afe193dc052..000000000000
--- a/kde-apps/dolphin/dolphin-17.12.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="~amd64 ~x86"
-IUSE="semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-	!semantic-desktop? (
-		$(add_frameworks_dep kdelibs4support)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	thumbnail? (
-		$(add_kdeapps_dep ffmpegthumbs)
-		$(add_kdeapps_dep thumbnailers)
-	)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/ark:${SLOT}" ; then
-		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-17.12.1.ebuild b/kde-apps/dolphin/dolphin-17.12.1.ebuild
new file mode 100644
index 000000000000..256cdd947622
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-17.12.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+	fi
+}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index afbe21d52b9d..581d74868caa 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-17.08.3.tar.xz 1463028 BLAKE2B b5804388182fc916d458d0c08d5cc3f39ce59222732f282199d1b57e543abebbd79fe1b1ec894935c4cc95bdd04e2b038a10c1ed62339fcb1eb49f545a568f35 SHA512 ca71a17ea38f5ea28c53f7b10a050c25b12f7e02da36dad8140868cb6a86d10b2d4efb25df28ea05ae65d36bffb074177db56c4b6a2505364dee060f8e47b5ff
-DIST dragon-17.12.0.tar.xz 1463144 BLAKE2B 97947f5806f978fa6672451e961e1e37808466b21dfd4cea5ab45db6146e547a1baaf7c5b64618fb6516bdf574cfed146863d396ac7c9683aa12917886b50ebc SHA512 ded54fb6face4360fd1280710e006c492ca7e15594d080cd6d72ee4f58f8eee8a688f3a36f5493d39a2c61601d4c507f42f06ca0ffef20f18696f3e2f44d38c0
+DIST dragon-17.12.1.tar.xz 1463184 BLAKE2B d43bce2a65301d0f93faaa849c69093523831273410032247c96073b5e1b0acda0dbc133d4a6fd16aef3dd7252133eddfbd886c4efdcb9c2d14779e93a3fe72c SHA512 3326c0485ca505e75c4c41e53ded1a23909c045335674b489eac181bc4aee00b167fd4338456882236034045568630b985f8dd52beee70f35f1adab8bebf6860
 EBUILD dragon-17.08.3.ebuild 956 BLAKE2B 67d59ef9b6c6f1a9d28a0d2a81569e33c36795ae381cada1506d26fc5b5eea67f39b30dd3c210f31de8d6fbb49a278cb0075842482ba9d99025cd7a017b1c793 SHA512 7c738d318eea4475b27258dd5347d4cdb596a48e13c6f51a1b1d986143d4808b74ec3f1a1beaceaee483a6bbf3d3c5b13141ab5cc0fe53e36c1ede64ba9f6bf5
-EBUILD dragon-17.12.0.ebuild 958 BLAKE2B bb8e737519252719b57bfb1106646a69e2e520023a69829b13b47e59c7be4143f727c34334e12bdf0a667e4d9d6d8abbe6f88960796352e16b1ef40081695c0d SHA512 93cc8f48f99e319e5ea89077a745354194fed72f15ad4c025ec153c17b371024b26da477f369467d2db062afb70b65ce9223bc0f7a5ab6379142c6b8e76103cc
+EBUILD dragon-17.12.1.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-17.12.0.ebuild b/kde-apps/dragon/dragon-17.12.0.ebuild
deleted file mode 100644
index 27f9496d5eb6..000000000000
--- a/kde-apps/dragon/dragon-17.12.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A simple video player"
-HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/dragon/dragon-17.12.1.ebuild b/kde-apps/dragon/dragon-17.12.1.ebuild
new file mode 100644
index 000000000000..e97559abf858
--- /dev/null
+++ b/kde-apps/dragon/dragon-17.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A simple video player"
+HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
+
+LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 81c0d0410e9e..d9c2db796023 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-17.08.3.tar.xz 433968 BLAKE2B 3ce619b1f5498dbf434e396eda47274c834e65a12b4899b5eb5bd3bb9e09a7887ceb0cd92b2bbda240f1c2b58a59293001ddefe619b945030d8b6288fa91de7b SHA512 ac44d1657293430ef4edd0ea8119529fea56fffc0c88dac3a928a37a4191f345ee5f035b2a70bcae22d6da0c3fc9f8642ee56c050da91bffccf7864816a4786c
-DIST eventviews-17.12.0.tar.xz 436208 BLAKE2B c949aecffbfaded056c284a97170e5130ed7e25af49c9ab95f74b6d00dedf1dacaa53c1f83aa974774a04be962c05f2525ae37f46a23376fdc41f892accd09c3 SHA512 cefb7def74e9d42f1cade37656f86dc8b711a9e9eebbe4fbc07d3e0696a54389bddffb7efc4e798976c8a00ddf56b669f410e35e0bd5fdbb0905c173f7633c89
+DIST eventviews-17.12.1.tar.xz 438316 BLAKE2B 8b1747d8e44a2858ea9528e788a130fb1eed8a6457ee39bc7aaf1a9ef3a866cc2625d7e8f75e5ae6f42b941a4355b5747e4407f898f3e5d51934cbb4647cfa13 SHA512 4c02d634c8fc7b2efdf54f4954548b082d7e50b74f754d3291ce4fbfdf25a7be6dce98060e9e25985020d4a8ff12d500f5fe38079fa5fb7f034de87e40216dd4
 EBUILD eventviews-17.08.3.ebuild 1067 BLAKE2B 3200fea53e6d0e2f938c98717856883eff676bdb42c2390b8a7bda09a35c4a6616445d0f12422f5c7c7f280e67aa952b76edba6c1435c449372ecadcef824621 SHA512 7a822d5340684929578c57869d6e154d35eeb5a5aa0bc1874c12c9bfd8f7099d802834faf13a8eb4e01756ab773526e641f81ee2cd2afbdcb82f0df920888885
-EBUILD eventviews-17.12.0.ebuild 1030 BLAKE2B d29e329165bd088fb76e11f8b0c5f57c6b3cf3088d8c46baeb8052285fc152ba3c18889787bb7af084e81867535a61d57d302fc15be0a67f657ee8acf35aa57c SHA512 9d210743278c65955c32083bb03e24a4f44e1e50089ac5bfa27538a8ae2f1af729f35eb4b2054456782382d16ff6a337719b9daadb81050929de59852718c125
+EBUILD eventviews-17.12.1.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-17.12.0.ebuild b/kde-apps/eventviews/eventviews-17.12.0.ebuild
deleted file mode 100644
index 5d56973270c4..000000000000
--- a/kde-apps/eventviews/eventviews-17.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/eventviews/eventviews-17.12.1.ebuild b/kde-apps/eventviews/eventviews-17.12.1.ebuild
new file mode 100644
index 000000000000..8b6b5841912a
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-17.12.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="true"
+inherit kde5
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 01889b9d903e..af1df42dd8e8 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-17.08.3.tar.xz 21100 BLAKE2B 29f53acf700c15423a27b9616d6fa3151ab7282aaa158d21f5a396857d7889f14b8b1030913f9a5151c427490140ca2bf35097327abad41566eadd8c90ac1075 SHA512 81ac9b17395fd07bd49200393eba409d7d5c3fae3ca78772dca1f2d24ce7f7a1162ff1be1df7fd1f7dbfc055af4163562c3a890c89eabaed7eb000afcbcf74e0
-DIST ffmpegthumbs-17.12.0.tar.xz 21104 BLAKE2B 14be791d8e444c5444f69c555ceb8008f97088749e8b14c4c0b596510bf34a3e82cc5a6b5060574976739f1207a0dd0a443efb81bf7fd70ec05156c047ad2694 SHA512 965f9f93a575762414502c1383501060e9a83a41250f2462e555bd8b0a62948a76a9d168995ce735ecd868a0688ab38c4e11d4d35a640e3944e3cfb55690e3a5
+DIST ffmpegthumbs-17.12.1.tar.xz 21108 BLAKE2B 46b4c53ebb3d7113340b30048b657d015c3583210caff256f9a2780e9dca09b41fdbc1727c55f44c87be599a37789871a11409fbc990354ff35d7fac31982922 SHA512 534b9b8a85bf02bc2f58f5491b1bc7f977d9b3031042cd1b0ba2b4adea5a36e6e47c7e650e4aeccf41b0836a633c2b4812dbea9d700cce87953027edd990e5a3
 EBUILD ffmpegthumbs-17.08.3.ebuild 436 BLAKE2B 333b7d3fcad5fad63e694856f910d530d51c78c4b09cb05000f8d7b69854f2e48572bc6f83d9c1a794c58e3ff564370825b85c630550dfc26243667d0de7402d SHA512 f4e5759b45ad5e9c387f59e56bea8606ceaef0d3e8e8908d6536b2ecd3e040c8630dbcddd55d9f03c582570961d5c751049f2323e085c11eae896be05cbed678
-EBUILD ffmpegthumbs-17.12.0.ebuild 438 BLAKE2B 62e2de1f07ab9fd58fa52a786a2ab98d5f0d49d0e0499fb349734ca2691fd64a2712371b84702d27017c50749e495d3036d43698e5d7581e25c5af9919275a1c SHA512 71696a16041172c7334121ec9ce3b6319596ce0a76b6cb35394993b85370ef68bbfb04218255c8bfc3ed39bbb1585f5e1de9a67dcd59887e0583dc002e4ab3c2
+EBUILD ffmpegthumbs-17.12.1.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.0.ebuild
deleted file mode 100644
index 9377a8524138..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav"
-
-RDEPEND="
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild
new file mode 100644
index 000000000000..a00942c7569b
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index ba27d5d0ffe6..515f885ffa0a 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-17.08.3.tar.xz 650248 BLAKE2B a8d41a4c65e27b435ae00f71db150bb5db5d88a1dbeae866a32b3e014fa3ff087950cf69e6627a338b36105589ac2e5da3101c9ff64c219a90f8a19d7be4ead6 SHA512 e1da378d1dcf1ca7f6ec38900a0909768cf6c0de34524f7e35bcb44767a35adeb76d9c59ba5e079cabaa40f5cadbed68b10631b65457d1f40eb8b2be6064471d
-DIST filelight-17.12.0.tar.xz 653964 BLAKE2B 51df7c5ea8f1285ef4d643ffbd9d2f8c8eaa25c95eea41d97ed451a8d7a8b2d46b4b60fcc3b851aae31c453ec92d770d22b3a548a258369dbe5aa8117bc6ed84 SHA512 a4824ee236cbccf4dabf5ad19faf4a7e4572a61f64cc5fac69c4681f50a4d3d9b5ceb0eef790ca7051ee79a11670d6b21857605eee2d117f5c46ea0784a0cde6
+DIST filelight-17.12.1.tar.xz 654724 BLAKE2B 3f0833dea22080acd705d131d5e0bdcfaefb0822f4622885f0ee6b8d174821f6a49d6077ac61b5639346200272ed777024f45c6fb4f01c06ee8b00ef78e6c410 SHA512 9282dd4ed14ae8880af5ea97760ceea2011af5c6789fb166855afbdc8da002017153988549d7b49a1e38d184da2f92a6bace907858dadd9f04738456b882439e
 EBUILD filelight-17.08.3.ebuild 702 BLAKE2B 20122f5cece77e79db52988d1351674f7efdb3517a16a780a2a2320afb2f36bcae53b0a643d4214fe209535a60836b925858aaef644aff6f75a3c1dbe829a4d0 SHA512 149162e50db40eac8a78fa1bced7849ea43a8b11e77199bc4a496b14bf52c6fecd11a0cfe52d87992bdd774204cf73aa81903f454d4f8eb527a223bff861d7f5
-EBUILD filelight-17.12.0.ebuild 699 BLAKE2B 151826df58e81071c445a393ced8297bbd86e8541da991dc56c64b5fe78fb5a2ac67d05332911b2b243aa880acbb37c22ead85cf1561f1fdac064402f085a164 SHA512 3c43d041a2cfbeec2dad87ca31cfebd338a9e15c58a7d8e76289a6ca9ef468579224d039ef96037df23132f596c2a02126d0d41159061eb6b94f8a2091a43063
+EBUILD filelight-17.12.1.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-17.12.0.ebuild b/kde-apps/filelight/filelight-17.12.0.ebuild
deleted file mode 100644
index 0ef4a8997db9..000000000000
--- a/kde-apps/filelight/filelight-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://utils.kde.org/projects/filelight/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/filelight-17.12.1.ebuild b/kde-apps/filelight/filelight-17.12.1.ebuild
new file mode 100644
index 000000000000..03b58843a55e
--- /dev/null
+++ b/kde-apps/filelight/filelight-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://utils.kde.org/projects/filelight/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index b75ba2f174cc..f1aa6ab9ed4d 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-17.08.3.tar.xz 1959756 BLAKE2B 41695a3bed6c767bfc5a776bba44cf473d3cf00ebcdbf2badb0221247582183626462c4db1374ba0bc9884b10a132cd68972aa71f3dc742433a00350504e436d SHA512 0edf00c3523fbad518ab757812ff217a1841ebf712f001f9007ba158c73a7994f5aa94b94f5a9efd813097a242204c87b8103795f29f3058946ce6f969931e56
-DIST granatier-17.12.0.tar.xz 1960024 BLAKE2B cf450cd9e7701406a105c885b93331101e020465eeca38fe0c140fa83230a0b9cc1e60eb2c23682ccd8b6581dbf637a5f9a75384df53fbc26c62adf3a39a2cf1 SHA512 94ea2458001c7d1e5e720b5bcd43598f453d8ea119948f88a48c3f68f9f0b2daa82d40acd5232681a0105b8a5a80f53b39f3b404345597794c2014184406795c
+DIST granatier-17.12.1.tar.xz 1959924 BLAKE2B a4561499a01cee69d6f1bad48bbf5214967f4e199ed6590d60fc13efdf7f6cd614f3348c1e6c0a649b1d6d5735a8df2d1239f177b50d62d131b7875c2d74902d SHA512 945bd6ab6c69d67abeba2ff4a5e0da6e2c5acf639c9543d57b2b77a430b44710b1892f3909c1a583fa9dd5cc3755545c367d8e9f54c010333c18fc00017a3b0f
 EBUILD granatier-17.08.3.ebuild 734 BLAKE2B 85fc42390403111ab20f710b73a47ff088f751a50b19cdc211afbf24c2c1a559c78bbec63f6cb7446c444382655141570cfd087ba07686cab447ddec20886848 SHA512 057edd7b01b338a87db19244e1d3ac3804cdf8d90bb6c64944455bba87bead0b4642732021eff03bc03d8d7634b8dcb2489068a929091194d56da0b734de3b8b
-EBUILD granatier-17.12.0.ebuild 736 BLAKE2B 8e94a9c0f8c117c724b5341db3a01feb8894830e321d6a9d26e0afddd6a415c341189a7b6067126b6432721b2f12799eb56777d0f7c80c141bf3ceb06d1486e1 SHA512 d885801b65c9eefdd7f6b99c60801452ee85fcd89fd64e5966816e896ac0543657f3850e9a63b6954af75d0a5c589aff2f4b484bed90d5e0981ce075a7f7dc6e
+EBUILD granatier-17.12.1.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-17.12.0.ebuild b/kde-apps/granatier/granatier-17.12.0.ebuild
deleted file mode 100644
index 0efe6592e861..000000000000
--- a/kde-apps/granatier/granatier-17.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/granatier-17.12.1.ebuild b/kde-apps/granatier/granatier-17.12.1.ebuild
new file mode 100644
index 000000000000..28cef3517e33
--- /dev/null
+++ b/kde-apps/granatier/granatier-17.12.1.ebuild
@@ -0,0 +1,30 @@
+# 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 Bomberman game"
+HOMEPAGE="https://www.kde.org/applications/games/granatier/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 671be33ec5e2..5ea597f16746 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-17.08.3.tar.xz 110740 BLAKE2B 0eccacb3a0b30a776305ab7d76f6f7e384ffd07c30747b72622bfe0d2e7d465d4fe18631e7365c8edb523744f722c420ef64fb1182755284280d70f0638c2100 SHA512 696168482e3c9368156e34e932010cbd5587f72e642ff07eec024e008b95178c296edc89f6cf50a0a94d29385279590fea3aaabd2de067b69e129c0a1a65d6db
-DIST grantlee-editor-17.12.0.tar.xz 110648 BLAKE2B 99739f304d728ead379c8d7e18578c6463fd7cdd6492ccbe8d6134fe51636ca4526b089b18d5ee84786003d42397953c676882f4fcb401c746c864b248a7ddb8 SHA512 5661ea91009d8e21ae2bf4925084f2bd8cd71af9fcbec125a551dfc5f5c0d20863fbe79122df04c66133da71507b02889efbba069c7c941d0a696aacee49a6c4
+DIST grantlee-editor-17.12.1.tar.xz 110572 BLAKE2B 5d0b5fe027aba60b002fa31ff665442266ba08409d15bebff4e28e278d42b13127cb2a50fb99105479a9a0c20fe770d7aaec812737f598a937154c0b38862bba SHA512 ff4ab90013ee855c2d70c1223cdbba5fe0d2eae8eff0cd0f6c1def4dfe2cddcd62697b9790a3598fd4b91fcd65d89339c0e1d3fdc07bebfb2750cf51ccd984aa
 EBUILD grantlee-editor-17.08.3.ebuild 1166 BLAKE2B 23f42caeaa63a4b3f0c7196739a677f49c56b92f8a77b80e6f84143422a0ae3706438f28d457319186bce175063f80638e9e68bb82300aa1ce68afa9cccc314d SHA512 80228d35d4a5f95e5a81f382eeeea4d3a7952d6fd57d4b31cbb11a70e7421987167699e886e24290d703327ea0a08a12197606c8d24babae60a7bbe03dc3f993
-EBUILD grantlee-editor-17.12.0.ebuild 1168 BLAKE2B 9d34845d9e9f6ac56d17e1dcd53a17b9acbabe601dc510db3fbd18cf239d7a1b7db76f316320b1759b969fe04213616ebb56df3017d42770345054b7db3e96fc SHA512 a7f2c5e336b0007eda78c6cbf47fcca66d5bd8c76f445b7ed4272eebc6b9de41bdaad64ce4800d6ef6bd57bb59f9bd480ec40e56a7eef2a629baa189f1079d96
+EBUILD grantlee-editor-17.12.1.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-17.12.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-17.12.0.ebuild
deleted file mode 100644
index d1725b0b9f49..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild
new file mode 100644
index 000000000000..53bf85082a4f
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 31f883bf6c25..295b94a38216 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-17.08.3.tar.xz 51180 BLAKE2B 3531f6edffe0bd0605c839d1c58f37216736704b4562caf1c3da917f0ee459b476888703c14acc85f980c7b052c096aa7bbc93b8b56f43370226048c0ee79e93 SHA512 ef859d8a4ddd201abdf0f4e51757b948593aea4ba751d9eb9a98ad41692a5322d088044bffdfbb778e3d17f91bc31b1be1218f45d5aa15595eb8aac2adcffec9
-DIST grantleetheme-17.12.0.tar.xz 51400 BLAKE2B 3856dfdae84533794115dfa6d3dd247f00be0f2a4f1f35f20fa00026233e050e4f4516ddc24d462c865105c2d90969c22e6fe1f997187bff0b8b587ad576c7a4 SHA512 1b801551dce492e49598a1683a4d3c351bcfd2ae88bd73576f578133a86d2903d62a82613f2148ba4a5070e51f414597231069543082dbbf6b9ccc6b48215639
+DIST grantleetheme-17.12.1.tar.xz 51392 BLAKE2B db694f7784914bffc08b394b8c926114672b35cd77d69259b36ae61d0fcc0c9df5f75c812a330c48bb51121ca9753510bb465ce3c4b02b147368a977302cbf9a SHA512 89aca54e01b406bd0f56fa16b1c43e5c882015a3c16524d37473d917f622fb9abb2ff1e6d5f43e3cc5c5e7fbf49ee25087f790ccdb61cf1284b201f55c8b2f60
 EBUILD grantleetheme-17.08.3.ebuild 735 BLAKE2B cf8c120c004ac22469f7de05ce94a7579a303f2b6daff790f7fcbe278e0b6a3b578e8718bc26d16b6800dc9fd5237c7aa2c2d4d1b3767e6b9475b6940df9ea96 SHA512 0845145b7785c70f1e059ffc2de00ea76c18009e24672074f536d40bd13f4a46a35211bd3c53a41667d4e386ed8836c71be53bf16b8ba69f63702dbbfea0f006
-EBUILD grantleetheme-17.12.0.ebuild 737 BLAKE2B c1877e6b696ea941198661eca89fa8031f048308ffba2bfa33b95fdafd7870e004de186c1c87b356afe354741cce34d98506a473eabcbd7f7bc8728fb025f1b9 SHA512 78418dbfd55bfd7e75c81892bc4a86c99ca099c9aed136c59099d7b16cf7f8b3834fc80a2c00af4d3e1f944e8273545bf598ad130848264eeccff42e71e1b874
+EBUILD grantleetheme-17.12.1.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-17.12.0.ebuild b/kde-apps/grantleetheme/grantleetheme-17.12.0.ebuild
deleted file mode 100644
index c718b8c04ec0..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild b/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild
new file mode 100644
index 000000000000..605753b034bb
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for Grantlee plugins"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+# fails if package not already installed
+RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 9036871b86fb..024abc8c3261 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-17.08.3.tar.xz 5909172 BLAKE2B 013660d574e6dfeeac5685f2af7c14536be02f4d77f008c9426cbd052be5086832d8399ca5bae7dcaad0b38c8b6a9f4bd08a63d91c2e4baf4c8d3c8346928550 SHA512 3961e331aefde8625943720e740e324a82fcd72e298a21d77e05b59b3f62681ed7af9c24343a9827e01454f050ec8f1631bd63c863ac3e6a2015df83a2c286ab
-DIST gwenview-17.12.0.tar.xz 6021388 BLAKE2B 25c6b677576ca75054ca1bcca042de1ba9617bd2836c9904d20ba55d44b6e05779c25e4418c8d23cad48d01b846aa978e1b3f6c644b989efe77994f85441e356 SHA512 cd724d0fe1ee6ddfb5e6fa91a75a9cf8b2361ec6c935049090ceee9e70df665e02a5dbd64036a57c3ed853f6e4be95fe2546db82dc6d667893cc19fd5744a628
+DIST gwenview-17.12.1.tar.xz 6021296 BLAKE2B 9e3ba61536ca92de76c474d71c09f8ef897efcc0d0ef11e8c06daefa85acf887121b565938e4887929edc45a36f8126f40902772568c414394aeaa307f924cae SHA512 cc436e6fb99fa41f58c7f93856c1ce2abcbcfb986cb45705fdf34b85dd85b27a0c0c7cdf7b2df06694a271ba3119a6f5b933b90346c4f1fb8668e12df78137f8
 EBUILD gwenview-17.08.3.ebuild 2340 BLAKE2B e01c1fdc5d3f82b0cc9244a84a9fb65e3abaffea8dfa7a417efda19baf3312a05b57f5e70677f25079338122c05f78391402583039451e4834a127703c27a658 SHA512 46a859a892b704a107c0a3b64c5d721203882dc18be51cc9b0f794fed15b7bd60a9acf43c5479783b08ba9e9670f8673d1f5f561f1ca2f7d9ee662154d99ed50
-EBUILD gwenview-17.12.0.ebuild 2422 BLAKE2B a6a8dfaa39c14ba358d31baf087669851eea367c8ea6f00c19b924f084cd13693327bf3baec13c1691e5e977bfd98372c4a304220d8ae90fd2166780d99e3a53 SHA512 0de853849d499eac63b254d3149e27a033103b91b3d175ae06b54b1380051d8b8f42c96faa33b09d9da8e790d7605dbf0b5ef2bb8210bf44ea381c256cb3b585
+EBUILD gwenview-17.12.1.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
 MISC metadata.xml 423 BLAKE2B 2e0463d65a7476da0e5a28420f235108b3367b9adfcda7fc2d47c1a5ae0e7f1ca49859d7ac213e3434c7d846c78af041d90da5767bf68e24be5a3e8eb80ad37b SHA512 19d70c59c116bfff13a062076e18d094d77ff06e30a01cc2c1439d464439616f2b758a250ff45c5a792926800906f1de8588a752317b7272e3a1223e543ff680
diff --git a/kde-apps/gwenview/gwenview-17.12.0.ebuild b/kde-apps/gwenview/gwenview-17.12.0.ebuild
deleted file mode 100644
index b7bd265801a6..000000000000
--- a/kde-apps/gwenview/gwenview-17.12.0.ebuild
+++ /dev/null
@@ -1,99 +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="true"
-inherit kde5
-
-DESCRIPTION="KDE image viewer"
-HOMEPAGE="
-	https://www.kde.org/applications/graphics/gwenview/
-	https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="fits kipi raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kimageformats)
-	$(add_qt_dep qtimageformats)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
-	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
-	fi
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
-	fi
-
-	if use kipi && ! has_version media-plugins/kipi-plugins ; then
-		elog "Plugins for the KIPI interface can be found in media-plugins/kipi-plugins"
-	fi
-}
diff --git a/kde-apps/gwenview/gwenview-17.12.1.ebuild b/kde-apps/gwenview/gwenview-17.12.1.ebuild
new file mode 100644
index 000000000000..87a4835bbcaf
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-17.12.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE image viewer"
+HOMEPAGE="
+	https://www.kde.org/applications/graphics/gwenview/
+	https://userbase.kde.org/Gwenview
+"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="fits kipi raw semantic-desktop X"
+
+# requires running environment
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	fits? ( sci-libs/cfitsio )
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kimageformats)
+	$(add_qt_dep qtimageformats)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fits CFitsio)
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	if use semantic-desktop; then
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
+	else
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+	fi
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version kde-apps/svgpart:${SLOT} ; then
+		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+	fi
+
+	if use kipi && ! has_version media-plugins/kipi-plugins ; then
+		elog "Plugins for the KIPI interface can be found in media-plugins/kipi-plugins"
+	fi
+}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index dd71ad51c1fa..a98658bfebbb 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-17.08.3.tar.xz 518168 BLAKE2B ab2e87bb3a32da79106cadce073f71f41dd0a7b0d1cbe25176ca27d05887430a8c68d17ca0744899fe63b0936f168495ce8d5b13762289a280f941bd844221bf SHA512 51c641c91a783dac7c25d857b19cc2579fa36f79f0660d2bc41af91b6a5d23478b4b722a412477b5716be836fa708a2c149e97cd42aa6965a360b9e3d7cd2514
-DIST incidenceeditor-17.12.0.tar.xz 518272 BLAKE2B e1fa2092f1ebb72d63ea5938f3178e50a134b7bc1193ebe496e0815e4a54ab19085447c713c3a1a1fef82f105f0ae1e2037f003ea46b740dfc6bf69ea8e4a539 SHA512 daa56a1951176836a661c124a6b22b3b585a10118537e6d92750048e4dc1843fb807fd4ea0182a4713755a7895421733a12a2a8f7b22e3c063b39768269766e1
+DIST incidenceeditor-17.12.1.tar.xz 518252 BLAKE2B 6a1627b6dd134c97147938e3504f4b8e280666882a71e3c131a6127628bfc8ba18ce0e944647b2e8847b77b39d894f8570b71b161c9e50b9589d55d4f0d5dc52 SHA512 1776a4ab785da9e17293786325ab0cb206f7d7547d9219db51a95dff42d5cb6c2c3de796dfd6c1746b5d2d63cb97ec1ece03de5db29fb4dd320518c57abe5c0c
 EBUILD incidenceeditor-17.08.3.ebuild 1441 BLAKE2B 2c3b9c9327561562c6026f6d3370957f88b71461f03705fad928a25ebcd5c12d90677afc282d9fe553bbc9bc96e5b07bc653f28659383868bdaba97abfb95aa6 SHA512 20a9e6ef111f7de5b65df4aaf070823fedf6f80bce3182bce805c881a1da536f59d789a29c1b70d04d3c538eefb47d27935290d61569fb4376f9f55c433bce3e
-EBUILD incidenceeditor-17.12.0.ebuild 1395 BLAKE2B 4d619a168d76ff1627169f84108cda22b31b351d6e2b2c6739f6eb7890971ec782050a41b797a98286a4883ea39d79fc306134e0b8084c9263b184c64d61aac5 SHA512 ecfbc19d697fc9c1700debfa52e66a34a829a797d43ffa9f404e879e6d06c9e44c074ac4d4109e43761b6189d81ab6f73ab1d09ae25f3e4bbdde251e43265761
+EBUILD incidenceeditor-17.12.1.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-17.12.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-17.12.0.ebuild
deleted file mode 100644
index 95ec11221c19..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-17.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild
new file mode 100644
index 000000000000..8cdf4d1b3dc2
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild
@@ -0,0 +1,53 @@
+# 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="Incidence editor for korganizer"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 8a09905117d1..d927b96d1373 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-17.08.3.tar.xz 446096 BLAKE2B a43a44b1d8d7b3a7a347d5f383786d7b48fda65cfefb2f330402e8abfbde663b58b2131732dbd2ca2866a443fe6efb77d412db8cce6e656ad50ebc53019f2542 SHA512 888d260ac707c7f39740840d2aef1e10ceba1b8973fdf987e4f58da1e12c3c457e8c20a225517e5e7f6110ae907a7786425d3b2c3db0703df9912cb19a7f8f9a
-DIST juk-17.12.0.tar.xz 1868100 BLAKE2B 56dfb5c2b7c6b065b24b71198978a1c1e099d83910dd8660543f1dd17bc9ad2e4de94a02651a3923dc17902621c5d8fdd68686670675f255774845e5aa704dd8 SHA512 db18529589df670bb3ff669fcf842d4027ade67786b214338e762d6d087e8c02a5afac2e908010bd5229926c722a3441c00909c3c0dfa748d0a0de345a9649a2
+DIST juk-17.12.1.tar.xz 1868340 BLAKE2B fca369a89fc1f8b71a5ab8cdcb05cea702cf04606edc8ef87cd3f8bfad794de205b1218e0dd8a41953e584c94646761acb67dee59569f5e476fff8d2da809f6b SHA512 3fa76b768d75bd19246f776895030b870f4ca5c776bbc843898ed64cd76ae5904a0c6268ff1a77c92763a11ac5e7e87797354df6e8ffd086163b6ccb12747f4d
 EBUILD juk-17.08.3.ebuild 558 BLAKE2B b8007bcf8fa7ffa74c195030fcf6eb1ec13ab608b3494e981abc0d1181aa5783551b17f2fa14ce156991996ddf2ee56dd92fcee70893e4d7d8f9cd545b06e45b SHA512 0eb436664d5e10e9f99d6e85340c0212391b9d48b3af03b983e7980ff8609095d5e577f0eebd4f95c1d1a0afe4148fe341e52818852c2607181bc5a15430439c
-EBUILD juk-17.12.0.ebuild 997 BLAKE2B 539bfd65f54b3bdd33e520fa5fafe6e6a10f2e177a25956b54d1152807c0ea4f1e667fc31fba4d284e04cd1560f9e0cd8d4a1fe30d647c53b958f238d83b76ad SHA512 a0bc611ef283d1d82aa545a2ba433e5b1e270491380ab46cb49d035b608219bbc36b44b8e9bff1c11ba8ebf2005792d7bb95b082e8e28a4add955c4d122a08d4
+EBUILD juk-17.12.1.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-17.12.0.ebuild b/kde-apps/juk/juk-17.12.0.ebuild
deleted file mode 100644
index 50fdcffbee5a..000000000000
--- a/kde-apps/juk/juk-17.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.6
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/juk/juk-17.12.1.ebuild b/kde-apps/juk/juk-17.12.1.ebuild
new file mode 100644
index 000000000000..b5a9daf6e7f6
--- /dev/null
+++ b/kde-apps/juk/juk-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# 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="Jukebox and music manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	>=media-libs/taglib-1.6
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 6dcea702e148..75d1e5cc50a5 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-17.08.3.tar.xz 10565760 BLAKE2B 75d98ab39ff4691baadc1c8a26f635981d7bb086c154a7c4e06dda79d4756f781c76b126838d3b0ea141f98750df09dd16a5dd9978340eedd1dc3a7acff45ed3 SHA512 91038cc862bdebad1cfa843e8688a71494140cdf59fc8f9815a6e6eef2dca40b94ee7d0a8e7c6b277004ff0945431bb7873113e6e7fc5649b8120ef03b1564ba
-DIST k3b-17.12.0.tar.xz 10574540 BLAKE2B 10713f203d4de6dc572cb2379429fddc2e919733920ce4d179506127ddbf4d34e39694b3d656aefb8589b0f5b0ecca7f4d6a8aee455296b92d39d072163d0edb SHA512 8832bb5d3aa3068e355b57406ba81e559606a82b7df0c9253ca5924fc120f421b54126489a0fca25d8c5e49b8e426be88bf7a1ad146c784d8553ea34c5385d9c
+DIST k3b-17.12.1.tar.xz 10575632 BLAKE2B 41c8703c8792240335037a134114713e3727c992fb595d2e791bba5b2325da85687896c6517ab482c78c69ca2576ffeca3beaa8881fd2fcf719ce980ede96820 SHA512 ab778d992f07ecb6a2626b815e5d1d91c814f2d15b59fa976a0008e08dc6479a2fc8d6a30036d7c2a64ecf884d01be0d4e2be74e6479ce35350813448a903773
 EBUILD k3b-17.08.3.ebuild 3407 BLAKE2B c886597e80d59e1dc5ea7b8f76a95f2f52b970aaee28eb552a8653943bb376374ea505a89d21d1f397b0064daae1fd66752155cc423c5337d527797474468e43 SHA512 eb1ac09d344ac6eb4a1c2df12d47e8ca617c83ddde54a78d903407c0466330f016b02865e0e645291f7791cd32214372f1920f4f6e8fd81b19e158ad4c02b040
-EBUILD k3b-17.12.0.ebuild 3313 BLAKE2B c12e4845071ed3093a05800899082596689b4e0deac2ac15e595b82a056f4af19e88bdc01d3697b614714099d31916db654cb8baf792cef9591120c630cdf43d SHA512 8aeef2106f10562d5f139a442aeb727772b82694f236764bf2bf69eaf47619a2bc2e8d17b02614dd18a0c75ccbc2564eaa10b1807d1102d12841e31feef52100
+EBUILD k3b-17.12.1.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-17.12.0.ebuild b/kde-apps/k3b/k3b-17.12.0.ebuild
deleted file mode 100644
index 5dfc8883655d..000000000000
--- a/kde-apps/k3b/k3b-17.12.0.ebuild
+++ /dev/null
@@ -1,118 +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="true"
-inherit kde5
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata 'taglib?')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	dev-libs/libburn
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	emovix? ( media-video/emovix )
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/k3b/k3b-17.12.1.ebuild b/kde-apps/k3b/k3b-17.12.1.ebuild
new file mode 100644
index 000000000000..33ccd3437be8
--- /dev/null
+++ b/kde-apps/k3b/k3b-17.12.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/K3b"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata 'taglib?')
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	mp3? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	dev-libs/libburn
+	media-sound/cdparanoia
+	virtual/cdrtools
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	emovix? ( media-video/emovix )
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+REQUIRED_USE="
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		-DK3B_DEBUG=$(usex debug)
+		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
+		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
+		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
+		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
+		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
+		-DK3B_ENABLE_TAGLIB=$(usex taglib)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	echo
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on optical device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index fd9fe8a6bcf2..3e3fc894b417 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-17.08.3.tar.xz 69016 BLAKE2B a94d70053620bc41ab094b071d9cc33eb620bda4c99f3e9ea998174a7379a644a012f6ae5e00f0aad3ccdbdc7ca9805a381fbfc0038bb67d1c1eba2af27dfcf9 SHA512 00210737f43b7d4808bafd1899630989ece2ef65e23e0849717fa8fb2cd93881099fe670591025f44b8d901130e6ee0a2843af40f49c6ee7adbcec6cf163aa55
-DIST kaccounts-integration-17.12.0.tar.xz 70848 BLAKE2B c6da23a769265c7733a3d156ff38a8ad3308e392b8017ccc095ea93c04c2ae693fd45f187f819754045aeb9fa337982163601188e06bfd995c5207cd7d735dbe SHA512 378a2bb3edb168852026a229a072a720a35efef0ec7547297a9da0f8df3f59b5464de66709796c7893c3f549fdd372cd16e4bc3efc156fc0924a16637425e4e3
+DIST kaccounts-integration-17.12.1.tar.xz 71364 BLAKE2B e2a3e541079c77a58200d66e597c883ea48cea58016bcafad3dbc38dd33e7fa4120bfc316bf6912c509aa985d2e8de86a45ce46829cc5f12976e95babb43dcc1 SHA512 c167786079f55f29b74757fd84669ec2678ea1d1639e333be74cd66bb1a9aec2d6ab52dd68f22d5675e6562115b7a266f813e7b5a2dacc6303af8c5d66c44c34
 EBUILD kaccounts-integration-17.08.3.ebuild 860 BLAKE2B e4b808ffe29009cd5f00b1b8903b1f5b99642c482496837e97dab90e9063275805361b444c48254374faeb8e1a3fcd543bd89bef0365fb177227d39d9e5253ce SHA512 744a162133fd83bf597e72b507a36dfcefe003666d6d71f62680ee76b2dd1c69da6db0896c0ca9bf97f69bd586bab76f6b036cfb113425feb0c267d588eb5a81
-EBUILD kaccounts-integration-17.12.0.ebuild 862 BLAKE2B 7aeb87609568e154c2683b2a0730cb63c67e8976fb24151937f64b9e21899e121822fa95ab6221bb0fa651df7794ed22bad7118fb468a2af491a97a3fb61bf55 SHA512 73b6b97d1dff0617a4ad937f6dbd0896c810fb79bf0dc19265a609c102a18dfd85cc6636009bdc999fe8409e71d135d206cc84af37fa3ad5000e9f862acf20ef
+EBUILD kaccounts-integration-17.12.1.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.0.ebuild
deleted file mode 100644
index ffa2bd529195..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.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
-
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21
-	net-libs/signond
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_plasma_dep kde-cli-tools)
-	sys-devel/gettext
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild
new file mode 100644
index 000000000000..d30f9c20dd11
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	>=net-libs/libaccounts-glib-1.21
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_plasma_dep kde-cli-tools)
+	sys-devel/gettext
+"
+
+# bug #549444
+RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 9ae8c8380bf2..11fb9a4e0b63 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-17.08.3.tar.xz 31924 BLAKE2B 5016ce8a614fecda734da661a74ddf2a0c24f687fc53546870429cd5f683ab3201da5e3a57d04f2be660101ceb7584ee44da2f16a9cf04abafcd49d7a3bf38c5 SHA512 75248f6e3cae47cb6587895724a52dd38d4ebf88995b937506be992399740ac89cb0bf7a64a3769d18200b96968ef4b7c3b3f281b539bde86dee331639473570
-DIST kaccounts-providers-17.12.0.tar.xz 31864 BLAKE2B a59e7215bf63cf74e30923c986907a12f0599fa2767095901f51197cb4ff4f105dbda3a4dc12b226bbc7c8cb1790f9fad839de135adf50c8b14d900e2e28e4f8 SHA512 8dbc3061f131db2491eb028461bd7a14aa7777fd1dfac9ff6d10a4d4a49a093b2e536ffc2acdc1324a7fbe04c4664820141394832cc9efd0836e31e33523b9e5
+DIST kaccounts-providers-17.12.1.tar.xz 31944 BLAKE2B 54772fe2dd438f7d0d803a9744a11fa26f66fe162b0dffc2336d10969778f9c906efc406c3429a23c6a0a9f60f694a3c189ed57d0585576224cb7072d4302a1a SHA512 ed204c6783299ffa3554c3052a79ae26541e9ae9050d9425d9b91ff6e6f562ad5b8a524a08f93f26d6e6f5a95d9bc2f0e3028ff1d6984a58a1e35f155c4267c9
 EBUILD kaccounts-providers-17.08.3.ebuild 666 BLAKE2B c665c86535d7fbb59af224b51580abb79fc7940fb1c9da3bfb00dfa1b73ad80da5fc7eddd6deec5ce2d0de4497309e4e3835fc1ea1b9361fc3eb4698be87dcdf SHA512 57a53d7128527bc5d4b0bc4e729e327aefd25496fa2e93dba4eba8cae8cae8130f713feabfb7728a938fa29658a718ca2590e64137feeac3c1cd8922f9ffde91
-EBUILD kaccounts-providers-17.12.0.ebuild 668 BLAKE2B 85f3e9c22a29464cebd9978e37291e68e594d9fddee43f4391ef925ccec50d8cb102e2c3ab80ec99ef3405da09c679be2e4ee62431242b5131f499c6cead3135 SHA512 0c42bcd99c0872fef48c2eb730f2f2983a6fd7593477b8d0d50035f0646df809e4085e875a88635a4a289796a08a59090a10cdbed809acfcc0bb276e017f6a31
+EBUILD kaccounts-providers-17.12.1.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.0.ebuild
deleted file mode 100644
index e23feaba157c..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/signon-ui
-	net-libs/signon-oauth2
-"
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild
new file mode 100644
index 000000000000..da4738ab4dba
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE accounts providers"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/signon-ui
+	net-libs/signon-oauth2
+"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 34d323368a38..b3e54e4013b6 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-17.08.3.tar.xz 546868 BLAKE2B f6394c2bd27429ff8cf302c05f27757bd03ef310479fab9cf589d8a265e9f773d488aa0cb792cff93b6fbdbd16a19ed5e585f2aaabc7af25cab72186c1eef24d SHA512 baffd3f377dc33cc4bc3402f4f814f630efa1b152e2cfe02698cb0d2237011f7b3fa1c7ceff0eb83b5a10ef2ef038f5fa89a07609db8e009da2df3f080903757
-DIST kaddressbook-17.12.0.tar.xz 546800 BLAKE2B f9c6fd3c8ce7c6fb70eac98a380e5d21ede87519ac12ec34118470ee7b3160289126dea0992ec5c8113ccd0cab0f0c5446c6a27b3929cf6b8ae6878635ff9fc0 SHA512 17156dc2663649a9ae6c849215a52a3c0f0edec67047b254e1ea319a3afd9295f62f19b5b253671049dd6d6a05aea633ba1d02532246925fc089240ba397c5c8
+DIST kaddressbook-17.12.1.tar.xz 546856 BLAKE2B 690574b4f655ad71f26ea8d946ee619f4e49ae04e36ebe852e62fd7eb329d047d55808217beac9924a2dc39d04cf6dbcaab9204f06dfc4520244adc914600230 SHA512 efb9c3e51e5bab149518dacd64d1e96d5fedab79941b540e2934f19a52fd18f003e315a805db1c0bd5484ca916eac4bb7aecda7959511da17b8ecfa144f45534
 EBUILD kaddressbook-17.08.3.ebuild 1717 BLAKE2B a760be2a7930bb9f80e7739075b760a012a5605c31fa8334cf1992b03868c07cb66ec7d2fcb2c44c6a23fd56493610a4e513dc6b874d5718842f532d65d1f080 SHA512 6b347d5fa2f00a4876fa6ab3528368c6507894a7718d532edf453dbe582b1e5ab144156bc05b1eeda1ceb31d277f79f5669301c6c540473710917a4cbcf6d73d
-EBUILD kaddressbook-17.12.0.ebuild 1708 BLAKE2B a5609c9336b26e27ae51d420ccfaa0e5e3f3eef471960694202efb9cb05b5c7f56f5263337f25cf0f25693ae5ce2d53d816dbe280cbd209bc9d5f1aeec89fe4f SHA512 2ba3d7489eb6a7e1622d8cc0f5e0c2898e01f47957d6b8f7ba71d768622402526efe822a2e0519ebd39c627bbe3fb8f6f6f03c321a35de9fbf3dbe2895da5665
+EBUILD kaddressbook-17.12.1.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-17.12.0.ebuild b/kde-apps/kaddressbook/kaddressbook-17.12.0.ebuild
deleted file mode 100644
index 3d460e8ae4c5..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-17.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
diff --git a/kde-apps/kaddressbook/kaddressbook-17.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-17.12.1.ebuild
new file mode 100644
index 000000000000..23715c549f96
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-17.12.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" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index e87c72f3cd2b..40db1a6413de 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-17.08.3.tar.xz 4239184 BLAKE2B 5e8db5a3f11f8f820a9aea7ae587e703e21cee34816cc56980cf499ad5e411dcf90cf738b0d0ef2d8267639ffa4988a31c0b9fe87351a29c8898da96e7560288 SHA512 e4e595988da98cd2f7dbf089c8c29a88e1df57bfaab98e8efddcc0e69ea5c7cfd74c7557661e6b6b86649ebb8a487c6609a05e16a7fcd272048140ff22389402
-DIST kajongg-17.12.0.tar.xz 4239560 BLAKE2B 7f05519d7aae46a9eba15514903e87dc903379612376ae505905a5cda92a6131d288c9d2cc2b328bbf35d4e29dd410b15ae0b563ac449eca00398a31b4f31a16 SHA512 3f48d29bc29d6a8c9960bf38505a363c0666ea811dd09e7d981478b41830f29fe6d9f388e86a6fafd8468417318987691a76e1e11573c1c1623c8bbbe6ba1edd
+DIST kajongg-17.12.1.tar.xz 4239736 BLAKE2B 8de212ebcbd4ce24124d1b7904bd33fe7a737ebfbb8352f464341bd0d138a395d3cb8aa631df79e140bfdbd250bd35339732856f4f76b2d345be42421e885126 SHA512 beddcd6be75b022d6209d91337cddefdd6b8734b6d8bd7eeb1585544bb5f204a119904016f12e2c6cabbfed46b3b5d8d46ee7e82e3efe31e90712d0a07f00d01
 EBUILD kajongg-17.08.3.ebuild 1280 BLAKE2B 71be5379c4b9728a7f2b11dd1d9c0d3f7bcf179dff181618e276aa0659027cf57c76ee29a8fc1a111a199934fa23a43cb206ed2f9c82f1353aeb19e8c040431e SHA512 9db9c9c1c2493f36f1a450195b1687797bc20dc798d155550439228625610523a870caa3709b6d1e2cb53c5700dd1fe754ce5fc4bd532f76cca81627ef6177a0
-EBUILD kajongg-17.12.0.ebuild 1282 BLAKE2B 97b82e79df397278e15eeb43db2e26a81695267f00809577704890d715ac20d1bf047906f291fe594cab4f715278761133d2973eb890352b7c5f76c123865bfc SHA512 9966c8744054f85cb7945414f2e70f26f0da81dce463bbe336e6d16f46b2b6121c74025e972b788f3d5b72b3313cae86998b8c8203985b14b22baeb527238f72
+EBUILD kajongg-17.12.1.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-17.12.0.ebuild b/kde-apps/kajongg/kajongg-17.12.0.ebuild
deleted file mode 100644
index 9a3e1409230a..000000000000
--- a/kde-apps/kajongg/kajongg-17.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	dev-db/sqlite:3
-	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep libkmahjongg)
-	!kde-apps/kajongg:4
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	kde5_src_prepare
-	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-	kde5_src_install
-	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-	fperms a+x /usr/share/kajongg/kajongg{,server}.py
-}
diff --git a/kde-apps/kajongg/kajongg-17.12.1.ebuild b/kde-apps/kajongg/kajongg-17.12.1.ebuild
new file mode 100644
index 000000000000..1c531f3048e1
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-17.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{5,6} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	dev-db/sqlite:3
+	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep libkmahjongg)
+	!kde-apps/kajongg:4
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	kde5_src_prepare
+	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
+}
+
+src_install() {
+	kde5_src_install
+	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
+	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+	fperms a+x /usr/share/kajongg/kajongg{,server}.py
+}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 313f1a369729..4d222ae3f93d 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-17.08.3.tar.xz 1823924 BLAKE2B 1b4528ede1e8e2be77a6b52a2bfd9b7e627f6328196803714aeb22b62266ed113689ffbd07432cc3137188f989fc9d3e1c3ba5f505da95bac7a76d7da2931ad7 SHA512 827c2eeef667d42fc691fba0fd6d458fa245eb5fb9e6abb1926137c5e1a66bf309e0e9739cd9fb62f95a14d7f46f96f2ad864434edb1e8bbcccbf8172a5f4b6e
-DIST kalarm-17.12.0.tar.xz 1798344 BLAKE2B 23d23342cd42aec864f5592f7ee80a9196128018971ee1abc0072c5a47e06476afc27944e158b335294d0ffd1f6412ac650373d5accdd6842d9e4569c90a214b SHA512 5b9b34595b5c7105c3da6a7b4eaee9eab765ceb57a44f9d5417f50dabf4dccea17f2faf85d7b4b523cb6344b88bf4a1a1b1ceeb628db5fe2a012765ea24319bc
+DIST kalarm-17.12.1.tar.xz 1798540 BLAKE2B f439e46d444d12aed10d4d2d96077e84ecc6ba285c4396be200fd5ff8206278310eb0377e4db2ba328f4177b931f076f5c0939d672f2dde45c5483de25529dd3 SHA512 f2b2f1f4477359d66f8974b76f4cd612666e129b73b0179fbfee94805e31661392526926e57710427402709d0a0fe22a1c726576f8ba37afa2a09e29e67ea8a2
 EBUILD kalarm-17.08.3.ebuild 2059 BLAKE2B 4f40a1bbf57efc88bdd5973fff2c490c009ec3bddcf6ccd2a41254b76154a5da6a5425073d6b94752c968fa8429ab9b5f10941576f596f656f868fefa80af80e SHA512 a6423d092ab9a21288bfa1957d3b77236a57134fb354781aca0938749befe8ed03606ab29859896637fbbc8c222c6f63025f34dc0357038267e62512805f1e09
-EBUILD kalarm-17.12.0.ebuild 2061 BLAKE2B 96f9d507031410355a37c5d9c05de8aadf5656609fd64d3e25e7200bacc570240a021cea8b7aa724188afd2ca0093693e110bd9faac70ad42b35c71f55f00b7c SHA512 fc5af320303e27996df45a16bc9111bd84ed36fc104e3744d101c5f2ec68f5fe9f4acccafd180135e696fc31370aaec80155293fda86d924d5b3a89846e20ccc
+EBUILD kalarm-17.12.1.ebuild 2061 BLAKE2B b72d4d000ead2afe4776ff9cca04da556270c6f6e1261195802ce227d8c92ccea32096d2beccf427dbf7ea67283e3e1e388b8ea558c2ed3cf75ded7379414b5e SHA512 77b450403542788429db7a1760f7c17c356e509823ea688dfbdbe904c92b625b37af1c90395286828be0b806d16a3bd26ad96f4c71b743091beeb2df1fa7eac2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-17.12.0.ebuild b/kde-apps/kalarm/kalarm-17.12.0.ebuild
deleted file mode 100644
index 91a4ec464784..000000000000
--- a/kde-apps/kalarm/kalarm-17.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-17.12.1.ebuild b/kde-apps/kalarm/kalarm-17.12.1.ebuild
new file mode 100644
index 000000000000..e60f652d848d
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-17.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE+=" https://userbase.kde.org/KAlarm"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 9a042d1f81e9..daa1ca9b492c 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-17.08.3.tar.xz 493312 BLAKE2B 81424df85dbb8fc22d7b33e70dd97f8994b3476d199dbec303e92b04ee96f5b3a8c3d77d785a636b472fd1f0cff23fa69d5f0f6b2657f74d4b13c2619ecb8cc6 SHA512 685501eb7afceed63598d6a2cb9642b9d902d3c331f46943ed2fa708cd24e857a13a7055261f23389aa0dfa0ae02c5a71dc6d1ca41af8f30339a28b62e19e5ea
-DIST kalarmcal-17.12.0.tar.xz 494920 BLAKE2B c8d48a6dd34d315ebf3bb60a368879e45b91aad55e1cd655438f9896840b79655a2636f81455f6481cc3b6fa7f1a35588af217497490b3f3bd56259fba94aff6 SHA512 e0e3ef6e358f701471b7846710ca2ce77aa39a48b13d4478eb54902c27aba89d44727070582bfdd984e3eac060d13889109ef0a338b6e76072424805587354a4
+DIST kalarmcal-17.12.1.tar.xz 494996 BLAKE2B 1dcefb1c94618a546fd4354ca6043ea50f9af45dccfff04e4f18147ec20a575b7c063ed7a35900da07d9b49e01a6ed8c7206f5077acb48dc43c08dd0d2dd3348 SHA512 b7c264787ddfd317558d3091a733131655f32d7123a86df17750ef37bc9685c550123dc2c6ca1fe967d9e2ec467af701218465646a3a25cb5e18117539411d92
 EBUILD kalarmcal-17.08.3.ebuild 534 BLAKE2B cbf42a858be460a9f1fab08e5329c8bd54d78b8971d6782e893d5800e6de21b03c8f48859928ac49522799b3632ac810ae46cb4fe173ed91c6e752c72e7e5582 SHA512 f77b901f5b12bcd90f0ba3ae5967663b93cf205c23d3811f254e7690f5595e64276efc382d9fd69e4021e4852f3d729f1598a9be88020b2fbecd22cb89f7a9b5
-EBUILD kalarmcal-17.12.0.ebuild 536 BLAKE2B 01e05cf2931b8c0633d7c759d3445466423c950876b4666a2badf8e9452a89ab64bc46f607ab62480fec2514cd3bbcacd7b9fdeab474dac1e0972e4457f8957e SHA512 c7851e3a1465986eea0ffdf2bc61bcb21977c0ea52efd051be6f6b3bd61b132f61a544af1f449f10dae3707f3d151b975506de38e01ac8201339204eb84e164f
+EBUILD kalarmcal-17.12.1.ebuild 536 BLAKE2B 540ac4a3c6a3a125e7582d728870c627a8e57c8b278d096d9f672c05cf42cc881f0e8619346219d2b5a43bdd53b807645a4dc88907c3974ebbf9bae3e2976c46 SHA512 5c870a341275612720e765a99803e3e0e0c1759ffd325812bd47d8505f516107a886e569d3726027994627e7665034b4d49c9d27b075f71cb3a7bc85e3b2cfd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.0.ebuild b/kde-apps/kalarmcal/kalarmcal-17.12.0.ebuild
deleted file mode 100644
index 1fbcfd584ec7..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.1.ebuild b/kde-apps/kalarmcal/kalarmcal-17.12.1.ebuild
new file mode 100644
index 000000000000..1fd6cb9486c6
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index eca38dcde43c..346e33d59c43 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-17.08.3.tar.xz 689240 BLAKE2B b9aed304991578b662bc56d82db1f943cb81b0496a914e30756bd717c1885f31df9f65b3709960c8adfb118eef424ef7a500fe3ead7a5b5d4cdfde0a8db74403 SHA512 a6955e612c72e16badd32f30bff55f0f8dca818acfa633fc9c706781267c35cfc5857415b35134e7a2eb89d7bb9ae1bf045c1c145616cefd8f38dbccdd5c2fb2
-DIST kalgebra-17.12.0.tar.xz 690572 BLAKE2B a2120f7b0316de7cb6a57081e8bb32c91455a5cacee14aa4d1ac71dc2615b17835126dbb366c62bdbc62ea56785801fda55257329b9deaa381bb0825f394cdc8 SHA512 dc5dc2e5979ecc57d7775ec9245c0dfb9e0b4adebccba2e115a7eca5834f3eab8d1c66122f187b8f61f6712c6b262dbbd722d030f90636e40ecc603799cd65bf
+DIST kalgebra-17.12.1.tar.xz 690544 BLAKE2B 1fe55c5a055cb374e87e94dca68ed810449073d01e45cb1ddfa5b17e658943a495570545601e9758ceb9cdd68c32689d276d5e4e9eb805b081bec2e370515289 SHA512 7b4f281e2fe7cb30ea323eedb0ee1ddf934c49cfefc78cc3fd3563ab263d89bc2cb2213281f9ffadfff31c54e44b98fadae852707d04f64e530f066031c6bea2
 EBUILD kalgebra-17.08.3.ebuild 1007 BLAKE2B 9a71bd6ddf9b8f7179484f909a7613c46fe75dd2a67feff3ebe6aa7c22449d35dc212825c18477336c1ccb5b8dba1d112227a9a309b29015f03ab3a1f6dab998 SHA512 61a6673e6c1fa2407a823ddff193e47b9940d8752424e117fed097b6d7de97921d66306f30f127fb388dd68467991acbc45e98cdb5228ce58c5238e18102cedf
-EBUILD kalgebra-17.12.0.ebuild 1009 BLAKE2B 3406620f5cbb71f1b0b987cd8786248ee120572a6f8f4d4003e6ccb6ac950fe95ce159b27edad6a1f6714860dbfb61607881f438e7a6aa96abac2e90ac247f1b SHA512 e3422afa7620be69421a0e2f623d73a307c1f25ab4ab1bfbe027362c1dd1499e44dc0c8a09b8f1fbea405509ea32080f0d92cc38961b3a5b7bba0d5d3a86bea1
+EBUILD kalgebra-17.12.1.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-17.12.0.ebuild b/kde-apps/kalgebra/kalgebra-17.12.0.ebuild
deleted file mode 100644
index b85ec6b67cec..000000000000
--- a/kde-apps/kalgebra/kalgebra-17.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="MathML-based graph calculator by KDE"
-HOMEPAGE="https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
-KEYWORDS="~amd64 ~x86"
-IUSE="readline"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep analitza)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols)
-	!kde-apps/analitza:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package readline Readline)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalgebra/kalgebra-17.12.1.ebuild b/kde-apps/kalgebra/kalgebra-17.12.1.ebuild
new file mode 100644
index 000000000000..8cdb5cfa3a59
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-17.12.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_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="MathML-based graph calculator by KDE"
+HOMEPAGE="https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
+KEYWORDS="~amd64 ~x86"
+IUSE="readline"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep analitza)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols)
+	!kde-apps/analitza:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package readline Readline)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index b719248ccd53..2bbd03ac7c62 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-17.08.3.tar.xz 24450828 BLAKE2B 2586dd46a0847e6ef7becb5773e6b32f67bc24e3d91166287fd6df10c498eaeb0f8d2ba777d951db3226b47b2a94a7ef1e01a5623ee7c3c89ee6f035ae3567f5 SHA512 a421091154d9de89ce70c79b093e716c925c6573958bb8b3f02279d890d0c7c7dbf91ff3ee455688df6628059804a377d571bb8b75a68748d1b9f4eb003b1dbe
-DIST kalzium-17.12.0.tar.xz 24450380 BLAKE2B 67697b46119f5f8e94ffd8783df128e8f21a1949105cb08c31b72d7882493186c52a86519903fe101ae3e3474f5bc37e33e918ce2ef1349856611f0c1aba8aaf SHA512 e0f4460d166cd92a875953fd43a71f736a5da482c8f811a14d143c5cb262e865214b3a9f1b5c1aa53813890fc949aeeb377bafc4f31c1fde6f684ecfb4901285
+DIST kalzium-17.12.1.tar.xz 24451344 BLAKE2B 0bd94b87dec53c37f170765e302e2b8cb948c8a4bd2203bc0ba293552f1dbabd4cf0d8668ab63d7b840b34e88692e539165cd946f2992929427cb89a0ef5bfa8 SHA512 35d5cdb803d261da248276746fea8eedf2eb16b62cfdde7320a6c1383b14b4b13654671e5775a1db00b533a645a98b1638f05009b661894554c6bd5539a4af50
 EBUILD kalzium-17.08.3.ebuild 1559 BLAKE2B 308da3c1790106361a169df03109b8f60666763e36f1d8d39fa3e094b402cad5ae4839195909237fca26f9899faee2bc63b6bf990fd1b65c21d4b306cafb4df5 SHA512 6a21f9fde13a7f7d36df5b99a70dc5c58f7e4c4b27e338b61117a72832fcc5fdd087f89e72b763265cd3b59f4b38dced9345a667d7ce47376e0c157e779cd02b
-EBUILD kalzium-17.12.0.ebuild 1561 BLAKE2B f9d7ff95e650171d396347acd2d456f5c1ced49a72a6795b520f907b66e261da713adb9756d637972bc48bd2a94c50b2bf8cadee0fe00ec7e9d87c9205631880 SHA512 5de9f7a1fccd2647f7ffb8405e17d332d6b29c98ab043a4657670c9f3072233c14d38de053e1e4132297fdee617efce8d30036f8213e282b433a358d61f30e3e
+EBUILD kalzium-17.12.1.ebuild 1561 BLAKE2B b056267968f93850bf53797a4dea44c96a1c91873a2776b5031ee0fa67c2ad9c15f5dbc976342fa53b191b42a52e62186260232ea4ea18b88e06a241fe3fb5ea SHA512 989687284fad983f81a731d2eb5a1f50dcead0587098e7ac85b1aae865457e050a089fb203d1ec2ff05a2a374bef2682bab26aeb5e27b28f357f779a2804e01d
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-17.12.0.ebuild b/kde-apps/kalzium/kalzium-17.12.0.ebuild
deleted file mode 100644
index 47095962e132..000000000000
--- a/kde-apps/kalzium/kalzium-17.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5 flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor solver"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editor? (
-		dev-cpp/eigen:3
-		|| ( sci-libs/avogadrolibs sci-chemistry/avogadro )
-		sci-chemistry/openbabel
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalzium/kalzium-17.12.1.ebuild b/kde-apps/kalzium/kalzium-17.12.1.ebuild
new file mode 100644
index 000000000000..ea7cedd67ed8
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-17.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editor? (
+		dev-cpp/eigen:3
+		|| ( sci-libs/avogadrolibs sci-chemistry/avogadro )
+		sci-chemistry/openbabel
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editor Eigen3)
+		$(cmake-utils_use_find_package editor AvogadroLibs)
+		$(cmake-utils_use_find_package editor OpenBabel2)
+		$(cmake-utils_use_find_package solver OCaml)
+		$(cmake-utils_use_find_package solver Libfacile)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 004582e1f82f..4e06e2fb452d 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-17.08.3.tar.xz 96768 BLAKE2B d017120056d84416c0dd6f7e22e3d3088d41d12e5b2a224405d6b7b9bada7a8166cf1a5db06734478849b8158d3123970b6de81ab17638f33cf524a9fa5e5966 SHA512 a3787502f4b100f9cdde63905ef22cd83699a861fa71105bad870f0f86c040151bf28d6e0049f61c98e5978460967126807e60ca2cacffc0147a1e4d6b5835ef
-DIST kamera-17.12.0.tar.xz 96672 BLAKE2B c5e5702f8dc8709b23e9f89c69c73c463e835348f4784a867e217939b9a2178786d720d40ccf60a1c6b213c1c1c556afb17f45bda2b1bc44fec70e1f75da85ea SHA512 7a39d889df4a7fa45d5d4e97c4303d8087eeefb9ddfe3e066871899ee50a013610dfe1732eeb29e72e03fdf05999ec2931e424708696a69f11fb004d363242ee
+DIST kamera-17.12.1.tar.xz 96648 BLAKE2B 2eaf3babb29efbc77119ed61d642b33a2d565759716aaf88ac60872c590e173fe6b3ee616673dc03265f6e0ae2c7bff304fd693ecfdd5fd6160d03bfd7e68731 SHA512 caea639b5377e918286f06d962f464b4f4b14988cce478b22d291b9419e1722ce3390dc986298f0a165defde833f765851fa7adb0cd23447715041fa4c3f01e2
 EBUILD kamera-17.08.3.ebuild 633 BLAKE2B b8fced90bf21fc47b47f56a516c517d5ff9f1b4ab25ca126b512f8c2802211752ad0a80c81f315551d038988b99aacc48affc8533557567b59041435e8f17605 SHA512 a6d30ea1d82c1af933a4cd687975176c2c69d9258563ed068deeb7649dde04b8f91bb741ca94730d7e900955e90023cb62ff4ece8b644fc9aca597ab836e12db
-EBUILD kamera-17.12.0.ebuild 635 BLAKE2B 89e63ea36fe689a2b2ff9287d44b565d1c2f9e40ad16d19321a5ffc0630cb16464777218869b0e3a6612307d211879dc6a7905aa0cb7b591d4a8b8551311c068 SHA512 cd4b3679f512274b75fcd7473a40c800ace3f0888ac9e2f763ba69111c3a06edcf8627cbfcb3c5cc5db7899093dc3fe910e446bd2b0a65da1c46dc938aa5512e
+EBUILD kamera-17.12.1.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-17.12.0.ebuild b/kde-apps/kamera/kamera-17.12.0.ebuild
deleted file mode 100644
index a6330e36e9c1..000000000000
--- a/kde-apps/kamera/kamera-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/kamera/kamera-17.12.1.ebuild b/kde-apps/kamera/kamera-17.12.1.ebuild
new file mode 100644
index 000000000000..8e527cf2d876
--- /dev/null
+++ b/kde-apps/kamera/kamera-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma integration for gphoto2 cameras"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libgphoto2:=
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 768949edb1f1..1280c8f3a8b6 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-17.08.3.tar.xz 7605188 BLAKE2B dc7f19f4b5f02588a6e8cedc3a075cd64efaf14e6283f173c1776363329d6091a18ad24883c2881f16241e8ba775a319b6bc3b4fd4b3dbfa107d7786f84c3b42 SHA512 8a1bb05f16c6b4fdaaed3957e20405ca47c26a8e1232fd65ec2beb47b5b7ebb19e671316f5cb07463f045255baacb89904d9d8713160d0cd0a7d6d7c192b2565
-DIST kanagram-17.12.0.tar.xz 7523644 BLAKE2B f1509184bbfd28f77d7f7b9943cda3a854157d96826574a149e372977577d1160b1111fc7bd4d287217675a64e24c87f8fbcc368ed52008175b8b347a09121bb SHA512 91d04ce8433dac57dcc7f888708e6c50481a4870933c1f50bbc3b96a060d0cad1a1f709170f08b4570646f8158e58ae1224981720cf06ae9a9d3ad2906bf74f2
+DIST kanagram-17.12.1.tar.xz 7523320 BLAKE2B 7e21b835db6f6795b4e2db7250173dfa9f286876db53deafbf449919f7c818e10dbc4be6e225dd47e2f8b781a22b677708b13fe655c57463711e262ab32e034a SHA512 0dbf117a066e4e28f74cf3343280e899d0107cad5f2f39f16bab609d571907bd878733a5a52e4f4954f921a86a2f88bc72206fcaa2f6088b4da65faffbb62b9a
 EBUILD kanagram-17.08.3.ebuild 1085 BLAKE2B 4cf052a0543b3135984642a8dd2228a1a00478bd75ddc7fe04eaa16fdc9d6e0b4974dfac98f22ce27ff92fa33da031f92c59bc23046a24c417a385a991334c05 SHA512 ee453a77e2637416e42cf096052fa1e98b1f100d961e1abdee8123bfef9f0dc50e09aa56b6cbb8904f96c6e168935479ff3600e891943ad16d328274a039af62
-EBUILD kanagram-17.12.0.ebuild 1087 BLAKE2B e5b027f669dfc3ee7602d68c1165478306085bdc104b14a6004fe393612eb967e3ade49567b25415d9a0a3b440b6aa906165b606c5faa8e758a40d0f00b0fcc9 SHA512 1e47a583d30988b6ddb56c9ba6df9fc29ab7a1e252fa873753e1adfa18026c7593709c60c21231a9c557c0fe9b4182a75026c9bb4745d90031630025cee99ca8
+EBUILD kanagram-17.12.1.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-17.12.0.ebuild b/kde-apps/kanagram/kanagram-17.12.0.ebuild
deleted file mode 100644
index 3386d6049bef..000000000000
--- a/kde-apps/kanagram/kanagram-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtmultimedia 'qml')
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-17.12.1.ebuild b/kde-apps/kanagram/kanagram-17.12.1.ebuild
new file mode 100644
index 000000000000..9899faffa5a1
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on anagrams of words"
+HOMEPAGE="https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtmultimedia 'qml')
+	$(add_qt_dep qtquickcontrols)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index a39f603a2340..f1c1d0db563a 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-17.08.3.tar.xz 2525132 BLAKE2B 08279014b3985ded7c824eb2f6d0ca9e33318ad3f9c35f3169a95c0d9dd4e5bbc8d3a425d1d6c8df0caa60b0d1d282b4162ef875641e574b48738247a8f4bf04 SHA512 6b173e116832123b900c71b6611ef1e268143799217d64d5d6204d4ba88845662509fa482ca69fbb6f135c5f708071683f0302b187499939c6e08964c1a706b5
-DIST kapman-17.12.0.tar.xz 2525244 BLAKE2B db32edf79f24d4715aae52efe256fdeda4b9f0a049c56806db43579e9bfb639bf82564e5788b6c3e28cac9a5e1ec356ec75eac6df702292fc3c5e8367e46cce6 SHA512 b01b071feffa15fa05c1b4fadf006ff9933a6c7f4cf4b432a81d09da0de62240a1faea318f9c3ca0cb6d3ea37ed86edf093c404e81df6ae2bdf652cb9d604a37
+DIST kapman-17.12.1.tar.xz 2525160 BLAKE2B e44e7fa58ee40fcbd5193c49d7f211258f70af246458d284dff3f508ca08a409d8f925efc1d6427571ac30c01d7346244375cb16c096f98c590255598b2f118f SHA512 99b70637ce6d71efa5dc6fc345080ea5a4451fff61006f52bb25f0fe90a30f4f00cd895bd8d8a88411f9a71c4216a56795938f2aaf3c43cb136559aef3c7d8d4
 EBUILD kapman-17.08.3.ebuild 700 BLAKE2B 2762adfd5d9af87e900d395995ef2fe31eaa6ccf64378e585145fb567892b09f3ffa0db27a47bf21bce000ae583265a251985add59f1c230c480d52f36abf054 SHA512 3a513e2785b504925361640cb3c3f07085345ded4f86ff56624bd4afebff32bf8523103f99493da89ad4f52770cd51c051c6fb160f74676a889f959650e92786
-EBUILD kapman-17.12.0.ebuild 702 BLAKE2B b603ca42638f25e01e9f5485396d096d00be1228549f775f5127fe82d5852be870af342ce54ab5d55280193777900201be198c554425b8abf6b5240da6772143 SHA512 6190ec5b59200035b88a32aed18a642c96b9c3eff0eb4d9d6bb95998d5ac506c4cbb60513d54badfd7d837b5bfc604e52e2b868902c1db2142edd7c2e653f690
+EBUILD kapman-17.12.1.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-17.12.0.ebuild b/kde-apps/kapman/kapman-17.12.0.ebuild
deleted file mode 100644
index 2cacb25c2dd0..000000000000
--- a/kde-apps/kapman/kapman-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapman/kapman-17.12.1.ebuild b/kde-apps/kapman/kapman-17.12.1.ebuild
new file mode 100644
index 000000000000..1bb9a2b6f7e2
--- /dev/null
+++ b/kde-apps/kapman/kapman-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Pac-Man clone by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kapman/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 29a6a42e9832..c4de57be7772 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-17.08.3.tar.xz 446664 BLAKE2B 3678f68c27b07124b4bdc6ddc99720e9515c89c282b60f4084b1d30860686c8c56a4a8089937f271441278cb719ec39beb46a58c6191a39e068becfd28664261 SHA512 2058831a8b60214567c8d8f74ce5871968f2e2b9f2831202e09a9ea79ad2d5a61b2ec64c8e38cd28bf15291e6bc80376339c7999e3e8119aedb1388e9290990f
-DIST kapptemplate-17.12.0.tar.xz 352448 BLAKE2B c106060733d581c9e66309e8a7fc838a1bc5eb3bbbf190454086d6b2070d2fa9320cc24ff19d7c1273c7a3873179b0132fd593def872f3bcf60567c9cc768bc4 SHA512 e3929c57bf14be34ab58d371b31871aa15a05256716743940e1e20da9c7e33557c4570cc690cb98e8f65ba2f7d8868e50276f45821c28dd019693a3b7b0eb4c4
+DIST kapptemplate-17.12.1.tar.xz 352552 BLAKE2B f05765e56fbb6867aa21ea5fb18e9ba383823789e1ed7b6c53bd1a348b3690521f968d7a9e533ee58a8b42a4bcc5d9d3a3d89b11ca753e0c1df7bec8aa4d0e15 SHA512 d55f05bc4e5e30dd05d16653a0e71a59d7873565f8814275d303f02981602bbca6604906106e5862f6c1a6ec4d76abf5687ce62ea2d5fa3267d68b79b5f6f060
 EBUILD kapptemplate-17.08.3.ebuild 716 BLAKE2B 368a4affb8673ed20eb7c3ee3491a3e7e0364d978760ac574e427af70fd02c82e5125ebad9e9c087ed1ca72119b43203e5c4db039f68742e4b4c0935bb28611b SHA512 30e80278cec9f24715edb9195dbfe8dee55a20d56fef649ff742ca0773785601cf351d505ec46c87bcbe10ee8ed0a3ee5560b3ee5a4ff54d9d6df0b10202fd7d
-EBUILD kapptemplate-17.12.0.ebuild 718 BLAKE2B 21b0c2d08c3f61a6c7826316a44a7ea3e6e5a9bff35d2ef3364c1297fa442fee626159add1d7491355624b92c70fbaf63705ac496789d827c29a163e6985999d SHA512 892933ad0b9607fefc1a622e8c5a6de2947179833de4aa4e40cbbd0f8b8d8d09d46acfc18ec192943a6aaf47c0670825e5043aac35c1ba97e513ed6978865a0e
+EBUILD kapptemplate-17.12.1.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-17.12.0.ebuild b/kde-apps/kapptemplate/kapptemplate-17.12.0.ebuild
deleted file mode 100644
index eda56a210c76..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/kapptemplate-17.12.1.ebuild b/kde-apps/kapptemplate/kapptemplate-17.12.1.ebuild
new file mode 100644
index 000000000000..a1bbc2a3c37a
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# 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="A shell script to create the necessary framework to develop KDE applications"
+HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 2101a498e8d4..ca69f91a650d 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,5 @@
 DIST kate-17.08.3.tar.xz 5617380 BLAKE2B 582c128e1904fbd0cec6ff177296aca68c36749581b57b6d71fce3e251838699c5068945a6e43abc05339eca3c2ac9dd5ec53891c20e208e3634771d5a859dd0 SHA512 cf4be33ec05a5451322141beeb4b2a66ff34da9f34fbc1038d7303d707012ffc477510164a65837ea0b94733b0e2812b747109a78049b5e4d31a75887c66bd46
-DIST kate-17.12.0.tar.xz 5629740 BLAKE2B 4daaffdd71a94a413a0ffba1c67252bf74beffd435399edcd96af4bc6d32c818e4d6024345eec4bcd5eabee9120572cef3267cbd390fe7320a0a7f5151411815 SHA512 c32ae8db912fe4d8e47970a5fddaf722004b7dcdf3a9bda12082764dc0573b7634bedaf59c09bc1b9188640d4f06f122c54671fc81ae6a23c23249e3dd3760ce
+DIST kate-17.12.1.tar.xz 5630360 BLAKE2B 69f9855fbdb71c4215de58f046fcd88253d2edb7678633f07de4803aff8fc34dad975970e1f3d4800fd3f798d46ea30b0bdfef96ca11e22cacc53b0455d58fad SHA512 63644c093316f864390a67f419be047d9ae7eea8113f5a030bef047ccd2636ba4c8e2aeadcfb71cbebc675f91babef427b23bfbd96df310ff4ac5ad3e82d5e64
 EBUILD kate-17.08.3.ebuild 1954 BLAKE2B e56b1037dc2086e035559ae054099eac3f83e832f58df68441644948d444e8db358b72209eb65e0a5a7b88381da3e92c7f1ad82874d0e1ccdf69669102e5cdf6 SHA512 05a9fa841e53979f9537499c2460e44caff377dabb6e7f93c5bd7521e8faeacf300f0579d1b261af8ab2cab401602a5ef8d90fc6f6aa2beb05e48099ac8fa346
-EBUILD kate-17.12.0.ebuild 1921 BLAKE2B 45b661897dcc448be7c42a8e999597b6c5c8d72d1a2f843fdb30c45fed14468c2225544f9d4f92d681ae30663c30b785797062ea5aad7f8d1c4648c541a4a4de SHA512 1839d6f03c75b08f4a8c80bc1a443c97d8a28fb230f7cf30b07cb4aecd4e5fcfc3d480521a3dc9e52e04e144f8c156d88de24a5141b30cfb0c9f8d11b7dff9e8
+EBUILD kate-17.12.1.ebuild 1921 BLAKE2B 748abb9b062aae35fc929455f9c5211a69fc6981d69a52def8ba5b7805f68a2d2f876310cc0b4babd55d80a490dbcbfc3b6418cb0b81dcd5bf932f2dbc456472 SHA512 3b5b8b82bfb824ee94ac9e654f75a7dbb588d9c9a3b01077e83d4700553b0ffa0428a5aa121171e25584b5041e763a400c798cfca0e8b696e5bfce5f04fc0c07
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/kate-17.12.0.ebuild b/kde-apps/kate/kate-17.12.0.ebuild
deleted file mode 100644
index 29ca64a109ac..000000000000
--- a/kde-apps/kate/kate-17.12.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Kate is an advanced text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+addons"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	addons? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtsql)
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# test hangs
-	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kate/kate-17.12.1.ebuild b/kde-apps/kate/kate-17.12.1.ebuild
new file mode 100644
index 000000000000..c1929deb4d51
--- /dev/null
+++ b/kde-apps/kate/kate-17.12.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="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	addons? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kwallet)
+		$(add_frameworks_dep plasma)
+		$(add_frameworks_dep threadweaver)
+		$(add_qt_dep qtsql)
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/ktexteditorpreviewplugin
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# test hangs
+	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
+	# delete colliding kwrite translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kwrite || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=$(usex addons)
+		-DBUILD_kwrite=FALSE
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index d3148365c5df..e380109930a3 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-17.08.3.tar.xz 1236144 BLAKE2B 7fea5c19cc6c4839f63990f6cc93de7bc88e8ce8d16b496d78131490a810cf91133e9c8d46be51f89cc61138600324731c706b78c6a82d3aeb604723d78e9e8e SHA512 37640c3b26fe53842f23bb7048cbbab6a704901ea7c4fa93014f244bc381d7845fff5f61f7838397b30c51bfa0760a510ebefcc6596e376d5fe14ffc71bed74a
-DIST katomic-17.12.0.tar.xz 1236140 BLAKE2B e5a235f70c871baf6cc2cd855fb8dac57ce3361a0ceb8ee08064bbaed2c43713abb86e4a13b1cdbe67eba2cc447c0b94fd34cc529dd72eb67fe4aa9764bdfcd3 SHA512 8043e68bc1d3da0e99c119fe09148937ae58337625d44c3cd2f9484b8cd1528439e6bb9fd135559faf944611c5e1e4213868f6ab2eed1f68e9d5b03dfd149089
+DIST katomic-17.12.1.tar.xz 1236176 BLAKE2B e2f6ebc9960d3fe34646043107a2009b3f69fa47065295b987ae63ea08a1dc9ff4a04501e4a6aedf2f26f384739c2f4f4c08e713f68d4e79a948d55548eb53e1 SHA512 195a2ab94c29026c513365ac25265bf8152c09474262fb005e638153986a5850aea3bf2f0a3d0ffd2ec93ffb2b906162a021384ccdb79a67e678411ff3b1a37b
 EBUILD katomic-17.08.3.ebuild 738 BLAKE2B 9c4b7f46d17e59ac37c45c93a7d1fa1540177e4cd5d0d4f3d48de7a7170ad56cde03184d5223ae0bb9730d92b140e8c7060d5361a14c06f95cf75c8414e87b45 SHA512 a2bd8faa9aebcbed6cd6e8bcf750e3782c5e78801e31e21a6b3d535ebbcff41e307d8676e3c69ab06b5053edb9ab88d7f22cc8eb890cda9a08c2254f91098642
-EBUILD katomic-17.12.0.ebuild 740 BLAKE2B 97b1e1da807e909fbac19c06c6ee6d8556de06660666a2076a74b3f0cecf992ca13a578c4c80fe82f2e1888ab1fe9b67b2f1515254b351ab89f4ceb7a15a1e7b SHA512 f7899c46f4cb3e5f591efbcf005506ac350dee9649a9f9fbd989d26c99143213e76388a2c30e4f29078c5139bf04edf7dad4555297a121547d14092c2496bb95
+EBUILD katomic-17.12.1.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-17.12.0.ebuild b/kde-apps/katomic/katomic-17.12.0.ebuild
deleted file mode 100644
index b900a5af477a..000000000000
--- a/kde-apps/katomic/katomic-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/katomic/katomic-17.12.1.ebuild b/kde-apps/katomic/katomic-17.12.1.ebuild
new file mode 100644
index 000000000000..8385fb375b83
--- /dev/null
+++ b/kde-apps/katomic/katomic-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/katomic/
+	https://games.kde.org/game.php?game=katomic
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 65aef425ca7d..5b79e0f4079b 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-17.08.3.tar.xz 401844 BLAKE2B 71788aefbfaf819e64690ac38c25151ba03704d3c1448198943349b41b6fc4c9e5465d6e49630234c0a564bef64e27d6b870cad2a3c3d5497a28acc0711d0750 SHA512 fadc0966a59fc4850e4598592a2fed9f014414d7eaaa654b753bab2fa5a82615310b6b3f2f38996754712afea81954a9f188912c16b594273c9737b5aa332828
-DIST kblackbox-17.12.0.tar.xz 401784 BLAKE2B 93f5a4e16db939185074657d5e19af7662af6539690bb34485eecace342f99e459c8750c3b956aa94fde2f72f6f8effe54bf1b61045cca4067664d1dcf9633ee SHA512 301b15dc08d307f3a5d7eda5330bd9bf13a92a28b6015d5e5d535d2635015ac4bc4087dc0d4ec1f97ed38cc9e227e19e14c61af8fba14ae20d4822f6eccf8918
+DIST kblackbox-17.12.1.tar.xz 401700 BLAKE2B 3fdd54c7a5b78f5aeb2326af458014747e5773a76db40faaa5ea68963c7cbb709ada526c3c8b95d4e1437b039cd177c51e6c9b444a88e1bf29378ccc4cc20ddb SHA512 98f2dde8262180eece380eb06d9a858e617b84d39154fa2ebae8cbaa5d91e002c857ab50f24390a40539867aac1e4601585045725cb726314e4e74ffe96ee370
 EBUILD kblackbox-17.08.3.ebuild 734 BLAKE2B 296b51ef8cb423318dab75dada0560f78218acd0125102064ef05ab28e9e82bb77f41946e2e23e56eda5b26189c7994e35399d5263a45ddbf3439b97a0462062 SHA512 9b9ad6cdc67efea11dc110fb9461fd9c2953c1d089d73600968aa0e33be88ddc125296264cd27d9ab608b9dfd88b155d0f78d3337289f7688bd920428df83bdf
-EBUILD kblackbox-17.12.0.ebuild 736 BLAKE2B 46f9ccab441aafa1b343ce9da87206e26964355c64777604bd183c5b3670ef322973187caad8dbfc47d12f97d3ceb51e0697bdc3986349d1e663288e36449877 SHA512 8efd35ec8cf27a886a5a4417eb2544f0ae3c6b4d1cf792beda12b2f525dbdd326837e51a02b7ec72a45999303f6237fdda6206bd48e44cdf6f32c3e60b22c1e1
+EBUILD kblackbox-17.12.1.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-17.12.0.ebuild b/kde-apps/kblackbox/kblackbox-17.12.0.ebuild
deleted file mode 100644
index 3c76bbfe903e..000000000000
--- a/kde-apps/kblackbox/kblackbox-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/kblackbox-17.12.1.ebuild b/kde-apps/kblackbox/kblackbox-17.12.1.ebuild
new file mode 100644
index 000000000000..f595a51a7bbc
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Blackbox Game"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index f8954fdbd622..4671822ab82f 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-17.08.3.tar.xz 1750244 BLAKE2B a543c4751c27f695c053a8af310895471379d125bcaf0d6eb3d49c6d09fd36fef89ffcacd0ed2a35961bc22c1926b5bda4694134e46777fa201975e7ea8bea4f SHA512 c83afdbf618550caa7a939e7c556c36a57c7612c3b225ab3849dd6eecc3f933da0cfa2519bd2777d39699553028999b26fec10422ceff5db9684d4eaebb7e8ac
-DIST kblocks-17.12.0.tar.xz 1750096 BLAKE2B 06581f28d49b6e1772209e135aa406fa61ae6162728a18f1ecb25a4d15e612824ab3f4827d3e73f03b93a48a60522b64ea9c90c8f770c02c7881591ef758c42f SHA512 cef62b1649eee20ed537da0938d126b802d889cf0f2e981a32c0c1b700ee56d55d0b1f9912267a2c9ccac4a06cd2128ce2edec6fd212683f8d6456a50a2efc5c
+DIST kblocks-17.12.1.tar.xz 1750400 BLAKE2B 31b529412bc89b68a65f4737e667484fc89ad955ff3cb8dbec54c10c34aa3da02cd801bf2690b3efa1305f64fa91cbc09930ecd63807b8eda5e7e0b3def8d833 SHA512 d4729f91dd42e2d9e9b1e553bee960d85221509426a8a9d708e3fbeae63a65d5c17475dd1fb130e8567974987392edae380ecefd3fcabd6a12266dc689bc70e3
 EBUILD kblocks-17.08.3.ebuild 686 BLAKE2B 494c8566cf9d120a783b5f34d4d187f212dcf757b8539aaa81c7edae0a497cc71091234e8b0ae557fd6de195f4413e29c83924853c5fa9b64ef99dd56fa3b737 SHA512 cec0e0a47497f1ea6ecbc7653bee8b4d8f6b81d87f4419e3dfdd2a2b252b0dc9a8c93dca582fbc621d59490d2ddc68030b1a72b080152f2b952f198c60fe23ce
-EBUILD kblocks-17.12.0.ebuild 688 BLAKE2B 75f7ffbf90efb0e04080689871c6af1f768d3325c39da402f2f1c912b1acd21ea125fa1ea03e974cedd7f6238128c39da725ebb4a2ab30ba8b769366db78bea8 SHA512 9f63ba6fd6cea8eb68b90d52d7db7344711789619954feda796a690a4d92f5a2238e58c38af660c86298b2656dc7ce21b0fe340ebe91351edcd15904920f83b6
+EBUILD kblocks-17.12.1.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-17.12.0.ebuild b/kde-apps/kblocks/kblocks-17.12.0.ebuild
deleted file mode 100644
index 4c79b75ddddb..000000000000
--- a/kde-apps/kblocks/kblocks-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A single-player Tetris-like KDE game"
-HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/kblocks-17.12.1.ebuild b/kde-apps/kblocks/kblocks-17.12.1.ebuild
new file mode 100644
index 000000000000..864dc454ad9d
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A single-player Tetris-like KDE game"
+HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 10c25a671585..426e6c66cee6 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
 DIST kblog-17.08.3.tar.xz 72504 BLAKE2B 4d0cf23d8bbfa4a108d8d451148b0e6696b8d9ba4b804caab84296a6ef0af21e9d54a45f4b915055740be83d94f53b10feb14e552b15ef58b2ee8ff43c4214e9 SHA512 da1caf92765f87b8371084b7f7bba080577c02146339dc45cbf151e93973b6b64d7d421a2d10545567a0e7d802608a422ea8fc43c6863a95df9fc1f4c7644cc2
-DIST kblog-17.12.0.tar.xz 72536 BLAKE2B 889777f8d00fc617830fedd856efe7e0b2eaf2a230a6fa2daf4287c7ee3e03ab1d7cd0af28eddacc7fa913ffa11ad34ae1eb6db87c5b9bed8f29d8f5d17c48c7 SHA512 964add88b19b700b0bd9370273261342eebe02408f65fbe9d5aac2e17bf2f848eaf17efab02d5e849af6e1a1ebbd7ef72abde84c8316f48c529b42dd9b916b47
+DIST kblog-17.12.1.tar.xz 72488 BLAKE2B ecd0f87caf80ff13ec7b3443530d0c5b499e63d627487898a05eb259d2c0084a931b320231ada0e7e1bcbe0be5f2d55c5df585bea4a287c7d7d927f60a7fd83f SHA512 91deb0a4c361249a9383b9ea722ab83c184113c31fc6f62a93519554392cf0722b90664a9d67b2e4fe69dbcbfd932e96b8bdb1e267ea2da46ad4c248ecfe708c
 EBUILD kblog-17.08.3.ebuild 571 BLAKE2B 138e63c468288d6effa3d50db8e2c7ce3ef12c95df966b122da91bfed819966019abb6db1c852e94c35654bee66ca6d775af1433f97466f3d9969a2779a70723 SHA512 d8e9158f06e4f9d4cc4b774adeb46c33b826f6ce32feb456b2320abf4e985130fd5175775ddcf238ec91ea3300920c5cd6c604f3a15f36ad96b49b355a9a566b
-EBUILD kblog-17.12.0.ebuild 532 BLAKE2B 355e71a84d2d043b3f467db8c1149143a93ce03bb025467c8f835dc619379bf262018580dc96a5121cebadd7610522c4c6ec55f25430212c123be574a46654c4 SHA512 16513d00263b968d8ecf195342f1d3ff93e542151be738e3615523c514e213eda223d605b83a9013fc687283503d3815525addd2165fc853a787f490c2b336a2
+EBUILD kblog-17.12.1.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-17.12.0.ebuild b/kde-apps/kblog/kblog-17.12.0.ebuild
deleted file mode 100644
index 29c62ac8475e..000000000000
--- a/kde-apps/kblog/kblog-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep syndication)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kblog/kblog-17.12.1.ebuild b/kde-apps/kblog/kblog-17.12.1.ebuild
new file mode 100644
index 000000000000..52fe4d617ecc
--- /dev/null
+++ b/kde-apps/kblog/kblog-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep syndication)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 51f1494d4653..af5d68c9fd00 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-17.08.3.tar.xz 3481768 BLAKE2B 28cb83e8945a87829cdba08f2ad2cc0f119da2548eabff26a6caed500529fd4452dae8b6e1dd958415f4221131a28108eed4c9243794076d11317f2153a2de42 SHA512 9eb00ad6337d410dddfbf9e709246b62579593685aea53bda707dd62ba0199a3e0648ae276b049f7290d7d6a4b377cabb7cfeee8d64d6765ebf1ae2bd9c17c41
-DIST kbounce-17.12.0.tar.xz 3483680 BLAKE2B a5e96bdc7224c0b77d3db03dc080d49677ce06e445c13116821c3e30013912276fab1af67f66c0e1f83b74eb55067518087c975903faac501b1f3d0cf67eaf2f SHA512 113fa9798aa2998fe000fc9103f25773e63c362a19a9020980b1b174ed52b88fb00106392a03910d45a2a49dc6da74fffe6ea82ca0be7666b9dbcc4619ec7ec5
+DIST kbounce-17.12.1.tar.xz 3481612 BLAKE2B a359f1899d33d0ab5ffe5f9191e99d2508f8cdd3cc7959e204603c19f5f38a3a5f3a5a816502704db0529651c9b7ba237827d203d72b2c9fee19d23486d5129e SHA512 5963bf5c258189df53275bf51a42b1bd273287c608cd88fb052b4cbb09aff9b083a6e4edbc821f8e88e159b928aa18b33635698042a97c8023d31832060d4187
 EBUILD kbounce-17.08.3.ebuild 817 BLAKE2B 955c99aebc3259e7cfc666153940fc986c20f1f8d2307ad5e8f9b844e32bfbade83e68dbcf9f521256a60b88c8a4796f7e87f56d45f8674e92e4983794db48be SHA512 8f1ea05812b932efff730d5c1516bd787e88a3955569dd628eab3f4564520b4a44e46a7947bc0082d0a42a951a5c28f8296965bd79d88d4bc2a9b8f7a107b1ce
-EBUILD kbounce-17.12.0.ebuild 819 BLAKE2B 3117e4bdf1cc31e29b88b54dd4db0b39548418126f24c0aeb526d80f98218dfae646088abaae5985607bf06b124434f1f2ff19edfb0b299b97f05e71a5ea067d SHA512 40c5a5f14f27914b79a24e2fe1571c17f7c67901473b5185af19d6f5782917409ea6932ea41f2c2e6c3617ef79da85ea310663d088aa57a9d06b7b19a0c6180a
+EBUILD kbounce-17.12.1.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-17.12.0.ebuild b/kde-apps/kbounce/kbounce-17.12.0.ebuild
deleted file mode 100644
index c367fd44d5c5..000000000000
--- a/kde-apps/kbounce/kbounce-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kbounce/
-	https://games.kde.org/game.php?game=kbounce
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/kbounce-17.12.1.ebuild b/kde-apps/kbounce/kbounce-17.12.1.ebuild
new file mode 100644
index 000000000000..eccbc67cbbbb
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Bounce Ball Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kbounce/
+	https://games.kde.org/game.php?game=kbounce
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index e441c6a23022..1aa9727ef6ef 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-17.08.3.tar.xz 2053628 BLAKE2B ad9e78fea031578dcacf0fb77550b6a5604b327acb1124b1f02b9479c2ddc4fc352a09ba7c19e9332787605decf66bc071868a2d4925ee56964b69b4dfa9940a SHA512 9c1eaddc77d599e6992a62ad76751469eb52fbc0346aacaa20996ee9914e11dfc139084b1a7829268219873a83b158165c7050d7315e533e77934f6a7ba1dd70
-DIST kbreakout-17.12.0.tar.xz 2020940 BLAKE2B 0b273a03506a6b76ca5ea5864218613e33bef7d6a982a2ff7b4a037eeefe63048113e068a3b9527b644a225bc67b373b2fcdf82f6b4594370a328fb40bd9c385 SHA512 abccb35cbadbaee39961a92a527ae9c8322c947baec68c18c9c5f2d2ae480057cca297618503441e8ec3cb94a79b6003b81876a64e15c7a6b6ad867c965075b6
+DIST kbreakout-17.12.1.tar.xz 2021136 BLAKE2B 58cefedd143ef9c28f989d16e12ace4a2814783d9494fac896ec7f387a532aa1bcad59e48801f245931555cfc08b731cb4ddc6a151192c9f8243ca4dd16daf9b SHA512 10a995c3b6e08a533877da9fb1ef47ec08d8176854b72bb4ed558a84bb66adb900e17e7d0e998cb20a706e7d8f9e8dedcd78781e21282d322f2ace43ccb6b64e
 EBUILD kbreakout-17.08.3.ebuild 766 BLAKE2B 0e6127ee626d25aea1864aaa90f814678812739cdba87d2091e69072eaba94334d695d6249332ed46b3c99ffe80090ade7ab39c79aa23a4056c5abaceac0f8c0 SHA512 c95638f42e5d68d3d50fefc11067d078c56bd484651273393fcb8b12b085c69f01200d6fde0ea6653020c5528b561a72464c706ec989015f67bc598d053f52cb
-EBUILD kbreakout-17.12.0.ebuild 768 BLAKE2B 4d7022b13d901646ee4a3c0d1d715bedfdb9a233c41d79fab141bf4cff762b5b134ca717068b6df12e962a1799846458e0e79471ce4cc217f40bf87c9cf3a766 SHA512 54373cb91aeeb70777b20d62ad878f2182c5b94f5e64ee43fd905dfb69afb172c9219aa371bacccb6f5690758ce9e01fbbd1f651a543adb71c2f4baf30fd84dc
+EBUILD kbreakout-17.12.1.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-17.12.0.ebuild b/kde-apps/kbreakout/kbreakout-17.12.0.ebuild
deleted file mode 100644
index 9842d908d163..000000000000
--- a/kde-apps/kbreakout/kbreakout-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kbreakout/
-	https://games.kde.org/game.php?game=kbreakout
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/kbreakout-17.12.1.ebuild b/kde-apps/kbreakout/kbreakout-17.12.1.ebuild
new file mode 100644
index 000000000000..df3e421e986d
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Breakout-like game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kbreakout/
+	https://games.kde.org/game.php?game=kbreakout
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index e3f2d5f2af46..4795451d9cb4 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-17.08.3.tar.xz 5601140 BLAKE2B 9ca35db68c26df61b098d9c04232c611c7dab8e84c63927f49d094c334b357d8f0b689077754ddb98a441e268161dbb6a0301bb2b12cce9e201a563eff19f1a5 SHA512 2a55f007b272463de5bb59ec2bf7b6efe3e33320f9373f7b14fd4f738b8831718720a6e451988b04dc364f39c4706484a413ff2ba35826afcf1c8ae94507142f
-DIST kbruch-17.12.0.tar.xz 5601004 BLAKE2B 000b4d512160193e510dcc25f9ea72a82efcbc870b29f37e5111d59b3d8a1d3e69e706d152d3ba157c4bdb41db841e4e44083c83c7331627815cb94da8094d2d SHA512 911b0b0c97fc0ec3c86c8b307938906c65ff7b69952c4cf3fa543401399006cb71ad3576d8a56c1f5d0e7812977e0814cf66dcd8361e8155a02278eba7b5e001
+DIST kbruch-17.12.1.tar.xz 5601072 BLAKE2B 4d4127efc1c3cc864808d17376001a935f3601d2ab247feba8eb80ca242bccd4b1e7fbb032e510778027ccdc076e908a541a7d53fa5d834f56bf869ff75df1a6 SHA512 a96cf389a120d2e4ecac6138bc2604640ba622820e41fb728f229e59b1644da98ce5c4eeac12c669ddf1006d16d0d5f9b8ed1c7e35ddbc82cedfc7d3c5b665a9
 EBUILD kbruch-17.08.3.ebuild 630 BLAKE2B b41e111bbc5eb946a47b025de1bd7cfb5051d995ff5a1f3bc43a09f1bd8522b2ae1ab8817b433e4100bc18a3c6d2e1939ea3f5158b241454788b66ce6aaf0cf2 SHA512 067523d8102a1164ccdfb67f349b0514bcc8c86646ed624c450c6ffc7caa6cda75daee73d1bf34708088131edb399bbd583cc08000d593bed78ce22bbcc23108
-EBUILD kbruch-17.12.0.ebuild 632 BLAKE2B 44dcd1daefb982aeec2643223b5601a9feab576e050b8f4c3bef774d063285e0070bf1353011ccf4f8050fad52664568b02f1027f7c2b8f3b5ae41b8339eb88a SHA512 a84e45c474ec6d37390241ea64685a94080e458f8538a1dd68edeab172001b9e6a7e43c4b2789f18aaf1b7db49f67c59fd90449d16d39abc9b3737b8fa68ccd2
+EBUILD kbruch-17.12.1.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-17.12.0.ebuild b/kde-apps/kbruch/kbruch-17.12.0.ebuild
deleted file mode 100644
index 884e1782ed87..000000000000
--- a/kde-apps/kbruch/kbruch-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/kbruch-17.12.1.ebuild b/kde-apps/kbruch/kbruch-17.12.1.ebuild
new file mode 100644
index 000000000000..cdaad6a4a6c1
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 28ea3bcd6aef..84ca2a31fd13 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-17.08.3.tar.xz 813804 BLAKE2B e04d4fa90b9e0027bb9610e10fe66f4029ae81194f4ee47a0388da947cf2496a109655302fc27a103b2c9d3f8854d6088ed7205b2cd10076155d98cd6b4a79a2 SHA512 0b94dd1a5342b0dfa9dc3c6a6f2af46d494597b9fe7b53a92752fa87dfb27a75d0ae4642f36bb69ee3d05a01b7ba88007fdc5f81bc9a9b1cd7d320fb2bf22062
-DIST kcachegrind-17.12.0.tar.xz 813812 BLAKE2B cc4d96fcfdc8c981e09876e85065fa8d1ba0c7004dc627997b55b91109d5d4382afd86c3a5304f2d19f761aaa77f48b007b6e3365a2ec34cad4bd6e6ce30196b SHA512 21b47d5c915f10f6fe70258ef7b077572ee907e6cc8b65ff0e69c3a55ded267a6af996cd2c71d942d008c32b991a4e8d219b7a593b72817612d1c28d9b776059
+DIST kcachegrind-17.12.1.tar.xz 813988 BLAKE2B efbdee4d67b2b266e8d8b9fd6235988989f984597e63d5ef7ab2fdfe7a849ca8347457022d2a71a463f2a9db8dfc522131971f7f1238c9cdee86ceccf635977f SHA512 ddbe8a577ce1268fd04df90bdbaf6cf0d0f6bc181a7fd29be30a333f0a3429992884f64d2c44e635c18c8dd3ac74febcfd30ad9043ae574d05b9be981de5ee83
 EBUILD kcachegrind-17.08.3.ebuild 879 BLAKE2B b134be242c173cd8f947049c480702df5f317e98ebcd193e7331aa25673238e3fdb5ac7861980add29118dc1dd6c2b130219e1c7240e4965447bf642e02b59ee SHA512 b834d90af255334f9180122053bec7efb5701ab8e640717df447d3e1b512c8bb67d3b313895d3de887287d90ec5156776877e5a9f35855a03e888ad6e77eb3bc
-EBUILD kcachegrind-17.12.0.ebuild 881 BLAKE2B d32f1757f0cdbc86878edebcc383bb4aaaeb19263cb5e0b73d65d2ede59c11dbdfdfeaf6ad99caad7398419072a147ccc4c16f3553ea63521f8433d3d23049ee SHA512 c6e832149230fc3b372ec0d94ac1ea042eea441e8cedf895a0c49b22f224292bff184468b54272326902e1d5be25ed29857ba9a7bd4093d858965b2f4acd3269
+EBUILD kcachegrind-17.12.1.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-17.12.0.ebuild b/kde-apps/kcachegrind/kcachegrind-17.12.0.ebuild
deleted file mode 100644
index 6f3c914de0ed..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
-https://kcachegrind.github.io/html/Home.html"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/graphviz
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
diff --git a/kde-apps/kcachegrind/kcachegrind-17.12.1.ebuild b/kde-apps/kcachegrind/kcachegrind-17.12.1.ebuild
new file mode 100644
index 000000000000..e373c6a3ab5c
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-17.12.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="Frontend for Cachegrind by KDE"
+HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
+https://kcachegrind.github.io/html/Home.html"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/graphviz
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index c2449953b17b..630a0d6198f7 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-17.08.3.tar.xz 360228 BLAKE2B 14fc73f8ade4335f356dde995477bd526c499cd1420a314f53e2fca930f03644d71c8bd1b0ae98b9fffc9bd43c041bd1cf918921c4dbb91f92da76321b1063b0 SHA512 b578fa8fe38034eed09d9be012a824449b75a5d99bcd4eaf96378de444e976534fffc385db4c0209782bfabdbf55b7d9cf3a2a63b836f023adde92782e6a945b
-DIST kcalc-17.12.0.tar.xz 360224 BLAKE2B 189798aa204bc7770720b89337474ecab92f0e51bbf0471124fa79899b5cf8135970292781413a10897f42dc86187dd13e9093b46d753e4c3388035e32856530 SHA512 666882f18c3d85c6b72d4d83c54f1ffb93776be8cbddaf1cf62744253f67b5c9803843b0b7c67b4ab66d8675edf1ed20860309573f2ca555c40a69671db990fe
+DIST kcalc-17.12.1.tar.xz 360280 BLAKE2B bc5d43a3082e5027da6c698c45a92b93640863f42bb5c720fbf8d413ba714ee5e9141464b4db0df1d08b7700f1ce4bb589bebca031cae330de1a24c2d7db218b SHA512 36aa3e39ffc64a6e829e077a8705e6afbcb8f570ccca7b612b0b204140e87d07b3fb57a3b59921fcf72f425810cda9a5b2a1d52b4804662f5489add565f7e859
 EBUILD kcalc-17.08.3.ebuild 771 BLAKE2B 8cfc11bd45eee3c09d03060efbb9eeb9ae8a63da41f8bd6ac9847597f0d5bfbb41a7390cf12b604530b91f153c9fa5fd3630b3485fe9ec78629b40a8e9b82086 SHA512 6d77bbde854c65be877f872434123e7be2789c7a8770e1214765c06bc51af9307260aeb122d58c59d8b458f44b4aa7ee278f2f21f9940f744fbd39240c60774a
-EBUILD kcalc-17.12.0.ebuild 773 BLAKE2B 25e23642b902171d89e81f9aeee97092ade68032969dc0f08bc1e65df4cc553ec69df5356ab3d0d49488603cbd85fa8f1716c1b0f791dce8b6afc1ef7ce35bb2 SHA512 680bf4b67f24bbe4129304bfef050003fabc2a9330081dd4fa6ec6e3728d3038cfda75c3626291dccf0ee2a86e5117ba55d0eb4df52bedac09a1e154238f9f10
+EBUILD kcalc-17.12.1.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-17.12.0.ebuild b/kde-apps/kcalc/kcalc-17.12.0.ebuild
deleted file mode 100644
index 3b9750eae324..000000000000
--- a/kde-apps/kcalc/kcalc-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
-https://utils.kde.org/projects/kcalc/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/gmp:0=
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/kcalc/kcalc-17.12.1.ebuild b/kde-apps/kcalc/kcalc-17.12.1.ebuild
new file mode 100644
index 000000000000..2877d5cef5ce
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
+https://utils.kde.org/projects/kcalc/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/gmp:0=
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index 815648201fd0..e53a04c26b0f 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalcore-17.08.3.tar.xz 283052 BLAKE2B 6c6d9c694a3d97ced72d3ae59b88cb35aa3452857d5d82ba004b2d3c09452c5e5346b013d22726737581cdbb88be33ee0b515f9c586ebd7819bf628bcf7c02cd SHA512 485331c0bd8695b58b1b5d756f525bdaa5906a1ac64399e1f74cc6eca04a073834519cc1d4baecc7c054fbe79663262e6785642478c95e5be5052d87f4cef546
-DIST kcalcore-17.12.0.tar.xz 275600 BLAKE2B ac71b0b9a404a4796e2ced317b0226edff3d9d23972596655ebe346196682ba32a7d7577ad894f8f86705075ac021b6909ac9bfef8dcd9eea55513666808c001 SHA512 99d49a1134f7a5c8f019be4002639a12fc8f862d66ede906aae6b377706e9eced718f65bcbdacd117d14d53ee10b9b89041a2b514873cdfc0ce1d49f8ad01ad6
+DIST kcalcore-17.12.1.tar.xz 279300 BLAKE2B 54e06ad35e0a0c84aaffb5c637494c18aa7c4eddebb60fb51d81c8e7c9ec4074ed8787b2710674c3dd13b7286abe0f4a3e1a5a4d0dd800c6eb865730319a8b2c SHA512 5b836c4cda0b70f2050e74c568b5d2d18ce16e4a0316eb01bce5ac83616230a017b3f20bbecf327aefdf37b3890fee33be1e18a6ad48642d4d938707410879e4
 EBUILD kcalcore-17.08.3.ebuild 564 BLAKE2B fcb5a24a835d7612088f1efca024d6b3ff6d88ef54d1b87b9403ea11a69abf92f478102810851bde64e65b6209c26137ecb01a19ff08e608656cc3eadb52cfe7 SHA512 fe5ef5cf8069ba5ee11cd6580227c06a4abea580873509e86a03e5e1752919d39da915b5dd5a908a96b2629dce0e8dbb58a1f921d916c97c092ee04f9d125ad3
-EBUILD kcalcore-17.12.0.ebuild 440 BLAKE2B 40f859ed61891da09ecbb3a74f886b6da648fa43c75de8213e5ea2b07623aa72016005b4bd3a2f3d7967c78f74f10e08bb18607321a7fb9ebd6d367707da0726 SHA512 ca18673de4805c58909647c629ecf2e962ce5b9c430b583c408e8d2ebfca531f2d323d90343e5f5e55ec8f7ea30e3384788c52a379fea8f002fb35098a08cdfd
+EBUILD kcalcore-17.12.1.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-17.12.0.ebuild b/kde-apps/kcalcore/kcalcore-17.12.0.ebuild
deleted file mode 100644
index 88929c1873f6..000000000000
--- a/kde-apps/kcalcore/kcalcore-17.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for handling calendar data"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	dev-libs/libical:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-"
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalcore/kcalcore-17.12.1.ebuild b/kde-apps/kcalcore/kcalcore-17.12.1.ebuild
new file mode 100644
index 000000000000..88a4662dc2d7
--- /dev/null
+++ b/kde-apps/kcalcore/kcalcore-17.12.1.ebuild
@@ -0,0 +1,23 @@
+# 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="Library for handling calendar data"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	dev-libs/libical:=
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 4a28135bc723..0db640974be4 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-17.08.3.tar.xz 325564 BLAKE2B a49bb9828bf7f1066d95338a04b84674d91b87c8bfc07c367e0dded38ab1db2ba0c2e6a010ea7f36083a7d55a1e41e5c7438e6d0690bcbca656197cf051c7c7d SHA512 aa22d1726f835f4bb33024fe33212f4f44bd9c0ed91e38cb514fe4666811cfd5d5a7fa23454f26f15ddea2921aa1be3c953729f03432c645a519662efab8b879
-DIST kcalutils-17.12.0.tar.xz 326340 BLAKE2B 0c0222023ceca1e7a22a574d7e34b2dcd120e494dcea2c6824ea9b40cea3c8287f581afdd0ca105ac8d283e1e1b32e850facacb34ff004b273b182c85a5cc732 SHA512 22a59345b4bd3497a4701a2e5da1ffbd647220f8302f64e1dc4842a2242c56f55e7f54d568cd3ebdd397decd07f10adcadb08de035883342738e90b7b76294fc
+DIST kcalutils-17.12.1.tar.xz 326280 BLAKE2B 57a20de8b8f423c005fe8f8a69d42ecec77a31cc083464cf3e31b6ab36e8d8987667389c33753840c30005181becf26f6a781df3d02f3f4dcb584c933e490a98 SHA512 92c1cf5ff386de3055a335f73974f0793888d3d10aba26695a52716b4f077f52f9e9285e83e30eed987cf8c7b0b50400937b3928154cbaecbff8c95248444c8c
 EBUILD kcalutils-17.08.3.ebuild 760 BLAKE2B d859b076b969e1b395264691c6bf665590dd1f9a906a1643b3895df38f7c0c52ff3faeded89f1969736dc0f2508c7c78023bbe019d6154e1a8ec4ce81c16bb5b SHA512 6d5913f8bd4d5059ce0c32aee135b55ab76da22cb141dc7b47696dc88e79b9272004e037281f36d3a117b8fd93e97f8248bc295bcafb47dda841213142754425
-EBUILD kcalutils-17.12.0.ebuild 761 BLAKE2B eeda3227d18a2f43f39762e491906dc858aab9d3049da1ebc192b88b2b4ebce58f40bf9b5c65cff5d33a3ce0c254571afdc0627a28a853b3a9aa66d1179323f1 SHA512 8e8a9f259c696ede69a1e3263cc34192be4fecb4cdab89a139cd25066dd78201fea3d5cc5ea82b744f286a3b4e8527e9cde8af2bef97b426e5e12bd5dffaeb14
+EBUILD kcalutils-17.12.1.ebuild 761 BLAKE2B fbdd7bc9e9a8c2d47e30dff4eb862380e1dd0be0012956156f31ba52a399cfb1adcf4f95d19615812b04c2dbb404140f338d5a37184c7ff3fcc4e641a1f33b52 SHA512 27efeb88296f32c83a551a5dcdd95b99084a4342260c39175e7f8fd4cca7704b05f2518addcbc4aa6ecb0417dae8e79e3ea07986b39b91a46132c36e209c6048
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-17.12.0.ebuild b/kde-apps/kcalutils/kcalutils-17.12.0.ebuild
deleted file mode 100644
index c8d7d1984a00..000000000000
--- a/kde-apps/kcalutils/kcalutils-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kcalutils/kcalutils-17.12.1.ebuild b/kde-apps/kcalutils/kcalutils-17.12.1.ebuild
new file mode 100644
index 000000000000..5d61e1ec298e
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# 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="Library providing utility functions for the handling of calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 0194685538ce..14f0cd537530 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-17.08.3.tar.xz 350700 BLAKE2B 09e984bb27b9d472911bbd2f8b1213a820f4fab0abeffe9ee8feb50feddf1a72712aa9c8d6818c1ac6e28ee994a5349ba44581a779db1a7d9a4effaaae64ea28 SHA512 831f9a91bfa4df2e78fa0d138d04ad3d06050a8454cbf8b5f8c6cfcee2c9fc2be691d67b71de9df20aa62b9ae4d1f6d3eab18a5aa1bb203bc33cad6674cae2ce
-DIST kcharselect-17.12.0.tar.xz 351160 BLAKE2B f1b3ddadf0422950e620485926897155c21a3324e5884963d69290be20264f738e1f70e047803aa0bed79dde0c56830e2e7b6fdab7ce91f1778db3232063b3cc SHA512 873febbd54d87dea5bdb0e1bf4f748e7c45e74cfc19f76a83341bf6f78a27ae8efaa65504441ad9bd9fcef339bd207ff5c7183741656a51c12f5ad3685c76214
+DIST kcharselect-17.12.1.tar.xz 351120 BLAKE2B d7fb53a867f34f6bc480f0d545acdd28ad438bf9226bfe24a6a061996f5783fde8903972dcddf603326bd2a5892e368413d141964281c62e5b0c97d5a9060a42 SHA512 7c848adcfa72c385d3409a03e4cfe36e036d4da6addbcf11b4e0170a380afe7d6b333bc99d68a61de6ae165df646b3430cdc759c0fb5c8ca07c22060f981ef73
 EBUILD kcharselect-17.08.3.ebuild 657 BLAKE2B dee6f0579765703c129a7926d4ceb26f28089789c0f2cde3b69c62059776e13fabd24b33d05f0a4041f61926e4bb8be25f35ceeff0e8edcdff2f5204c625cd1b SHA512 7f8ecc7aa1a9c707242185604390a95ed59d46036350ee414b420e0a1d5f9be7872283570ebf4b2bdf677c3cfe3719d1bb3a39009e27feff5bae2faa3627b5a7
-EBUILD kcharselect-17.12.0.ebuild 659 BLAKE2B 2aa019b10d6f898ef09087b037a914bb12216ac66e35150c79a27f7c87e8d4a4ef7dfcd960e4f4f15811ada61d06705fd4c07a256dff2180e39bab51c943ac42 SHA512 15bfa602403896b94fbb4e9aed7b8115040c124d400eeddc00d73c3cbe7a2880713f64bd6af9b47d06662a005e9b4fd6e6c0acb52595673992dae60f62579da8
+EBUILD kcharselect-17.12.1.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-17.12.0.ebuild b/kde-apps/kcharselect/kcharselect-17.12.0.ebuild
deleted file mode 100644
index 5af27e1b900f..000000000000
--- a/kde-apps/kcharselect/kcharselect-17.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
-https://utils.kde.org/projects/kcharselect"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcharselect/kcharselect-17.12.1.ebuild b/kde-apps/kcharselect/kcharselect-17.12.1.ebuild
new file mode 100644
index 000000000000..d7ccc94ca3cb
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-17.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
+https://utils.kde.org/projects/kcharselect"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 9f8427c94d9a..e0f20691def2 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-17.08.3.tar.xz 16240 BLAKE2B 12b1247a927b6e880716bf4388933f599a82a22985c4a2229a7c01bc2adaeca56f6de825f17f29ab0928fb5290aa791e92daf116f4699c032861555633979360 SHA512 3c495e3848ba23a3aaf411ecd802df9128bc0dfb84e1f0da71af84803d3f572bd259a026527fb28fb14abd3b8147f68174421a71700d9f3150bb4783e839871c
-DIST kcolorchooser-17.12.0.tar.xz 16660 BLAKE2B 6ffcc394530a44ab7dca9c0979661317bb01cc4f5325e9d10b03ff89e61f69f780f9fb2641f3cd0e2ea141ede6b357cc348b54f7c6d842956427fda2fd6b9051 SHA512 0eae02418cd4b8f4ae626f54d40d7ff28525c3d2ca7f4d89d47c7f43a4b2dbc3d06d6a1e2fab111e2d1c87162db68674a2f363328bf9c86291d76724ae7bb449
+DIST kcolorchooser-17.12.1.tar.xz 16656 BLAKE2B c0af1cb34caa0ef95674baccb46348598a998a90546c9e0f462214526fd6f487e99a7e3b25d4a80849face9a8cbe2d0b1086f68ddabe682a986a3b2047b998e0 SHA512 9422032433f99f273d309c5551849ab873af02520b7cf295b7b41544322609ce6d9c98495313fec81c00493c8e8714612f655002c11a026150eef5bbbd4a20a6
 EBUILD kcolorchooser-17.08.3.ebuild 455 BLAKE2B e19d84ffa48d9d29eabf2b5e7ad34fdf6f7352e0dbb765a6598c300c0f5df0dd620de02c1464dcc5455d2a198e7d5e268bf7734408e16b02550e657be6bb59cd SHA512 68af923d8ccb8e537707b6019f7d8ce5f568458143a2889531fc08a9bf323720f294da39d906559de2642a4b5f4109c5e40c8a28f4382c2d04bc56fd2b737c6c
-EBUILD kcolorchooser-17.12.0.ebuild 457 BLAKE2B 0fa361e8773c4bd23b3f37eada39bec2b704d22388146bc531c0cfb6329b8ea4a675237a502e4e6dae9254792edebfc7cb126bcf14e2b50792eb1cedf654d5f3 SHA512 4dd96ae1229797eafae036d76a41af9b9f6028c812af3a1b67d2806d73ea9cdfdb2eff5045c6e98b5771ffe117e3b073845f647a93009094f0e4616ee1253662
+EBUILD kcolorchooser-17.12.1.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-17.12.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-17.12.0.ebuild
deleted file mode 100644
index f24e9e3722ce..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-17.12.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
-
-inherit kde5
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-17.12.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-17.12.1.ebuild
new file mode 100644
index 000000000000..fdbb64c54d27
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-17.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE color selector/editor"
+HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 022acfde4505..5471755610d3 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-17.08.3.tar.xz 207344 BLAKE2B 3b59cacc2e76e113b5b6f164ef61f9de0d8960702d0a8ee1db38af5cf01155338a626bcbf47a4d67d5e8a4ddd359d71d94634d2338c0c44cbc53631a84678bf5 SHA512 ca33eb9c130c947ae9347c02093c380f1dee4bb813406d5f2849eecd52b21e78d259085bddf8d2a0e00519b479c3c9afe3e7730f5a7a9da639b0c01308b48487
-DIST kcontacts-17.12.0.tar.xz 207048 BLAKE2B cca82f74bbee4f6eba47bbd33ed84f321392ad4c70a37c1357aed96e05d898949b0c38829e5e73d3d1a383e6f6b88d316ddb9366b639197d41381ada85e73a43 SHA512 8edae517327f8d77fc699f500cf8e63d05dd0e5d5a27f704ebedaa029dc9f91b01d36c773aee77e16d1ea104fdc788bb5ef714254dddb26d6cf423feff635597
+DIST kcontacts-17.12.1.tar.xz 207048 BLAKE2B 65028f13eaa4cff28836fdd4bae141b4058fefd9ac5083946ff24e00f1cd9f062c59021466f237db6468977c7ef43b0b2ebc690bf42f4531ad92208bf8669bbe SHA512 3639376c1a9fe2a09156d6abb9d912e582438bf13c90cf4330f0eb0af3068690f82d1ee5f786cbe66b74267cc852fd487f39644140964b3793a27c427e1a88a3
 EBUILD kcontacts-17.08.3.ebuild 853 BLAKE2B 1e3fec2f10401eed10d6e0278de7c4b514304829027d8732967b4618f8fec71dbf06f411bc7dc569b6a884400db149220bb097d2f19b4f8ef87231b80540095c SHA512 e12ba02b9d774d70b4930629187d141d0f8b566ef034ccac2866db536a2b126419f5942978e76793261dec6dd87b6bccd4f438b350efee41594248b833ee5b93
-EBUILD kcontacts-17.12.0.ebuild 855 BLAKE2B 15e63d969b9acca0bf82100c989ca292564a0347c8cc90aadeb90d77520a6076edcbd18997f06e4ad395c39beabd26794342083c90f63bf7c677a27c4f2ebfe8 SHA512 4408fce2a66e52c79ed75a9c95072a7d9049af64f4abd39c7c570a360324c98a1fdb76c5f5931ced96eada8d2e3fd99960dda88aa6b82cccec50507f6c7778e7
+EBUILD kcontacts-17.12.1.ebuild 855 BLAKE2B f2cbbe2d73e8c7d644edc3e7103bd526f0fef72312d513931f7a90e304d4f4214529a489578f390b40ce48f952f503094d73ec4d64d081ae4da3fbdb208e8ad5 SHA512 e41dfc6c90d9bd0c84c0623a74e23dad2dace61a1e0694d7a54ad4b80f9af0d0b6fcc774dbc5545a17979eb95a07a3706f25dc9fbff8b3ff74d3b52524e3e824
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-17.12.0.ebuild b/kde-apps/kcontacts/kcontacts-17.12.0.ebuild
deleted file mode 100644
index b0fcdf5759c6..000000000000
--- a/kde-apps/kcontacts/kcontacts-17.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 qtdbus)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-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-17.12.1.ebuild b/kde-apps/kcontacts/kcontacts-17.12.1.ebuild
new file mode 100644
index 000000000000..620bf281c410
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-17.12.1.ebuild
@@ -0,0 +1,40 @@
+# 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 qtdbus)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+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 9a27490a6e5d..f670d5cde88d 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-17.08.3.tar.xz 1054744 BLAKE2B 8d6eacdf8bb82d77d9e556b0b8ed9088d40cdf54856a5c0069c2e103f4cc703aa36d0a41c3c0aef493d5e3fd864f42bdf3da8523d633ade6e948cddfedc79ab1 SHA512 4e947869a1342759c5950968bd8c90a46e4c5bdd13197dcd55fbc407ce700d177640becd4418895e7786ecb9919a815651895e7da7a8f35f8f2e9fcdcad7d405
-DIST kcron-17.12.0.tar.xz 1054724 BLAKE2B 6fc9971c76e7bb32bbe1730851eb34f58bce44cbf266af883221fa3059e330d7c8177a4f1d222807ed047bf98bcf790fd5ef1b4a11f1b569999ce911204d8a62 SHA512 9f7a83a68c10fc3487708d9f7448eb89be8db7c76aacaa318a34b4b7d5857182f38544e3cf3b81a1936cd11aa30adf0d41dfdb8f104becd64180286c4915d1e9
+DIST kcron-17.12.1.tar.xz 1054760 BLAKE2B 4e40a69f49d0250420460c764a589aba9a5dbf04936eae131a5e1a5f23cf8e1a20458ec58f7ff5343a997544d2d351741f4451d25adcda2a853ce8b3edec3ede SHA512 cd3faf1cce88bfe81a64b844cbf4b1939d6f2fc3d52cd0004f3736a6ff558b143024f3288f1b05281441cf1ca3aea4f4638f66748d4e28fbd111e5e0f182a694
 EBUILD kcron-17.08.3.ebuild 559 BLAKE2B beef6ae83f205521402d68f19ab15b21eda3ef861898d7802328d930599e6fc9bbae3e02fd531692e3a81cf76b292d50f2342920fc48dad38a72fb54a54b0e17 SHA512 e07ac5a2b342a53c366724296d446c9321170ed2a048e28f4195e73625dbaa33f94b5f76f3f92ec1e6c18573321b25d457cf52afccb12e15dd57c0aa0fc6aba0
-EBUILD kcron-17.12.0.ebuild 561 BLAKE2B 3866d022b1095226629c0846a70e98579248bc6a0fc547c5b49bc0301b9bd8b6d760dca502d300989a7fa8124f7de059dbc51f4c425e06208b7fc7b950287b1f SHA512 3eab55dea5964ea7e06b354d0d06020df795f756a19388346eefdbffe430e4af9c8795c9c3b23707130be02d17dc0f00369a998b22f72f9e462fa14cbdad46cc
+EBUILD kcron-17.12.1.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-17.12.0.ebuild b/kde-apps/kcron/kcron-17.12.0.ebuild
deleted file mode 100644
index b3abd110ded2..000000000000
--- a/kde-apps/kcron/kcron-17.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!prefix? ( virtual/cron )
-"
diff --git a/kde-apps/kcron/kcron-17.12.1.ebuild b/kde-apps/kcron/kcron-17.12.1.ebuild
new file mode 100644
index 000000000000..eb1f317ce6db
--- /dev/null
+++ b/kde-apps/kcron/kcron-17.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Task Scheduler"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!prefix? ( virtual/cron )
+"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index 88cbadb9ab2c..7b6ee12e98b2 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-17.08.3.tar.xz 37856 BLAKE2B 3060c76de7a286ed71468a961e887f7b1c31b7beb511485495cd862e5d7d06ce7bc3d5661b48f97dea481883eaca82eece8f339b742fa5c9fb4d13f265c1507e SHA512 07b39b5d9472041600d11711b861c532af3882e6c554346c58e5fb5d1a3ed79fee44ad1b9e3076acad55ae98b81d0a580f81ca2e2bf5d7caf7677f5e2b02b706
-DIST kdav-17.12.0.tar.xz 37808 BLAKE2B 42613b98bbc009178bf6ef2f922c3f01c5bcde1896b92f014dd26917ca837fefaa6b26a153283034ec87e1cb7fcd354868b801044b599a6cd9508af603eb4be3 SHA512 c8468563bfa4e289fe3ca91e644ad4c1768d527499540bf3d5e0226c7ede5c3f008f2f71fdf634a4c21a0962af98ef653b34db2e55c6c9eaa4cbd77b71450cbf
+DIST kdav-17.12.1.tar.xz 37800 BLAKE2B 65798befca6e13e99a13c3e874c1ad59538417a0c604644bd2b2f96b4484cd66da747d23ff7a813a27eb898ba455da66c9b45e2d02c4ef9075f6d3582c9cdaf7 SHA512 2e63a6992dfc9dd8d9695e831a417b0c1386a83f6bbec8744318db614104c9ab6b9560ed5c8fa19ed7711a5057fabba5917e2a05d23fb4f6d3b15590e1844c3c
 EBUILD kdav-17.08.3.ebuild 603 BLAKE2B b240641f40623aeb9b486301e409085696aae5101625b5e868310b6659d326619284580ad2c3023da618fe8a38e16b430d798f466f76f73625d140185f45c7e5 SHA512 848f3fb9a0e6c0f88cdc7b10b7d825fa15f77793220ca723c57450c282bf5ccc0b4963bebeeb6c80e65b49cfd2d1f9ad1a0d2775bf3fa8135576ce687742a607
-EBUILD kdav-17.12.0.ebuild 605 BLAKE2B 7894a32aa5529a2d1d5db4e35b8a7186552e0aad59605202c0c08b5b100feb9f6a81d4f24627c41673a6007334618acddce7fc3739bf8e3029c531dc28a61704 SHA512 e9a62341713adce69000384350a5612e646d89964d1c1c63828e0514ea9035d0c7bd7d31656739c0f6c60e7f545d71d91d96241fd648a640854d0800940f27a4
+EBUILD kdav-17.12.1.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-17.12.0.ebuild b/kde-apps/kdav/kdav-17.12.0.ebuild
deleted file mode 100644
index 287605ef4f63..000000000000
--- a/kde-apps/kdav/kdav-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kdav/kdav-17.12.1.ebuild b/kde-apps/kdav/kdav-17.12.1.ebuild
new file mode 100644
index 000000000000..4c5706c9bda2
--- /dev/null
+++ b/kde-apps/kdav/kdav-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# 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="DAV protocol implemention with KJobs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 3fcddb6aaef1..512141b4b957 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-17.08.3.ebuild 712 BLAKE2B 90622b5449159d050860fce6d4ebe8d8ef53e1c167aea664752efacc80a652bf5cf7a08d143d2d59134ff91666890b8d36c5b74c4972d8052792955d3d49905e SHA512 1e5de17cdab976198f54402cb9058f588facc2febc67bcf8bf6dd81e1881cbe2773259a3f22892568d8dd75b1613fbe2506cd5b23d4d0097f6359fc0280ff1d7
-EBUILD kde-apps-meta-17.12.0.ebuild 714 BLAKE2B 05f00ed1aa59f0e0bf374f37a5324370aab56e3989540c4c3e0f750d56246461c75c45155ce8030f72d1d87788f941fe40afa096aa6a050728bb665c80daf5de SHA512 f3609b266c81af1b6ae84946c53b36c510ef67f06059cd7498ffc47c7b9ceac7e5bee0d9ecc5d42aae5e24abff95272ff1fda22275a03f72ed4b8374997f02e5
+EBUILD kde-apps-meta-17.12.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-17.12.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-17.12.0.ebuild
deleted file mode 100644
index 58cf3bcb4a93..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Meta package for the KDE Applications collection"
-KEYWORDS="~amd64 ~x86"
-IUSE="accessibility pim sdk"
-
-RDEPEND="
-	$(add_kdeapps_dep kate)
-	$(add_kdeapps_dep kdeadmin-meta)
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_kdeapps_dep kdeedu-meta)
-	$(add_kdeapps_dep kdegames-meta)
-	$(add_kdeapps_dep kdegraphics-meta)
-	$(add_kdeapps_dep kdemultimedia-meta)
-	$(add_kdeapps_dep kdenetwork-meta)
-	$(add_kdeapps_dep kdeutils-meta)
-	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
-	pim? ( $(add_kdeapps_dep kdepim-meta) )
-	sdk? ( $(add_kdeapps_dep kdesdk-meta) )
-"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-17.12.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..e528dfd0deda
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-17.12.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Meta package for the KDE Applications collection"
+KEYWORDS="~amd64 ~x86"
+IUSE="accessibility pim sdk"
+
+RDEPEND="
+	$(add_kdeapps_dep kate)
+	$(add_kdeapps_dep kdeadmin-meta)
+	$(add_kdeapps_dep kdecore-meta)
+	$(add_kdeapps_dep kdeedu-meta)
+	$(add_kdeapps_dep kdegames-meta)
+	$(add_kdeapps_dep kdegraphics-meta)
+	$(add_kdeapps_dep kdemultimedia-meta)
+	$(add_kdeapps_dep kdenetwork-meta)
+	$(add_kdeapps_dep kdeutils-meta)
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	pim? ( $(add_kdeapps_dep kdepim-meta) )
+	sdk? ( $(add_kdeapps_dep kdesdk-meta) )
+"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 94640ecd48f8..da3be66297b9 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-17.08.3.tar.xz 315072 BLAKE2B 586840c3d77958eef54b3bb2e7fcd951e65f464d012430da44b95195ffed10b4db9beedd76566bcc7222f941a4885a6332f2c72f16b983974bd1166d932792b2 SHA512 53bcd3c17a52fb51065708b5d55b0465b652719d0a8f087f41a139d7f4b120bdee01cb61de296edc4d275a053762445cc51253f20fd7cfbd723c861658ce6055
-DIST kde-dev-scripts-17.12.0.tar.xz 375916 BLAKE2B e72866a46a847b4cff47c9ee7729b5e1489fed17c06de0ab57a5116437341960593e7863819fbd5b1e08bb3c2b0fed4336b95530f8d9f716c7bb55977a6ba201 SHA512 2ed88efb3f7bd986a89b062c81b57dd2cc118fd1d2dd24817b12be1a383eca8456fde1d96093cd38d7b4ce8e16e75d2df7f9afa500cfc284282d8c1f360678df
+DIST kde-dev-scripts-17.12.1.tar.xz 375864 BLAKE2B 1b56013514d77ef1c7e201d6a936d250cef7f340cc95ddaeba3e7a31608d089425f5b286439688e3239d069d9700bacc5c05bd97106db2b0508ae92ec94bfafe SHA512 04c85b1569791349ccd4eeb385f0d77cce6eebb0419adb968fdc63bf5ef491e6848ce3275d6da970a7022f790bfb9a172afac475693f1cec77eeba263bb75987
 EBUILD kde-dev-scripts-17.08.3.ebuild 557 BLAKE2B 859db3a3907eb8dca41f03dbc258ca0341f1f38654d1af083e469ab388d99a952164a72c5e1237f298d0cde77daa6b72e98c26bca8f4d3c2e2a59e1d78d92906 SHA512 fbd85b2edb6957e1837dcaf58ce8c34362963f09337444b55fa75887ee660d616a33ff62dc2fd89e24143dab268af917db57f5a92e285f1a3e2a778dbc6733d3
-EBUILD kde-dev-scripts-17.12.0.ebuild 580 BLAKE2B 1c9c9b4934a193ef21483d6bb0a51fdfc528361285b7f79d07e64aeb40f1241277309b3ffbab54effc6b227b7aa2f50a64af68de2e35640793cdbe711ea4b1d1 SHA512 f6098bb7169ca0c693422dc3c7adf29ac5d43a43c7cdaf7567415a46db381ab1a260431b036f710a20d4b07084c151c0103c768d13d6d082061b73f2849a226c
+EBUILD kde-dev-scripts-17.12.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-17.12.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.0.ebuild
deleted file mode 100644
index b51b28c5a6bf..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Development Scripts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# kdelibs4support - required for kdex.dtd
-# kdoctools - to use ECM instead of kdelibs4
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdoctools)
-"
-RDEPEND="
-	!kde-apps/kde4-l10n
-	app-arch/advancecomp
-	media-gfx/optipng
-	dev-perl/XML-DOM
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' CMakeLists.txt || die
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.1.ebuild
new file mode 100644
index 000000000000..8f878b4fe584
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Development Scripts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# kdelibs4support - required for kdex.dtd
+# kdoctools - to use ECM instead of kdelibs4
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdoctools)
+"
+RDEPEND="
+	!kde-apps/kde4-l10n
+	app-arch/advancecomp
+	media-gfx/optipng
+	dev-perl/XML-DOM
+"
+
+src_prepare() {
+	# bug 275069
+	sed -ie 's:colorsvn::' CMakeLists.txt || die
+
+	kde5_src_prepare
+}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 76bab699aeeb..4238ef29ad42 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-17.08.3.tar.xz 59156 BLAKE2B acb9960b82f31f0dda4b79786516aa617b0fd72a59bd4ead4e747eb2be90a01f9e9fdf33c11bef1a9d84d4c611856ac6a94eaf95a9ddb11592ebf4e6044c1e0b SHA512 ce44b082a572c86cb65ed745dffe53d282678327df41023e52aa7e1f50f007db286ba5ab37d2a99fa823a312e422dfbf3d40a412f8d98ad64a2e6e7499553113
-DIST kde-dev-utils-17.12.0.tar.xz 60928 BLAKE2B d9e79a7e0b6045f7595a1e4469db228a30616332c28738e8515d9dc3417af462c57e5207a7db765e8448c4852b9e07d80fd7ec38be7b8ec900486e3ce01c0f9f SHA512 18a7afeaa63459b98663ba63f113d5c7ef64c9205b55b78bcc5657e1d0be2347631bb184805170bac56ac960ebafbce9db9040c3e3317723bcd3f36ffbadd410
+DIST kde-dev-utils-17.12.1.tar.xz 61060 BLAKE2B 29eaa0b205781da783ae858bf92e793b03b62ded1c40259e3c68d903982222289ba6a5f4d3174874acfa0113e81e93f550d9330cb4c9ba29084c829a9bf8e853 SHA512 e3f76adbe43c4c2a9646bd46c7d65e7b5decea9a2caceee362e8327fb6e4b51573e5cec01fc3032e92dc8a7b64355e8d2aa22c5ae0536eca5bbf1f0f7ebdfc28
 EBUILD kde-dev-utils-17.08.3.ebuild 646 BLAKE2B 9b208add8c2c25a66ef52bd5cc9cb7a71d9ca290a2488752f0bb4e78697fec198990f348e04e77c28c7f406b93da380fc5f6d54db872fdc5b9968dc8ba8ec488 SHA512 1173ff6b8c95de095696a4b770a03981410316b3b94bc39db2555c01b69852f1de9046f54a3cbec75f8bd1db2b78450e7caf8d872a1112393fd079de72c3a6e8
-EBUILD kde-dev-utils-17.12.0.ebuild 648 BLAKE2B 96dab13cf52a09b1f4ef1c37ded865f0d43ba5a2ce7da689eef1e350ac5ce97820e78800bc97ef0be6d31fecfd4a7e202fd6cf64ccdab892090f2d843e4395c2 SHA512 b3f108c4c3ac6d030f16719d8f07320af7686711377671d0e86abb7e4a947deec72a67b021dd1daffca78e2ab1f5338bf972e5b781fed69d582912dd0751ae72
+EBUILD kde-dev-utils-17.12.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-17.12.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-17.12.0.ebuild
deleted file mode 100644
index 9387e97aca20..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Development Utilities"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-17.12.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-17.12.1.ebuild
new file mode 100644
index 000000000000..fd428260d4a6
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Development Utilities"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index 9f40d9858368..a6925554314b 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-17.08.3.ebuild 323 BLAKE2B f20e3cbb8d67900f627a252356e82e0155fae8bc56eb8538d7091fff077fe1f68c081a57fc49278ee8c9670d6e727c7adf91dc5638bb368d4664e7b13d41f0d3 SHA512 f458ccd9852d5a06ce01fcb9ae4168ef1e716a14532e8cd84a53f489b0c9f740d5dc1a8b548b89697086467cc355e5048c57ce3d492971b67c70e78395f04680
-EBUILD kde-meta-17.12.0.ebuild 325 BLAKE2B a075f5fe4462379d0370c5d02ab83edc44c36833c3328930f74c2d866a96b692a1c5c9c761302cb299d347d5020c7cfa139ebdb003dc3b356691a8086fe6f753 SHA512 77b4823178b8c336b4a058cf3dc8f8c512be85f2e616d79e44946ad83550c1773bc806df098130f6fb22313c3e9f97dad5b7ac0374819d8079d93ce4fbd817ec
+EBUILD kde-meta-17.12.1.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-17.12.0.ebuild b/kde-apps/kde-meta/kde-meta-17.12.0.ebuild
deleted file mode 100644
index 7f258031a0d6..000000000000
--- a/kde-apps/kde-meta/kde-meta-17.12.0.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 kde5-meta-pkg
-
-DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kde-apps-meta)
-	$(add_plasma_dep plasma-meta)
-"
diff --git a/kde-apps/kde-meta/kde-meta-17.12.1.ebuild b/kde-apps/kde-meta/kde-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..e986cfd70609
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-17.12.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kde-apps-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index f347c068c06c..679086876ef9 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-17.08.3.ebuild 503 BLAKE2B def9f8e3733788910cb7aa3ec2fa322e4df3a0bf5dc538e433acb2f54cb39e5fcf253ce02a09fee3cdcd7d661f0deeccdd69b75d3ebcccefecdd0c71146237c8 SHA512 f48746c98faec2549558d1c88bb4a88077ab24d3ebffc8e8ca1bfcea43d5cc150953ef0e2b177c0669b8de333ed6f39c8880dee6bef38bc05725b190473924a7
-EBUILD kdeaccessibility-meta-17.12.0.ebuild 358 BLAKE2B 5a8578f58d4ad59faee22b709fcc619a8d175de12b52c074e776f2acf86ad92c20b85ee51f9ebc0e18a6f783edd4bb947d70e38ebdafed96a96660b4623499eb SHA512 4180f6e8f6e13ac728af7330696a68ec2c0ac988c95d873cd62c8fac3e87510351aeb10194b640fcf6ba2ee5c34dda8f00089c5d4d4423fe8c7b7c33d07c1c62
+EBUILD kdeaccessibility-meta-17.12.1.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.0.ebuild
deleted file mode 100644
index 78dd913060d0..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kmag)
-	$(add_kdeapps_dep kmousetool)
-	$(add_kdeapps_dep kmouth)
-"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..f9f04c8582be
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kmag)
+	$(add_kdeapps_dep kmousetool)
+	$(add_kdeapps_dep kmouth)
+"
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 14260109815c..f0194f93a28d 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-17.08.3.ebuild 346 BLAKE2B 32e1d3349fdc87a7c05359ba7074646a8366ee6166e2b029474cac32344674dc452a32048919e429a491b6c5dab5ca758ad1d63f58b848f81b78a93bc09859ae SHA512 0770f04b564530b32fb51cf92c4ccd98d1cdab217dc5cb2a384768489b5d493082d70aef016f0c69ce372d320fc873f35316db21da5917465e3e2aed5ca09d10
-EBUILD kdeadmin-meta-17.12.0.ebuild 348 BLAKE2B 9d9ddd5cbb3891577462d66020878824fdded36904358330f436f65cd75ac789f394efd2853d3083ea931d4f192e2b95388ca5c7d1dec60790191f40eb5ce5de SHA512 013597961b541db2b6c707a7c6e77dc59026ced81af691b29b7b4d08e7778daa2b5ce63c6484aa450f7e35e2dbcfc5e9b41d92513b343bbea4f5fd4162f6b4d7
+EBUILD kdeadmin-meta-17.12.1.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.0.ebuild
deleted file mode 100644
index cf7adfe385df..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.0.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 kde5-meta-pkg
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cron"
-
-RDEPEND="
-	$(add_kdeapps_dep ksystemlog)
-	cron? ( $(add_kdeapps_dep kcron) )
-"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..d87b170fdc44
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cron"
+
+RDEPEND="
+	$(add_kdeapps_dep ksystemlog)
+	cron? ( $(add_kdeapps_dep kcron) )
+"
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index fba7862f6714..5497e026a807 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-17.08.3.ebuild 327 BLAKE2B acd82c827b3e0c629d4fd1b2a037f92bc996a4664b5fe3540ae77e8975118caecda6b754de52ee481f6df0f7807ae388bb5c847d6c120725d2c020aa6f1bf05b SHA512 038909e0068c8fb6ffefded7c1c1bd682836d4e0d35c6c2685b7c8c20064b33b2cbbaae62aa238b79eba68fc36a3eba7d68985a67dd937b6c3fd11e4061c47a0
-EBUILD kdebase-meta-17.12.0.ebuild 329 BLAKE2B f5007df1dd1aa5c5b755a8f8cbf2debfb3ca87e1f29ce5ab8f06e07aa4f2c9a9417e5ae1cbebdef8191123c30edf2793077c8553800ff08200b6a21a718c17f3 SHA512 d627be8c1f7f985b8f4b845fb9a64b8683ea81cd7e2c9012f3db53a9ae78ecf7d823cb859a369654e903097fd298a4b11f1100060f60d3ff57fcd4285a1c329b
+EBUILD kdebase-meta-17.12.1.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-17.12.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-17.12.0.ebuild
deleted file mode 100644
index 0f02605d7e23..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-17.12.0.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 kde5-meta-pkg
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_plasma_dep plasma-meta)
-"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-17.12.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..37f06d26788d
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-17.12.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kdecore-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 4625d318a313..536b362f7614 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-17.08.3.tar.xz 47608 BLAKE2B 4576bd143a5c3210a68f7f40a11ad3cbabc782c9599e572f87c4d635eeb3749600c4ee945477c1850ff923979ec248279e3aed10223581e4e4a6c6a132cdae8c SHA512 4ef137527c16c57d8cde676c58be1eba7d150e60007e49ef11278b1df2ce88da92379aa19741123976326586557061fc486e1cd96b04072d9abb4781f0952325
-DIST kdebugsettings-17.12.0.tar.xz 48632 BLAKE2B f9ae0dcd02c8f9e4ea39a41a35099e38e6458137301f3fa0356452f1c1b78e4773936e839a0823a1bba06a8564555888261c2982a5f0ef27b010590d745e0b95 SHA512 f5eb734bc834d72d239157cec76aeb82e625acb0e6f52ea3bf30019ec60188ba9f63756f95e7914dd8ce3581f96f8d9d48266f745ea2874a1d2a80c9c7156a55
+DIST kdebugsettings-17.12.1.tar.xz 48748 BLAKE2B 1fc244e4aaad517cabd423aee3957df8df1d619730e97c44a825b6210fb8de0d12365a9f15d650c2ce1095fcb08ed62b830838ecd17896a4a4de002f860f1eff SHA512 45068aad442b8a5169c2f2eb4643589b9dc94de72ac66f312dd33a28e7fbc55aa47b7e6ac64ed276d7f5b3ba2b4825e541a8f35552047c985052d1b201075861
 EBUILD kdebugsettings-17.08.3.ebuild 595 BLAKE2B 3148e3fc838c209d805bf1784af89502a5212575c9ed4c726e53d2d52c4e92747899695b99338317c6d31823ef79e87de93e45eaca7a85a627e13e1cb69bd330 SHA512 058a78d3f9e2086b8e43b229cd098a1414021eaf8c41bceb40ddf1296d3c81aca770aa004626e7cc2faee6792a7463da2e33367eab5076abc600f7f117738dbe
-EBUILD kdebugsettings-17.12.0.ebuild 597 BLAKE2B 4ce330a8068d922b1a0aee0682b543a02851434002cf160e53b272af615d7f3f7d2d821ff8fb8640d9876fd15bd903128ffeb55839770c9e357b77bb54fa5d40 SHA512 5903be285d35d649fe1d95806ba6027d61dd25e69afa3736e15064a9ef4cc1eec396ef77169565c0efad925a5e7c410725030bf04b726793eb7837b613eb2cbf
+EBUILD kdebugsettings-17.12.1.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-17.12.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-17.12.0.ebuild
deleted file mode 100644
index 6cd953689ef4..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-17.12.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-17.12.1.ebuild
new file mode 100644
index 000000000000..e53b5a97cb69
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Application to enable/disable qCDebug"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index bc600ca8f8f3..04c4155af0b9 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-17.08.3.ebuild 539 BLAKE2B ad34b0c4ea24c811fa6bb7b06d5ec130c7d86901c5249d17891a324157199a9177cddd5c1ebd931f16389a8c972d98a120712f55971feb4e9222ba5e74452e6c SHA512 3e3f95d0abaa24cd31a3e6def56e70aa4c5ad42ec0d237087503aa81f953c40bd1e2801170203d2fa2571438800207da732e1a5f88bb0e8c5cad91fb7f111b5a
-EBUILD kdecore-meta-17.12.0.ebuild 541 BLAKE2B d6b1d6ee2efdff7519fae1048397d29fb7a1c48156a7778a8b97fc42b7e180a2fe658ccfb506306c3f3150ed6fede3906645ad1aef5c88c0cd668972a22269e1 SHA512 1df6fee8a1652f6a4eda9533d056859987cd0c1277f37281eb4e8b969366fb912e303920fd7ccab5bdd6e3707ca457406976b5d9e89fe2d2870baf153e887ac2
+EBUILD kdecore-meta-17.12.1.ebuild 541 BLAKE2B 1649d298ac26bc6d3091dee711adf0aa737baf602c4290ee7a1000c37674b5170db4658af5e043bf95959eb4319522a2f65149b94f22b74e43f01cddf9754971 SHA512 995f4c80ccc6189bd4b9cf33ed88952b81dc0e9a9a1e4991e409521ac675b23ae51d0ecaf04b5503fc19151125466d64ceed6b52eb828f51f65e7050e8dbfa7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdecore-meta/kdecore-meta-17.12.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-17.12.0.ebuild
deleted file mode 100644
index d341a4b1f3da..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="~amd64 ~x86"
-IUSE="+handbook"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kdialog)
-	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_dep kfind)
-	|| ( www-client/qupzilla $(add_kdeapps_dep konqueror) )
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-17.12.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..bc5250ecc206
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-17.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+KEYWORDS="~amd64 ~x86"
+IUSE="+handbook"
+
+RDEPEND="
+	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep kdialog)
+	$(add_kdeapps_dep keditbookmarks)
+	$(add_kdeapps_dep kfind)
+	|| ( www-client/qupzilla $(add_kdeapps_dep konqueror) )
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kwrite)
+	handbook? ( $(add_kdeapps_dep khelpcenter) )
+"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 2f76c2d6db58..af88b4fc74e7 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-17.08.3.tar.xz 327840 BLAKE2B db72afa12ae1b66b259f6c2267a5d5fb336b010c21e27e0f74a4fa2f368b41208028ee7fb2bf96ccbabd341b9ca264e2d4f240d72b89baf878c17bc3f6cf77a0 SHA512 f90657e46aa547c5faeaff71fe37498317ad30eb51ec1cf2de57c64f7713f4519a2991be343b6b54ba5cf0572ba598784b3b34f2355b8f2fae8343b2e5c2476f
-DIST kdeedu-data-17.12.0.tar.xz 327756 BLAKE2B 8df0ce7bc04d9d99d42e9f58acbb29fd317c86b0ea7f8b9c9a557705e04fedba35b3974e56b4ea1ab940d14714637d8f92d283cf705a943b8a97842b941adede SHA512 00f5603a2a5044d2e962f9ea454382bc2a1f5ed10a4921425d0460d96ec90f34a7a4c98b711a9a2d40f246c4735cb4d2c3324c72ea4a7163a68dd45c8885236b
+DIST kdeedu-data-17.12.1.tar.xz 327484 BLAKE2B e7252d0340d321f9c807ef5ddc66f4439e679376bd83c4298affaed80767aa087b0eeb182f6958ca5e8864d06644bf25fbc9a3aeb1de3d1217f4b91a4e5c8043 SHA512 514e0c0bb7e26e9ebb79d35feafec986a409e05ef2d567e6b21d340893ca4e8429e6ddc4cecea8b41c860ee0378bb17e3a249ca2ac6169d7377a736bc5d5625b
 EBUILD kdeedu-data-17.08.3.ebuild 410 BLAKE2B 93fe9cb8626fc9c40d9e4e61d4a03e0eda2459c5b6661b075f107a02a6dba759a35a5da18f7fbcb933d5d5a1a4059997d82bb1ba526c2378224d886a2a6fae10 SHA512 2c441b1c9bec231281d8421d698de75389ec86c81c59e64fbb967188d6f71290fcf7fbfa2bab284ec2ff7d54bf44720e486ddbb8bb82f738083b68268ce3bc81
-EBUILD kdeedu-data-17.12.0.ebuild 412 BLAKE2B 4c8d6f4125ef3b6b1c10d1be5e0cf1471f811d487cf8bfe76bffcf53d6f70eccdb7fb24e3589c53b8352ed9217640f316cc4b34ce510fe23b7d90f841fe9bc71 SHA512 3d8f252b6a0f78b57b29cfbe97e046bd30bdffbbacf19c03aedd1420f08072a57bbcc2c51b27c63ba405f886f80d89b44c93bcb8c20c983b02810d3079f235c1
+EBUILD kdeedu-data-17.12.1.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-17.12.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-17.12.0.ebuild
deleted file mode 100644
index 55fac9a2dcee..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-17.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="
-	!kde-apps/libkdeedu:4
-	!kde-apps/kde-l10n
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-17.12.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-17.12.1.ebuild
new file mode 100644
index 000000000000..0209c5857d99
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-17.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="
+	!kde-apps/libkdeedu:4
+	!kde-apps/kde-l10n
+"
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 32a67cca63a7..847c248c1797 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-17.08.3.ebuild 1042 BLAKE2B 793b9f981b52bf639d5d28d24af516a7c5404166e0d4376b5c75d44ee4a78e28bc8c813d732abc80fe3af3bd45867041e10a1c628c72febefdde19faa225ff49 SHA512 fa829dbb81b38014d4df242c600f1e25ac86e80059fc85100bfa72455c131f94246005f82a9c86106d23218772337d0bfffc201d726eedd8223bfb6bc6618319
-EBUILD kdeedu-meta-17.12.0.ebuild 1017 BLAKE2B 45c1b9daa03b3cbbdb43ef7fa59426fb28968bf1ffa66d25e9dfca9f9403cb53d6327ae52306f255f6e0ede08389aa4abe1d487aa6909590393a8a493ff4357b SHA512 483bcdbdc569a98005a297d2a2bc7563559bae9d312127833dfaba77be66b9bc1524daae804cccf077fe25fb7987f4bc31182ad915defef998fdfa94d0982278
+EBUILD kdeedu-meta-17.12.1.ebuild 1017 BLAKE2B cb41e7b402027cd2fd455167d215535339a430f8ebf28bebd5f3461cd4260d91d7da9469e1b92af9d725cfd6a6699d8b7cdad7bd91cb0e8072c2ca1a82afef7b SHA512 505e04b53185a81498d8c1de9c8b259922e74fd04955f8c3cd21f2bcd7ceeaed1fba1c42c53287023f69c2bcb1438f51fcea7c5987ced440d40eb7ac818554d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-17.12.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-17.12.0.ebuild
deleted file mode 100644
index 827fe2b56d4a..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-17.12.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 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-17.12.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..5dea5c430d3d
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-17.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-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/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 2994b871ba9b..b3eced86fde4 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-17.08.3.ebuild 1662 BLAKE2B e04236092a272a2e1f5a672001b177eaa002af9c470b4500a15baa8ab6bcc3d372d740cf104edabaf55027a7d7c7c3af248d5a9b16fb2eb82420b08588f3d1ef SHA512 9ff8a6606774e1eb0d29c90380843566d226ce607e253a05c06a1af54badc7e00ba79691bed229315965b5485b8b40f0a97b593654462b793ac2e1449e9158ad
-EBUILD kdegames-meta-17.12.0.ebuild 1514 BLAKE2B b40669d15d0d2ef6efe884ca50530a5e781e9d8e25abcfc4e43722aded9b63f81fd5ad8331036f6e19fb9c94ddeb28687686a95e0fd4d305a44781d2f911358b SHA512 9d76091dc226e69b95a7f649395cc0b709cceffd64deb9761eb61a0eb5d8d1e15cdfa02e1d08132fbf61c50ffb1643c2d62d1ac0c49224df31dfab7f4a4c605e
+EBUILD kdegames-meta-17.12.1.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-17.12.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-17.12.0.ebuild
deleted file mode 100644
index 0e5e3e89f64b..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="https://games.kde.org/"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl python"
-
-RDEPEND="
-	$(add_kdeapps_dep bomber)
-	$(add_kdeapps_dep bovo)
-	$(add_kdeapps_dep granatier)
-	$(add_kdeapps_dep kapman)
-	$(add_kdeapps_dep katomic)
-	$(add_kdeapps_dep kblackbox)
-	$(add_kdeapps_dep kblocks)
-	$(add_kdeapps_dep kbounce)
-	$(add_kdeapps_dep kbreakout)
-	$(add_kdeapps_dep kdiamond)
-	$(add_kdeapps_dep kfourinline)
-	$(add_kdeapps_dep kgoldrunner)
-	$(add_kdeapps_dep kigo)
-	$(add_kdeapps_dep killbots)
-	$(add_kdeapps_dep kiriki)
-	$(add_kdeapps_dep kjumpingcube)
-	$(add_kdeapps_dep klickety)
-	$(add_kdeapps_dep klines)
-	$(add_kdeapps_dep kmahjongg)
-	$(add_kdeapps_dep kmines)
-	$(add_kdeapps_dep knavalbattle)
-	$(add_kdeapps_dep knetwalk)
-	$(add_kdeapps_dep kolf)
-	$(add_kdeapps_dep kollision)
-	$(add_kdeapps_dep konquest)
-	$(add_kdeapps_dep kpat)
-	$(add_kdeapps_dep kreversi)
-	$(add_kdeapps_dep kshisen)
-	$(add_kdeapps_dep ksirk)
-	$(add_kdeapps_dep ksnakeduel)
-	$(add_kdeapps_dep kspaceduel)
-	$(add_kdeapps_dep ksquares)
-	$(add_kdeapps_dep ktuberling)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_kdeapps_dep lskat)
-	$(add_kdeapps_dep palapeli)
-	$(add_kdeapps_dep picmi)
-	opengl? (
-		$(add_kdeapps_dep ksudoku)
-		$(add_kdeapps_dep kubrick)
-	)
-	python? ( $(add_kdeapps_dep kajongg) )
-"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-17.12.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..85eb713ba0f4
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-17.12.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+HOMEPAGE="https://games.kde.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl python"
+
+RDEPEND="
+	$(add_kdeapps_dep bomber)
+	$(add_kdeapps_dep bovo)
+	$(add_kdeapps_dep granatier)
+	$(add_kdeapps_dep kapman)
+	$(add_kdeapps_dep katomic)
+	$(add_kdeapps_dep kblackbox)
+	$(add_kdeapps_dep kblocks)
+	$(add_kdeapps_dep kbounce)
+	$(add_kdeapps_dep kbreakout)
+	$(add_kdeapps_dep kdiamond)
+	$(add_kdeapps_dep kfourinline)
+	$(add_kdeapps_dep kgoldrunner)
+	$(add_kdeapps_dep kigo)
+	$(add_kdeapps_dep killbots)
+	$(add_kdeapps_dep kiriki)
+	$(add_kdeapps_dep kjumpingcube)
+	$(add_kdeapps_dep klickety)
+	$(add_kdeapps_dep klines)
+	$(add_kdeapps_dep kmahjongg)
+	$(add_kdeapps_dep kmines)
+	$(add_kdeapps_dep knavalbattle)
+	$(add_kdeapps_dep knetwalk)
+	$(add_kdeapps_dep kolf)
+	$(add_kdeapps_dep kollision)
+	$(add_kdeapps_dep konquest)
+	$(add_kdeapps_dep kpat)
+	$(add_kdeapps_dep kreversi)
+	$(add_kdeapps_dep kshisen)
+	$(add_kdeapps_dep ksirk)
+	$(add_kdeapps_dep ksnakeduel)
+	$(add_kdeapps_dep kspaceduel)
+	$(add_kdeapps_dep ksquares)
+	$(add_kdeapps_dep ktuberling)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_kdeapps_dep lskat)
+	$(add_kdeapps_dep palapeli)
+	$(add_kdeapps_dep picmi)
+	opengl? (
+		$(add_kdeapps_dep ksudoku)
+		$(add_kdeapps_dep kubrick)
+	)
+	python? ( $(add_kdeapps_dep kajongg) )
+"
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index b388eefd3181..1929a5a12238 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-17.08.3.ebuild 765 BLAKE2B 50833565f18ef2ace1543407edb5bdfad32c56a920a4d3e3d6f28bced87b680afaf2854f8170334ca7660048d94fb9a41122c27d478ecd2c0e230ee9d34039c3 SHA512 fa3f080116ba26cab77803acaabd3f0ee4a4aaf25ea975222c5edb7b19e48e60bd501f6380fd98fb502d934d34b39298cdfde05336f6e07252647473a9c2d91a
-EBUILD kdegraphics-meta-17.12.0.ebuild 767 BLAKE2B b6a55d50bda05168394ac9b14c24a476d71db79dd230d0f6926c07f4b566e0702c4a05b78c4ad9e281c720c2a893aa9af840af5b570b4d17ee12f4a411893478 SHA512 020b5bb08819267eed560a24f3e244ddb76c709d2299bbdf61648cb0c79a864d92045e765c5b318a9bf1bdee97ba654454c60fef0bc29fb639c9a2ea7fe8b719
+EBUILD kdegraphics-meta-17.12.1.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.0.ebuild
deleted file mode 100644
index da0d1c951eab..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="https://www.kde.org/applications/graphics/"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_kdeapps_dep gwenview)
-	$(add_kdeapps_dep kamera)
-	$(add_kdeapps_dep kcolorchooser)
-	$(add_kdeapps_dep kdegraphics-mobipocket)
-	$(add_kdeapps_dep kolourpaint)
-	$(add_kdeapps_dep kruler)
-	$(add_kdeapps_dep libkdcraw)
-	$(add_kdeapps_dep libkexiv2)
-	$(add_kdeapps_dep libkipi)
-	$(add_kdeapps_dep okular)
-	$(add_kdeapps_dep spectacle)
-	$(add_kdeapps_dep svgpart)
-	$(add_kdeapps_dep thumbnailers)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..bff71a679d37
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+HOMEPAGE="https://www.kde.org/applications/graphics/"
+KEYWORDS="~amd64 ~x86"
+IUSE="scanner"
+
+RDEPEND="
+	$(add_kdeapps_dep gwenview)
+	$(add_kdeapps_dep kamera)
+	$(add_kdeapps_dep kcolorchooser)
+	$(add_kdeapps_dep kdegraphics-mobipocket)
+	$(add_kdeapps_dep kolourpaint)
+	$(add_kdeapps_dep kruler)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+	$(add_kdeapps_dep libkipi)
+	$(add_kdeapps_dep okular)
+	$(add_kdeapps_dep spectacle)
+	$(add_kdeapps_dep svgpart)
+	$(add_kdeapps_dep thumbnailers)
+	scanner? ( $(add_kdeapps_dep libksane) )
+"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 86606bc2381e..0282c39ac4db 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-17.08.3.tar.xz 13440 BLAKE2B e8d9bbe8e17b54ef82bee84b0c1c59f570f0fd9ddd206ad8f3d399d9e148e0dec2910ce6a6a597e3e3df5265428e4e9432d6772f3334a6345a3d70fd9b27a228 SHA512 71fb97d159963c817c0c898f3c8e6aa05b37ad91f2f95f2e967aee624a8a747cb870dac273aabcafe090f66293dc1f0083617a0587a08ec41923d689f317a3cf
-DIST kdegraphics-mobipocket-17.12.0.tar.xz 13436 BLAKE2B 60cf4880ab13d0a9590e942280b25ac158b517d18dde41384f43c9bb80c1d676836a0c3b9b07a085b27a302725963777e13dc5402ed83e78457b0d498c730aab SHA512 cef86c3d38a8e3c27f4f323c34418b55e4145d0c8bfcda1255e1e55c0ef7e0f1ea661d8c42f5b888c39ecfb0927258852f5c91d5908f9c35ef1f396407d7e879
+DIST kdegraphics-mobipocket-17.12.1.tar.xz 13432 BLAKE2B 3ca30f450e75c6adeb47f464a5d79b89a0cdf1ed4af9942be6bf4ae3f077b7c34f12eb5c58490ada28988bfc61d7e56bba21806539660a3087dc63d47675196d SHA512 6606e9a6fefb9f9d3972e34e44150cca2b0a3a124bdc3de20accfcf1f8fa873cfd9d77526498a821812effb94ca5a5e1e23052a49227c408bbbf203247ed976a
 EBUILD kdegraphics-mobipocket-17.08.3.ebuild 422 BLAKE2B 74cc416d5c8c6ab2786d029eb92b64398ace3cf7a0ab3c4516bd45ee08c6c6204383b9cf6c6f43623690dbe7cfe9b6808ec84594d3813182dc1aa3dcdd29b873 SHA512 05cc7d81e16a98b1de34110678595a3a027a30c05bd209ae172014a5c630781bc713fbd89d7dd2a282e222980169b9e28004fbf24d5235ad93305489c8f6f9d2
-EBUILD kdegraphics-mobipocket-17.12.0.ebuild 424 BLAKE2B ca7a3a7dddd780f7dd8273cecec3a7b0341ab15585cd09b269eee3268e8a3d35931298c711bb25c12b27bf788871ed32205f8bde51aa0e029ffa739380129728 SHA512 fd5dabb24fb401cc3d2b085ebc01c01fbac2ed698370cdf7a0b4f6bb129efdbfd409a610fa22874be0d6e1879839ac64bc3bac9aa4d4fb47b00300b27dab6aef
+EBUILD kdegraphics-mobipocket-17.12.1.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.0.ebuild
deleted file mode 100644
index 2104996199b3..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="~amd64 ~x86"
-IUSE="+thumbnail"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	thumbnail? ( $(add_frameworks_dep kio) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_thumbnailers=$(usex thumbnail)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.1.ebuild
new file mode 100644
index 000000000000..ec101c11b41e
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library to support mobipocket ebooks"
+KEYWORDS="~amd64 ~x86"
+IUSE="+thumbnail"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	thumbnail? ( $(add_frameworks_dep kio) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_thumbnailers=$(usex thumbnail)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 55f4968b9963..60fd6d864784 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-17.08.3.ebuild 831 BLAKE2B 6e255c70501d8b9b33e2575f68060fee6313e1f8e3f4845614fedd31f61c380219ed92cd8e4a83d9df7b20d8c2283c5e90af683da536258d174d09e126693e37 SHA512 5ef408e03cf49a660e07d73155e1c7623752c5032211f68d034cd7b7849c5a93d98b7b6d1afe2a01b8d3ae1f5c547366d2b806f9fcb8dde46384d30b118ee554
-EBUILD kdemultimedia-meta-17.12.0.ebuild 685 BLAKE2B baa0ba27802e90837637c4c631826a36de60dc3c514c3d3e7c49afce871e3fadd7e5fdc93146dead14d22cfeae31f69b3be376f4b8c1c6edc4725b7b7ae36a29 SHA512 4f563e5a63219e769e6b5ee9e6fde50fa78bfa42b9b93e66dd838c24b6aafa14f2e36f7c9a6f9ba01a79b6ee72b663a680b7521ea07be7d3821fdfeec94e080d
+EBUILD kdemultimedia-meta-17.12.1.ebuild 685 BLAKE2B 86449e33c46e8e9e1281c1db3e15850b6d4d63f814121c52f22e794f40b2f6f8cf7a80a8496f7bbb03a7996c757d72a609fba7611f52ec0cf51b2f24f112af64 SHA512 1b0bd9a22fb04c04486a59b1c7e460efc0289c0fc0ef4b4bbbf767c55b492f797bb701a30ddb1bd82e1f3fcf677d9e71c5966506dea36e41c6c37dfcf449d585
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.0.ebuild
deleted file mode 100644
index 09627a60c268..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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 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-17.12.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..55c79e33e88d
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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 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/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 85e2d17fea94..b8d37315b9fa 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-17.08.3.tar.xz 323608 BLAKE2B 2abe40624c9fd454638f43bc414eae3df5184aa7b965cc2c78933855a72b2efd83541b24b3703ce2ecd50a74b3ca0d2acc81dc4e550e82c358abbeaaa6bb2726 SHA512 8d29059acfaccdac6e67521b619e352d383dc37a0f668a0499b9574910464aa6ee89129c442689ae600be8aa4916f56e52168969c7774504818c84fd56a1658a
-DIST kdenetwork-filesharing-17.12.0.tar.xz 323632 BLAKE2B ccc2b287105130bc449b5a97415971770e8d2d1276e803d73ab6c3429031e54fc25bd592617dda288d067525e5051d2bfd24a3da111bdbc6ffffa49875fb2057 SHA512 b8a75b23fea0ab55c40283e85eb1c9606416a4a21a4ddf361af8d475a388f036fa63fa77a5892f63641add23bbf7f416addcbef5f3e47aaf35830cf1b3e4eaa0
+DIST kdenetwork-filesharing-17.12.1.tar.xz 323548 BLAKE2B 081cdfa40978a19f8b897cd2a173779031d681f1aedf508a45e79b7ab2f7e76690dbf1837c24f78f6098b594d602b60babda4278a886511a61019d0da4f116aa SHA512 657eaa81b6f6b11b53329e7924ce8937b08faecca568b2f896f0e52d7c1fab8c921a2e080aa3e6daf934ac877537db485b52bcc68e0089f35ed7aa3f97d5cf46
 EBUILD kdenetwork-filesharing-17.08.3.ebuild 572 BLAKE2B 17f26aac125edf3c4cb70d9533416c8ddf8dc61087a79008e2480be5988573666c401d78d5a1b07fb29299e0bd6d8e2d6e739c32f16f34674796d17f94831f2d SHA512 b43a49627b6fc97fba3479b53b754afb25fb4fe8f31d0a4e83328b52b340799c6835d7147aaccc5af624f4bc2923fef7c97b45e06418d747d36ffe5f77b8a637
-EBUILD kdenetwork-filesharing-17.12.0.ebuild 574 BLAKE2B bcd50fa829f6201333b0800c5c30af7e97be7bc2ea156ec9ac5a742727ef6783ccfb2aa043510af0f7169c7ea6ec955ad0c93620370c028c767230d90a8dc7ea SHA512 4db131bf22d1ae10dbb542e9aa9221858ee01442567df634edec32fbbad537d69f15d7763bc7fbdd8a71e7997766c72bc3d36eb740fef035f17e7165bc8701ad
+EBUILD kdenetwork-filesharing-17.12.1.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.0.ebuild
deleted file mode 100644
index 575b4fd41215..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.1.ebuild
new file mode 100644
index 000000000000..13f47494f491
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="kcontrol filesharing config module for SMB"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 625ddca7d7b2..6e4cb40b3607 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-17.08.3.ebuild 607 BLAKE2B 08d1aefaf55685c75e85e0a6c0a3bac88cb33ef209c7c83543f81c65393b6cd835e641b550bc3737071308f90a359e69450718151d8103f6607774d3b32c48ee SHA512 24f363011b29f22a48d24abf118e243c87cdf4f3e0dec0ecb33fe99feebee2fe69006ee27e92912e9b2d6ce3c406aa3961546bf69321f0319e474d05798dd389
-EBUILD kdenetwork-meta-17.12.0.ebuild 461 BLAKE2B 2ab205d363a14442647d8a832f83b6dc34132ee47bfe45f9652dcfcb3b50b3c295d35196afb8d806085b8750cc8f9131ccda7be71c72d441b76be8379c0ffaa4 SHA512 265c5f9a395c51f36fb422b0328bdada5ff531c757fdd8f6283c5559f5d2e01d33c56d7dc41cab9fc9b52d66fe14374929240429ae253822472c2937664ac8fe
+EBUILD kdenetwork-meta-17.12.1.ebuild 461 BLAKE2B 5779c1d555b4aa99209bace11c6dd3529d0f051cd8dac787c7ab4d20ee77b3576b2ea7687662e6c4f396fd0d562c0c94874f762a04e1e5317c6981a1a90cfc29 SHA512 4e68bf920583098ea00750d475be0f96b5cd1fb9c960277779f99edbda825933ba93b828c00584d1848dfde54715a1eb2f9a1604aaefe9a632735ed62001e3e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.0.ebuild
deleted file mode 100644
index d3e90ea71919..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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 krfb)
-	$(add_kdeapps_dep plasma-telepathy-meta)
-	$(add_kdeapps_dep zeroconf-ioslave)
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..d82d8d4c3853
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.1.ebuild
@@ -0,0 +1,19 @@
+# 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 krfb)
+	$(add_kdeapps_dep plasma-telepathy-meta)
+	$(add_kdeapps_dep zeroconf-ioslave)
+"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index c7962b0d5f0f..e3d48637714b 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-17.08.3.tar.xz 9372560 BLAKE2B 7a7378b7530e4dd0ef98be285f3244ef05ba316cde631c2f2935f50d81fcd04c8b37c3fefb941513f664d8e503ca601dcf45695c8ca136d4e61a05cd42a616e2 SHA512 6ab18d380dec19d82824e461d9cfc345cc82790efc93d6608472c6dea26e5392a143b8fb2185dd69802133479994d9899b4bb400b92ba2de0473bf7bd48c0575
-DIST kdenlive-17.12.0.tar.xz 9389728 BLAKE2B 0e62be009decf9daed0b827201c1bde67af39b7341968917dac24b9b9bfd382d6daf8376171d1e6481632f1d40d6539b7da54427c5a5a3322e5557f81c9c099e SHA512 b900822b6dd0ecb7ad21ffb7c6983d22fce1d8033a4cc935664291cb00b160783777d2682f6dcfe7f04b15dae9d9b90a132caf76dd095c311fdf61f0c42accc0
+DIST kdenlive-17.12.1.tar.xz 9389160 BLAKE2B 785b57a0dcf5441c5b806101e59592a1ac724b581e9cb72bbda19f57209b5a2cf8f412f0c023082f43f0b410b7b7dd5ac810248f0933cc92b9c4e8d83608fa67 SHA512 09a467f2d00c142e4dc98d8902cf8f65871b3dcb4e59c3f3436207586182160a47d27e8e59e021c08c5ee544a47668a78d850028e32f46184538285e4b163e60
 EBUILD kdenlive-17.08.3.ebuild 2087 BLAKE2B bfe2559334b875ae082270aa176adb3600c3e22fa531c9ce20919e251b310473bb44f496cacbfc1ea04d307d265e399f06003e6184e670e241ca2a9a3043c3ca SHA512 55424c3fd8cc859b43fc89f8f547d110f418e59a4a9022f114d4097b7d1d24fafa59bc3b38f03d281202a01a6a6c1cd14346d7db66ef32f0bbd70391bcb46406
-EBUILD kdenlive-17.12.0.ebuild 2089 BLAKE2B a77daa13a75490297e89e9a964cae7487a6b7ced954c9e43154023cc55b2111718fe6758716a5ea943aec798e1c8886e65c4815ba9045c7b374e9a5d7e6a779e SHA512 e3d2c2f86932d8253cc5ee48d31623e777b0e191eac845426feaaeb7a90e05bdde275b13f962ad10cd5a0590e2b2ec650a6cfce184668f56a563faec9359871e
+EBUILD kdenlive-17.12.1.ebuild 2089 BLAKE2B cd31ddba4ba736b03dfe087324382776d841c8681dec6f4650c5bb7c8ab7d46f31e615e7d926a32f37303ae035f99f2d12d1afc29f66fceb503bdbef2e53aed1 SHA512 7880cfc5862cc18c2ccb309fff4fec3f85bfcff3ba80ffb8123650e589b0406973f810e8262a5cd15fca50cc2e0043a2b734e061d8c07441c027b673dd8f9ab6
 MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6
diff --git a/kde-apps/kdenlive/kdenlive-17.12.0.ebuild b/kde-apps/kdenlive/kdenlive-17.12.0.ebuild
deleted file mode 100644
index 555d04f610ce..000000000000
--- a/kde-apps/kdenlive/kdenlive-17.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.4.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}
-	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/kdenlive/kdenlive-17.12.1.ebuild b/kde-apps/kdenlive/kdenlive-17.12.1.ebuild
new file mode 100644
index 000000000000..ba7f9f054d6f
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-17.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+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.4.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}
+	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 dd2d49ea97d7..e7405ec3255e 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-17.08.3.tar.xz 1922800 BLAKE2B e447a79571e476d68e221d3d1971bfb3ab5437246339462697ac9b748072f0d6836c025197a6aa642086b233ae43f014bd75dbb16d0a207c7b6f928a8117d5ca SHA512 e9411aae9fe401bff73b8bb4c947d1bf8e405760c51479a12a407171dff27081195552204b353da2f555a8c8960f3860bb03f0fa73ba7762a7d36770e209a721
-DIST kdepim-addons-17.12.0.tar.xz 2037896 BLAKE2B 6bd46b436d78c6ecac9692ac4fc8c3ee7ad7c59aa8ba03600cb3a2673f45970ad63aa98f1b87b870bea5b82570972ba78fe28543ae69fe9b892a1edbd6f45d35 SHA512 9aa9e0aa69a3713921ad7a5a267f790ba2c4e9b69256bcdfc0f16a41acc557066a0da3357a57513a79c7021e57763fb523340d5b8d248e06224170311a2fb6a1
+DIST kdepim-addons-17.12.1.tar.xz 2038708 BLAKE2B a726200cd5329812e39f2d1b9dbdcd87d7eb63a75461003a85399f8f7fcc40b9489f7837bdf1cfcac0b256730002826fa037fb1338c34fda546242dca9681c8f SHA512 695da11ff7145de546141d121558fdc8b4c8f33f8f056a7fcfc8ef8c10f42145d6516d5c8e9eb000f36aeb479695b151e94a9563fd49df4dd4f8dd883f245b07
 EBUILD kdepim-addons-17.08.3.ebuild 2199 BLAKE2B 9faafbbd5c16b440f54bbc98f58fdbd82954b12ac7355d8ea2636b66c73c04b9f7fb0b6d44c3af8e17f3737b605830f1963be82812c6c1971a2ef830c9f51732 SHA512 ceea1d39c949bec7ccaaaa204a7461b3c45fbe8c90bfc1f45d0ed10a01e1f85702f2d87ff4ccba95022a09d741c9f8ef042fbd08924a9f5dbeca849d10b1f42e
-EBUILD kdepim-addons-17.12.0.ebuild 2222 BLAKE2B 81aa6c833ab93ba5ea5296e3944a7435c8c98b88982d7aff71e9ed213933fb68687e8f2804879f3d094445e9a0a98f9135961e71b3eb8a6edd3fed781dd118dc SHA512 8b608898294befe10c851ce17a7cd3ae9a2a35d8a0df30b447064954d82a2b5e8807dab2b1bb80f0480778d77f0c4a5a59a8f16930004f43e01b1c81b7e25dcb
+EBUILD kdepim-addons-17.12.1.ebuild 2222 BLAKE2B 908c45a6cdcaf20275fef168a0f20b4a0ce532f61d3c3b83a8c7a0be3350a3a1c18fe0ce3fe4571fb21747f7f98d41487a7d2dd670148ad3024106dded0840f8 SHA512 2ffba050839edb3008f939484feabc5773d6d6355433092865a528f98c7029f4092fa5524c6953941a57cddf8d3d73fdc4954fb12a129e1e797afb3d846e949d
 MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.12.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.12.0.ebuild
deleted file mode 100644
index f918a20784aa..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-17.12.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="importwizard"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.12.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.12.1.ebuild
new file mode 100644
index 000000000000..59efd035a720
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.12.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="importwizard"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package importwizard KPimImportWizard)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index da5b3bed2233..3f5f73417ed7 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-17.08.3.tar.xz 73116 BLAKE2B 343761fb6f5e2d45a99fd8d8f5115297bbab06bc51642215d23249a1f29a550d7ccb6ce33e749841ec87da797a039b317d308f7a00143348b5511cf3184c1cc3 SHA512 0f4619396b8f1011acb61fa0b5531440995933baae60e1629452f1bd915accce7dd9487123074ed0c1cb6b06de311f04ce85eb4ad9c242d13b181b8cd1876856
-DIST kdepim-apps-libs-17.12.0.tar.xz 72936 BLAKE2B eb77d0b0ea4690a17f13e6a53e32bbb760b291097b39030f369136d5ece3c9bcb7eaae4d4ceac6404c0264391f6b25b46c4597ae7edd632da5d1328a25bc376d SHA512 a831f7d5bc3ce64bd271b291b18256faa9694a8bf18a5d0de4223cc88176ac932567ea78b7d206f3988ee8a8ad379dadeea4ac349b51e567fb012d7586c4f326
+DIST kdepim-apps-libs-17.12.1.tar.xz 72956 BLAKE2B cd07bf4765fc4171e0c180a5aaeb8c25cde58383762b4c521aaa40cc64c64d128facc749356f0c420b9fad10e5dd9631a4230fbe97396912a2276a6d35cc490f SHA512 ee9378b3ef951b5bc8bc0b00f2659ed4c6f302c1f10e991233552ab28b497a3cc4678f40ce19786c88a5ec26025a8ed9f76a8fb22f897526bb99136e5a8f986d
 EBUILD kdepim-apps-libs-17.08.3.ebuild 920 BLAKE2B 2c29ace810dbf0f1f5eb6b864b68c2ad1a8e50e2537e7979a31300db7960b9adf98e38bfe8d75932494f77add91bc6de63c825c436d600747f9664f6131e4ca9 SHA512 53baa4ab04fa853544bd37057f28bc890f44a488d7679d0f0ff86fede2ce323cab8a42e343952cd1a82db183d71d5bc2519945cd040779ab01e8e33298023fc2
-EBUILD kdepim-apps-libs-17.12.0.ebuild 922 BLAKE2B 1d0f7f72448be54171b0b6c5cda8209fdb0a3dfdbe3af7c68710ae270a6d17e48ae7a2bda35f37cb67c31192036a58bfe2bcb98f0b8144f2377bb3f8a05aeef9 SHA512 10a1a017fab90bf13c46414dcf5524b660874c769adc27eaea2a69669a3a751c3856c6f8aee88b1d4920f74f8d526ad826eda0549fac14bc2620f25b3713f071
+EBUILD kdepim-apps-libs-17.12.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-17.12.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.0.ebuild
deleted file mode 100644
index 7644cd4f59b9..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.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
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.1.ebuild
new file mode 100644
index 000000000000..bdabc1a6ae7a
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.1.ebuild
@@ -0,0 +1,38 @@
+# 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 for KDE PIM applications"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 926d2414c0bc..bf4bb96064ed 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-17.08.3-r1.ebuild 2058 BLAKE2B 4498d54fdc8d50d3d4d98e4804c5f8c749a522d3849e77cc9ed282af5a9ee3a4a1f6f89622c41cdbbfc9b870fa9ce5bd38e846a11063654bb291a20092689c4e SHA512 3d39f54d5dc8ec11114d4e1f58abda89016fdd43d476b0f796eb6341790fe40319a7c154081164b83fbb2aee0b8b528913efff55d15f6abee8f4f0ac5e652d14
-EBUILD kdepim-meta-17.12.0.ebuild 2086 BLAKE2B e3b4d045b6131941ef772372cb19d1ec62754139138b1e252f2899f01d5779e7362e1c7b4fd45caf4dac126408833440483687a0dd20eaf079429eb3be0a50b7 SHA512 16b2b082964f4a9c14e7b034f96b85e420ec603345ffcf062e9070a001753f79f1b2b1a6084eecffbd3b97f38c84a9c5808efcd263ffe805917faee8922dcf5f
+EBUILD kdepim-meta-17.12.1.ebuild 2086 BLAKE2B bb6004e622cfe920bf702a838f2904ea2c9a892d1484f8bdff19ec9637dd97457debf989c8490518cd9ab405ff21be0f53541ab468b5e144ae3de7c1ac80317e SHA512 536c37e1cde9ccf83a9a374129e0c730794ae6e631bca49ca49586432c02c9d2c09530df8d891d0bd39bcbf376e9f8af2b2941a503c00c502d6e9cad9abb4967
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.12.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.12.0.ebuild
deleted file mode 100644
index fd7cafa17a6b..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadiconsole)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-import-wizard)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep calendarjanitor)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantlee-editor)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-addons)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep kmail-account-wizard)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ksmtp)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mbox-importer)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pim-data-exporter)
-	$(add_kdeapps_dep pim-sieve-editor)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.12.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..68162b1d4a6d
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.12.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 kde5-meta-pkg
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadiconsole)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-import-wizard)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akregator)
+	$(add_kdeapps_dep calendarjanitor)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantlee-editor)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbook)
+	$(add_kdeapps_dep kalarm)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-addons)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kleopatra)
+	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep knotes)
+	$(add_kdeapps_dep konsolekalendar)
+	$(add_kdeapps_dep kontact)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep korganizer)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep ksmtp)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep mbox-importer)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 05de4a5e10ba..258d134df72b 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-17.08.3.tar.xz 1507128 BLAKE2B 38e188c579f35a8f01d559e4333a75ec54f61815133047531db7bd3af31981a66f6d921e60dca75c825de6c8d760f1636ca790c267698f10f245f9402fabdab5 SHA512 fbc13a0b92d47d057ff94101485e9e76eddd002c51d1696146313f6fa5be412759b44c1f24e0a4d1282140b985926370310de77cec7f9281771d15e6d5c919f2
-DIST kdepim-runtime-17.12.0.tar.xz 1789740 BLAKE2B 5b70886235aec4c33f3126add2165bc22aedcb6f159b8eaf73a6fdd1a9059dbc12a93e18ffb7a17d00b93208938d2936e3cd00c3f2ffbd17c16b1a0765f44946 SHA512 12f40edc7842a9345a3f4364b9e9b6484d9cdcaf18803a11d1dc0ee5a918a4eaf95f84f21813600e32780c84e9119cbccf94e4cf89242006438469f5cae925c9
+DIST kdepim-runtime-17.12.1.tar.xz 1792592 BLAKE2B bb7df0a320a44459cf4f6d317a66d73df2ccd2999b3a609cff726fecee9dd91c674ac1018f10e3ea25bbb447d51ab1022d31ee1bd7d89a97e80e003f4e3a4097 SHA512 ed6835493f00b0ba7ce20e138203c8a26f25ca4fcb899db0fd689633809d71db62b8c316a4a464b44c04741b413eb6cea5ce7585f83281f2c0c0ea8b910bb214
 EBUILD kdepim-runtime-17.08.3.ebuild 2072 BLAKE2B f0b89498dfe71aa7a60fdd10ef57bd29c4da7e00e95c47bb2659991929da70911fd841ffea3e2bb831f8e5224effb99f371c0888865055e7b85e3f79b118268e SHA512 5c7459d4b4dbf517738540365b4a6c323cb2dd79a29cec5ede078d02c4d8642634c09140ecde3f32d4523d078a90c1c7230df86cc19c3acc9cf8daf6bf2e91f8
-EBUILD kdepim-runtime-17.12.0.ebuild 2078 BLAKE2B 17881660461c0030186b2313c699c82cb756d3f999c84c55022ecb1cf3a203008b63d130440f4ce8a3e168b85871cd451100983499e866869d5bb64e14af6504 SHA512 2f58bc95bbf373af349fca4f08fb8dde7e122dcf4de17f5b9987f74c2e6d8c8d5e5a3f37cdd3235f461eb58052effceb7f551de86728996213647cad0553ca34
+EBUILD kdepim-runtime-17.12.1.ebuild 2101 BLAKE2B cba72085cbc223e91f938d175b0eb9dd601a871937b4de263dc76a6cea4c2e6bc23645ce386ea1a199a1455c1825dffd0365d7634f8bb3e3822da18ba1e83b12 SHA512 c8d08e196e6de4b37693c4169b12ab6a73f5304effaba26a7eb7c48080ea18903ee049786f7251389ef3aa38b1ae11d2d3cff089acf64071b07c0d2a5e408e81
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.12.0.ebuild
deleted file mode 100644
index 4db884e4963f..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.0.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="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-# TODO kolab
-CDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdav)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	speech? ( $(add_qt_dep qtspeech) )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kimap 'test') )
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_frameworks_dep oxygen-icons)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.12.1.ebuild
new file mode 100644
index 000000000000..2ada64df4f06
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.12.1.ebuild
@@ -0,0 +1,82 @@
+# 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="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+# TODO kolab
+CDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdav)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${CDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kimap 'test') )
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+	$(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 3eeab9a8ca5b..74f0a189f26d 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-17.08.3.tar.xz 37348 BLAKE2B 68503cd623ddda0dbf175588b07e08da5faad80213cc1ef4f97b0544023d0327d380cb6a8ce8d78da49d039bb04336ae0e0edb7079da636dae4298c7d28a9188 SHA512 a692ddbcbd094d230867851d42165f0d7daa1872a7fc80bde4bf5de8c70ef09547a79e0283fb19a451f95f53c939d27e1059c005b7eb5f80f294b2b2c56280ff
-DIST kdesdk-kioslaves-17.12.0.tar.xz 37380 BLAKE2B 979824d731c344ba7ac15a6b99483c1107023e3b33f646fe8b49e7b18f51ed55bfd939c82dcc368ec3c36a4e045fd4f66c156856786e2e37be0610fa1f177244 SHA512 ce8185318988b1b0b16da40aa906e36f51eb51039b96f5d3df28c3fb1b482d4dd5700ed813e1ea6ce0173caa48dc784cee2224580b943caf8c05871bcdef2efa
+DIST kdesdk-kioslaves-17.12.1.tar.xz 37392 BLAKE2B 1db839d975bcc1af033562677bb88473793f124e225df71459a09f6801318cc87b9b8e252ebddaa2f25615d7a4c10d65a0da3be31396ef803d661d840bd6c439 SHA512 bd79adb00361108881d01ce4f719d05861eb6539c42459d75b636c0948c3466771f32acffe37a05cbd37d1d9e044e6f6516fe6a016d7496ca98887b88a84848f
 EBUILD kdesdk-kioslaves-17.08.3.ebuild 375 BLAKE2B 2d813ca6fe5d44647c5602086cfe7d834db1981ae6669280bb91fe6bc694eac5d7f8e74dfbdafa224874c1198eb9f25e7b4aa313a0225ffa0d79bad976063fa2 SHA512 15bc346ac3919b443c7f6152d779d2abf447036d5f62cf388ee6608867143ea0d4ee929c3581be1890c12ad3dbabf0fb9d18116781af04188078e78fb98148fe
-EBUILD kdesdk-kioslaves-17.12.0.ebuild 377 BLAKE2B a0d271db78b29fb5ec5609cf9e61e5fdce43ccd6272c2898dc7e5c10625c3c8aae26012a51ba6eb3d60ca754c919ae11bf68f0e6e73687c1bc6c25823f788b36 SHA512 d60fa6b1b7660d5cd7ec5ceee31dea62af7a142e350b435e7f268c25d814dd92b14dfba655ab2ce14e81aed92b50a0e9b3fa52c5c40757f5a0208fe7fc75ef4a
+EBUILD kdesdk-kioslaves-17.12.1.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.0.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.0.ebuild
deleted file mode 100644
index 7e58b0dd7f1e..000000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-lang/perl
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.1.ebuild
new file mode 100644
index 000000000000..a659366d3db0
--- /dev/null
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.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
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-lang/perl
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 3615101b4605..f3cd37fb69ef 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-17.08.3.ebuild 814 BLAKE2B 6607ca11e54397852d657d546e364448f54dd11740ee6557d89cd42385fb290702990abb15e4219d24f9bedf78aa0fca8453a6a2e03aab931cab8ac78bf626b9 SHA512 619aa14e31e7f0d8be936bce475c5436483d204f44df92695b191aa5d16af9b4107aaac286bbddd29dae2e1e57210e594ce9b60686291501f0fdd4a6b0c2b1e4
-EBUILD kdesdk-meta-17.12.0.ebuild 816 BLAKE2B 0d2b9cbbdf48f98c159dd0795fafa80f8937c716a6445caf12bf109359ce79f7bef3a9b859e2baf2f680cf5af26cc23b05a5be948e1391aadc6ee17239ac679b SHA512 837fed69c6c3dd51682e392573539ceb0a14267367d2bdff7cc02101dd5e65746812421def732bc30daa89afaadfd8e364824fb6315ac050ffdab8a6fed5eb15
+EBUILD kdesdk-meta-17.12.1.ebuild 816 BLAKE2B 928cad107b3841337f2ac22708058fbc468639f726c2b398673e8971499e9938a0e39d774a309797e7e1d7446cc569a0853b0cbcdb921d09bef44893ca3dd491 SHA512 876520a50fbd8c21a0839658c33c745c4cadba02b787ae16ad801db693d1cdcba782c661becccccf4d12a9cd0ee54d03e0ef80a14fa1fd41a6baf14009af30c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-17.12.0.ebuild
deleted file mode 100644
index 604f788e879a..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86"
-IUSE="cvs"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin-plugins)
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kcachegrind)
-	$(add_kdeapps_dep kde-dev-scripts)
-	$(add_kdeapps_dep kde-dev-utils)
-	$(add_kdeapps_dep kdesdk-kioslaves)
-	$(add_kdeapps_dep kdesdk-thumbnailers)
-	$(add_kdeapps_dep kompare)
-	$(add_kdeapps_dep kross-interpreters)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_kdeapps_dep lokalize)
-	$(add_kdeapps_dep okteta)
-	$(add_kdeapps_dep poxml)
-	$(add_kdeapps_dep umbrello)
-	cvs? ( $(add_kdeapps_dep cervisia) )
-"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..6376185cb85c
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS="~amd64 ~x86"
+IUSE="cvs"
+
+RDEPEND="
+	$(add_kdeapps_dep dolphin-plugins)
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kcachegrind)
+	$(add_kdeapps_dep kde-dev-scripts)
+	$(add_kdeapps_dep kde-dev-utils)
+	$(add_kdeapps_dep kdesdk-kioslaves)
+	$(add_kdeapps_dep kdesdk-thumbnailers)
+	$(add_kdeapps_dep kompare)
+	$(add_kdeapps_dep kross-interpreters)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_kdeapps_dep lokalize)
+	$(add_kdeapps_dep okteta)
+	$(add_kdeapps_dep poxml)
+	$(add_kdeapps_dep umbrello)
+	cvs? ( $(add_kdeapps_dep cervisia) )
+"
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index fc12d74a7247..befb69085603 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-17.08.3.tar.xz 17152 BLAKE2B 8c32996213c6d8541bc1067270a3b7a54acd29cd70235150af8f52c2e4ad79b1133f33e1c76bffb15106d6f475a86fb7b30f9c235c05fbefa3661c7bc885207b SHA512 931dc615bdf4dff783f29aa5392f61b5901ca3ae740389538db8a30d3a06f4ecb0b6fde71a45341ce2511d6e54c57ff58ffb8dd624b705f68ae55284ca85eb07
-DIST kdesdk-thumbnailers-17.12.0.tar.xz 17136 BLAKE2B c45e8e53db59099b5634be1e2c9fbabde06e144e0b11a48aa1733ba8f99e1f5f436a68d21b54930affe19dd0072eb6f00b8a627618aaa68afb7fd45b7b96bf02 SHA512 26070b07dbfb42d08460337a3545d008017722c9d649ccd38367c2e26364cc3f38ae5bd92b78de577b79f6ef513c2492e86017100acc0cc95d5299f3075e56bf
+DIST kdesdk-thumbnailers-17.12.1.tar.xz 17188 BLAKE2B 06aed88019253f05cbb626c8e326bf05200618660c373eab794292faeaedfac459f02e7f1ffb39f29206997ee368e914b57eda6f85160aee910fad37c78e3814 SHA512 e4896992518b32c81f2be662615557b7a8bfd8317e18ce5549eec8288d1110dc8d3d45bc058f2a7229796f2d6965cd7b7de19aa1846bd1eb80737d62826502a8
 EBUILD kdesdk-thumbnailers-17.08.3.ebuild 428 BLAKE2B 5b46585c6cac01a1f891fd3068f9bc1d9091fbb15aede62cb636147374500d97ae763209664546b7e1a3993c9c29a42eaf2583ef2c6ed86bf335a842c4003396 SHA512 b9b7568c1de8150f70244100c4c8d91d8c4009470a21d4359e8eb5eea474a2dcf146e2107ceffaacbbbef24eb27a3f4e03269ceb1d099713065167c0b152a7fe
-EBUILD kdesdk-thumbnailers-17.12.0.ebuild 430 BLAKE2B 4db9a1e267dee459620801fa64412ee360fb8148416de0ede93a340acd32293d65df023cb8121a9c2f6229301310d859002870e4d42986b245264a4e2f0ca80f SHA512 1424f0d0c94bf260b826923a3bc698405fffce2c4688c35a185867aa70c66c7d5114e164b42e3006fca62c65941404f9ff172c0be81db8c7f36762be30dbaea3
+EBUILD kdesdk-thumbnailers-17.12.1.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.0.ebuild
deleted file mode 100644
index 13ef975ebc7f..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.1.ebuild
new file mode 100644
index 000000000000..aa6e30a17640
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Thumbnail generator for PO files"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 8257af859aff..3a893c4e2971 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-17.08.3-r1.ebuild 929 BLAKE2B dd72ed1cb361795791a31fa49e7d162f2ef48962534974b4975139fe9a182fbe87700ca09685027f3cb5ca09d870e2bfc31ca0d160739e43e849cbc679bb2f42 SHA512 b164af823af877361f1a6a0a2d023bfc9d1a40a064d47e0dd34674ececee19e913c40e1603b66d76c3cb7e4cc84d07e948c0bb12fcf252372b5217bdfb487f5a
-EBUILD kdeutils-meta-17.12.0.ebuild 782 BLAKE2B 1a3dc72bd2e091270e6f544cd9c460f2102a79e75c3b0a84b9514d9958953a4af1122b60f18286a45c2d37a42b43a94ae5c28ec3a1158c3c1799b9ee0ffe9b16 SHA512 f6ad96e7e4cb368cf5b4ddd582f8c90af1b32bea36871a09e064761855b99b3001ae536c7b6434723614fa03a955656b2566187f3bcef9cab41624d81d434907
+EBUILD kdeutils-meta-17.12.1.ebuild 782 BLAKE2B e0d4a424636689c01fbfa9d32f804d46c30ed0c87a67f4f308ca11833e5e7d97e8dfcaf58bcce1c9bd96be4e7d8e75b8907024cd322f06e2aac2497d78927bca SHA512 3e4d7e28cdec18c0898de508a3ff5a6b4d7ff97ca8df8862309864270335d78df3db8a20a6e7f945bc279500aee39f895b751d4e7a700bca4335bd6045398095
 MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-17.12.0.ebuild
deleted file mode 100644
index 0b9527cd19b9..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups floppy"
-
-RDEPEND="
-	$(add_kdeapps_dep ark)
-	$(add_kdeapps_dep filelight)
-	$(add_kdeapps_dep kcalc)
-	$(add_kdeapps_dep kcharselect)
-	$(add_kdeapps_dep kdebugsettings)
-	$(add_kdeapps_dep kdf)
-	$(add_kdeapps_dep kgpg)
-	$(add_kdeapps_dep kimagemapeditor)
-	$(add_kdeapps_dep kteatime)
-	$(add_kdeapps_dep ktimer)
-	$(add_kdeapps_dep kwalletmanager)
-	$(add_kdeapps_dep sweeper)
-	cups? ( $(add_kdeapps_dep print-manager) )
-	floppy? ( $(add_kdeapps_dep kfloppy) )
-"
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..4705ac6bc239
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups floppy"
+
+RDEPEND="
+	$(add_kdeapps_dep ark)
+	$(add_kdeapps_dep filelight)
+	$(add_kdeapps_dep kcalc)
+	$(add_kdeapps_dep kcharselect)
+	$(add_kdeapps_dep kdebugsettings)
+	$(add_kdeapps_dep kdf)
+	$(add_kdeapps_dep kgpg)
+	$(add_kdeapps_dep kimagemapeditor)
+	$(add_kdeapps_dep kteatime)
+	$(add_kdeapps_dep ktimer)
+	$(add_kdeapps_dep kwalletmanager)
+	$(add_kdeapps_dep sweeper)
+	cups? ( $(add_kdeapps_dep print-manager) )
+	floppy? ( $(add_kdeapps_dep kfloppy) )
+"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index c02c7f79c0b2..cae0c6adc038 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-17.08.3.tar.xz 530904 BLAKE2B 1f0957a194fe117b030846bc03248443d4d9b3db07b4a0c8592c7c50b86f910ddf245d25cb0d3842edf64b696bca5056ad3bc0c31915ad86938702fa6899fd42 SHA512 664e62f176930aaee8300813ec82b0bb886d09cc1b2242e0730799c034983b28d1417923a4daf170c396c334877a666a6d3bcf07a366a303ff08cb38c8acbf36
-DIST kdf-17.12.0.tar.xz 531028 BLAKE2B 23b30d09a17b882044d5f21298fcb27774e5f4fe6742ea4f85da758f6f4ac6ea14db0c5f31d5cdc2c3f6d13eced071b17e6a765dbef1aa31644797d7f4ec3a86 SHA512 da1addf1334148376b8409bef9bff315a60cad1595199d12a6d520375b106aec86b93a86015e3f84ca4c8b0748029597199179f50cc1f3e33e0696c3a2f67788
+DIST kdf-17.12.1.tar.xz 531080 BLAKE2B e60ab5cbcad52a2919e1940ea787d935a6eef17c296262391795adbebc6186aeb30c16a1bcdde807ce006ae32c47ea637b3f7a0d0300f833585943c0f39c71fb SHA512 337b42f8729a5bcc7d42ec51d6997aa6e2cbd68cf4c46afb68932eaac3391e9ca34adc11c8bb7d4e4ca368996f7ff92ce8487f33521f4ad84264654f013ae8fd
 EBUILD kdf-17.08.3.ebuild 723 BLAKE2B b2a5b95421cf044689d59fda80fabfc1d5e78d84853c82b0761a13d882c42e003b9d5d1970923e2c699ba43a9664a33490dac10905cc3b7b401fd983eb4bba8c SHA512 fcad77a8477e22bf7a012ffe7c1b7bcbd59237d6258f1430b2b9fd6e6a7d4c05e33f95ce2ea3c412e2aaed401ebf39747f46ac128ede52c45ada50d815f5ce5e
-EBUILD kdf-17.12.0.ebuild 725 BLAKE2B 7236a58eddd038ed051a9d3e4b6cfbbda0795546e2837ca64f3b92c8357937318db1929427cf76063a6b3e791775751da13513bc7ce2c6b1ca3333c55dfd2296 SHA512 6ee8f9b42a4022ba5f0b1663205d23a9b9cecc2767900090e7b7e643d420ee422dec981de50a540275494dabf2dac56c3d5e5138d7ae16580c859018664f0a48
+EBUILD kdf-17.12.1.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-17.12.0.ebuild b/kde-apps/kdf/kdf-17.12.0.ebuild
deleted file mode 100644
index e20b84dce714..000000000000
--- a/kde-apps/kdf/kdf-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdf/kdf-17.12.1.ebuild b/kde-apps/kdf/kdf-17.12.1.ebuild
new file mode 100644
index 000000000000..3ac87d6ff652
--- /dev/null
+++ b/kde-apps/kdf/kdf-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# 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 free disk space utility"
+HOMEPAGE="https://utils.kde.org/projects/kdf"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 796354b9b648..824de3f8751d 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-17.08.3.tar.xz 95084 BLAKE2B c342b1dfeef547bc7effedcf0c888a46422e3b2bcff525f2c0d3480b41a56dcb3ea8acff6eb3aea3dac6171733bed5e22c625c576a5093a7cdf9cb33330f4324 SHA512 27579ac501ec4c4904724008968ea12cd6a34a6eb6280787d4581e5c4d6bcdd1767ad26b27e967262ebaa955929b0ef2b1ab49b45098e4380516c9cd4bcbad7b
-DIST kdialog-17.12.0.tar.xz 96100 BLAKE2B db20cc2fd52b1a7bbb60c1c7691177df98ea85b412bce53645747eebae99d238425b36cd4369e3a5af7cff60a58ecd37bc53c57744de3f7400fc5b6e487ec31f SHA512 d8f587e79e62591618edab2fc174e05e166553ce7bac5be4e06fe6d3f9ade49acc6ae66edd0baa589ffe38e0c539cd3e14251ce7fb6453eac0ae3167b4db4ada
+DIST kdialog-17.12.1.tar.xz 96184 BLAKE2B 38b85ed8ff8e6ed991ace06cf651d8c22aa77f92267dfd52c287d10c2d156a50f75522f8a8259550cdacd0105ea58329c877fe81030dfe78debabd5f423f7b34 SHA512 173178b57b6248868d92206ad40e103b491e085dba4886059642f198fbe7274063988982cabf69ee8d04447f719abd10be432af4fa0502506a0eec3e4b1c0358
 EBUILD kdialog-17.08.3.ebuild 835 BLAKE2B e367f04321d4b50984aff42a925492885dffdb8a88df22e109929d748f8af2eab029ee0c18e0bd932dd7215fbb1b36edcdb42a31cb43f29ed250218d6f50dd83 SHA512 10794699e48309b05144e26affb5c5781e5f5d7df0b47900fabb37e8e7683667b46a1014033d9ec52f2c772ba68780ddbf240f498ad642439297a813688dcfe7
-EBUILD kdialog-17.12.0.ebuild 837 BLAKE2B 37a77fb5b0f6696e2df9274dcca64507d08c52da1dd2734d42c660dc3e0000bf76ae966afa8cad5918362353e66e321b118a9bc132ae3a90a3334f631efe67cf SHA512 f301f402f3e2df26e0ef44dffae124b3631e1e532ecc031457035f910b23da919fff4b8b212f01b63dff64ec4a003ac3a11a09bfa19f08489966183127458867
+EBUILD kdialog-17.12.1.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-17.12.0.ebuild b/kde-apps/kdialog/kdialog-17.12.0.ebuild
deleted file mode 100644
index 3f8cb91ec944..000000000000
--- a/kde-apps/kdialog/kdialog-17.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kdialog/kdialog-17.12.1.ebuild b/kde-apps/kdialog/kdialog-17.12.1.ebuild
new file mode 100644
index 000000000000..a3f46e46a8fb
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-17.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 6fc912fe1ee6..c6b309f77d3d 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-17.08.3.tar.xz 4606912 BLAKE2B 7b7cdf4469c454ad448c1250729e8942934198a8d82b339fa304b8db44783b859b797cc50f0c1daea089d083119a3b3a13c5d2502bed10f3c9a0d46a10aff236 SHA512 230fbf5aff55b72c3102c62ec22568a37126dddf458e1f2ce48c900d4ea8672080d8ec87b8c8abbfba3fb8fabcea834254d3b0bc77e3ac85f0ee1cd936abb41f
-DIST kdiamond-17.12.0.tar.xz 4606976 BLAKE2B 71aae3399b7094bbb42148293a13ce01babb79180a42946b54c82e60a797bf5e040d4dc287f93629dadc811abb1d0b54194887a48ac3b873eeb6e1afce96d1e0 SHA512 591c016eba4f2f9c4e5eac3215012d62ad5b4f52c975fa2fa5230d24d9464f3a022289e577561c95aaeced59a5ee1af5d3895c5405ef6b425629a00bda84a36e
+DIST kdiamond-17.12.1.tar.xz 4606900 BLAKE2B 01a4514c9ac097a5126d0dddf77f2b969005e31d88a54e19acbbbbe7ad38e89e59281983176f74677e10aa0e2fcd6b745d737a8de18296f5092dcfd3f80873d9 SHA512 c96e885ffe0c49ff8d789bc0442bef935f4fd8f27d9442b68b3084df1fd78782726b6dbdfa3b06ddddd4fb42779221b56cc5ca6332996dcdab9e3b6423ee9060
 EBUILD kdiamond-17.08.3.ebuild 789 BLAKE2B 047bd917f27f0c348c9a6093b29428be3c29d2f0f7f6f0cf17cd2569817a43d66fd8d1f26c7525af5eb16c170c7bfbf88a6d99fded6b3a4be732740277445f8f SHA512 15efe9401a46a7706959bccd2629270dd3a4ce849e9f30c738effcd35d17ca4bb168f4b327d8daee77dddebf12773208213a01eb953e3221f96d7ff41b0a6a9e
-EBUILD kdiamond-17.12.0.ebuild 791 BLAKE2B cbab7e3bafe9c7505602818e00538b9b1679c6456154c17c9a86d08d3a281bcd21c76f61256f492590d45989374273f2c146706b3639ba4672cfd698da2ab04a SHA512 74c8b6c433c5b100120c42d2673418c15489e59a992b5017b3cd7d52a5aeafd3304c55f5c3b01669823048dd43c5b411a1d9e4ed3ca5cb1598c2e7dc896d0e0b
+EBUILD kdiamond-17.12.1.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-17.12.0.ebuild b/kde-apps/kdiamond/kdiamond-17.12.0.ebuild
deleted file mode 100644
index 11caf8e09b13..000000000000
--- a/kde-apps/kdiamond/kdiamond-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A KDE three-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kdiamond/
-	https://games.kde.org/game.php?game=kdiamond
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdiamond/kdiamond-17.12.1.ebuild b/kde-apps/kdiamond/kdiamond-17.12.1.ebuild
new file mode 100644
index 000000000000..111637d702bd
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A KDE three-in-a-row game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kdiamond/
+	https://games.kde.org/game.php?game=kdiamond
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index ed7ab73dc36d..81a4855cc576 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-17.08.3.tar.xz 183160 BLAKE2B d1b23ba41442737db85556d172161a5f8faa67be11ab6fcf7149cfe288e3552962a2522b840f48f43d7fb12008ba0f75c014fc71bed3cf7efe55af70aa4d43e7 SHA512 3986bccfead1ac156bbf22902c3909b4c0dabe801476bffdf8ea34f39c09b723be2247105adb92db3cb718de107ee0d77aa6830ea339dd687a7fec6135be046e
-DIST keditbookmarks-17.12.0.tar.xz 183360 BLAKE2B 5bb7436ef1abff5095dc4fd989995987aa19a4a7fbbc845176f22d826bad0c072b1ff8e668fac347857d03343b3ccdfcac11e68c9603c5dd7bc59d5dbe5f1ddd SHA512 6f4f60c129e34d054cdc5bd1df579f31a529d22f71257055f4cd4367f999fb55d3ea0e955eb5d70c48cd8947d77c3af894ca1db6acfb9e844c225c41dec6e0d5
+DIST keditbookmarks-17.12.1.tar.xz 183304 BLAKE2B c216b14a8cc151f6e171a649b249b02b8b81c3c11e1862c97f3a0bfe59d298df85146841bedb6241b4b6f737520e14f5f6f97824645322739c361aa41a50d1bf SHA512 3480fc44cbec32467a58577859cf19d3fb265bea86e36e916cab85fbc6db3ec3ebdd5cf0eb4707456b9f7bdf488ae285a3f04448b3f2c97f28fb68d2201cc40c
 EBUILD keditbookmarks-17.08.3.ebuild 1011 BLAKE2B e8f94d27d6ae5f17989cffcd49d368eb9376d1751ce900bd29d4aaaca1d5ede6ba25cbcc2608f731b57b040d3a6f8c3ca0da2fae5ba2cf7bf77dbc42d639a4a1 SHA512 645919505868dc5e34f76a7c0fb961971a3c6156ee3cebf8ae708a3b71c6dd936cb42e47310f991f46923b86ac0e6eb2bb96d360b2de7ec090cdcd815206620d
-EBUILD keditbookmarks-17.12.0.ebuild 1013 BLAKE2B 3333aa1c79766e12ab1a9f462f0f335ce64f10453f815a611e89c861f32b781164edbc03cc78e8551232476b9aa6d58bc6e6b9ada329a27eec4cd699770a44fd SHA512 4acf946b271c612612f38bfbbfdc59bf8838da068716a357fcaa2ad3d43ea7a64449ff2e327ed07a97108a51756ba1a46e6ef8d93fcd0dd14f17c90951dd7a21
+EBUILD keditbookmarks-17.12.1.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-17.12.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-17.12.0.ebuild
deleted file mode 100644
index 945eb7ad01f6..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
-IUSE="+man"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<=kde-apps/konqueror-16.08.3:4
-"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/keditbookmarks/keditbookmarks-17.12.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-17.12.1.ebuild
new file mode 100644
index 000000000000..b048c6a9cf89
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Bookmarks editor based on KDE Frameworks"
+KEYWORDS="~amd64 ~x86"
+IUSE="+man"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<=kde-apps/konqueror-16.08.3:4
+"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 43cdaf176924..afa39439f2ad 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-17.08.3.tar.xz 209012 BLAKE2B 49c01868aa3749bd7bf8bf0560f5d766d5482cf85e4cd271099605548e47a46dc1ca21cd41810fc9bad2be5864c721880f57fbdf862181bc1e178dd8cbe8475e SHA512 998ee39ad4b909021827064957d2c3b551953ca249c6b130ea37b2af96beec29beda90578a53b921070692f3fdeb08cb12b2b5fd722864821b657933c6fe0f43
-DIST kfind-17.12.0.tar.xz 208980 BLAKE2B 135991404d2648c01792249d4a3d29811488d99679b53680e4dc39586801eb4d2e19f96278f9afe8a4c3f397f9ea4316d8a9c50f89d2aa8cf51b2ef39ebc86af SHA512 66eef6bc6eb130b624b7680f343fa0931b47f52db7ae8a2f1aaf4f8fd08dd9655b60344b8c0c2399b78bf58c9fa0739b230608d566ab95aa705b81b5fa066812
+DIST kfind-17.12.1.tar.xz 208916 BLAKE2B dbf732dc635831cd7e6a477619a3dc57409639c24542ee61c98d893b317e50a5d910d0566d4f05f11c9581d77fcccc22d317084d0bcbd5b122716e1d224bdc93 SHA512 7ba88c82348dae527d1deea0b30c479956b5c394d53bbe3a481fcdcde1676d40ae82b33d410657d7117bec6bfb5a84bb57bbe341a9145204b0f04cf217879914
 EBUILD kfind-17.08.3.ebuild 787 BLAKE2B 7373c88831c4cc2a102a31749bd17a5fbf41697f1b0f20ed371c6bed1cdf9984ab8bd8953ea706291bc21279296122073a0a0529db85271f73e0879022235300 SHA512 829a8a0a7fb847d3f713bb8272708c5935dd136b4fb8a18edcc4404c8c07120c0b3cf7911d8c2c8b9bbf011dcd88884f2eb6eb486afe1e04be92ffdc117e2d03
-EBUILD kfind-17.12.0.ebuild 789 BLAKE2B 99eb2a263c91f48cf7700e40f2a48ea7c4878c234e3e0f46a4a474b022cc610d2dfdca6ac424bf76e4eafd8784122c1a43510120121da3572f2ec502e15abc02 SHA512 fb4f754e3ad12640e976144739cf2e40c58c29e50d5b3538fe08429545ce361f90026a4a9daad87a1c211f03947cb14bddbe4e4ee166d1c94d84f487986baf77
+EBUILD kfind-17.12.1.ebuild 789 BLAKE2B 54a983619de422f9eb21301066f1d145e52dc304e505960b8574f5748dd3f739b17a9d3a0f9e4b2a9fbae0f7e6f97de4afc636d7901cb5ba1b8abde1983d99a5 SHA512 ae8ac2fb18a8979ea6ef803d331dfa72a8a1fa95cb23bfa39bdb63402a77f1b6563f7ce774b116eb54c4cd961b40dacd7bbc290d6f4729d8609bd8763435c1e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-17.12.0.ebuild b/kde-apps/kfind/kfind-17.12.0.ebuild
deleted file mode 100644
index aa1a5b2fc471..000000000000
--- a/kde-apps/kfind/kfind-17.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfind/kfind-17.12.1.ebuild b/kde-apps/kfind/kfind-17.12.1.ebuild
new file mode 100644
index 000000000000..3c6cd94b16da
--- /dev/null
+++ b/kde-apps/kfind/kfind-17.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="File finder utility based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index b0c1e50e3328..708f36347107 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-17.08.3.tar.xz 198852 BLAKE2B 3fde4288e81f0619aa683ce5c5bd4e77cf64127fb5e75ab239bc8716260be1f1b3bed8dfcee4fab68074b9780000069b8428d35996bcd380fd347e617651d6fd SHA512 834986bf5d3ee2b9bae57bd083e8a2c8199c9363ae1de04bb37c8b4217d6cb9b87bd8ac0474e2c7131ba72cf477f092fe052eb4b1d556645ac25475a8e73e2c3
-DIST kfloppy-17.12.0.tar.xz 198956 BLAKE2B 2f4d70a89a0ed2d0d77ec56de9e57572f1af1bdbc4fa793c93026e974f58739b56671f846b9b8624d235fb4226eb3c486d24b0badb0ac75586783666910c8186 SHA512 e861ae59e4b80db7a9c7f8811f8174f5ceb50fa1291cf8b2adaa5894ed92dc54b4373ab1a26141a81b74621bf579ab36c457bec0554734adbc2bfac8b9a17ef1
+DIST kfloppy-17.12.1.tar.xz 199048 BLAKE2B c83c9e634d7f1f9446abd2cd339f359a953f23ac2987d452c2428f79a39e76b3f7345e4b5a4f0691b53ecc3315fb98ab5f11617ec28d52ae1194c6cb9728023f SHA512 24196ec8af2c8e6e0f75b87fc884782cdaa8b2630b89af11b3ec4a3230ccb0c2adfc11c2eaa26e2b46cc09cee46753af270e4af1552ae2b4dbcc6a53884a05e0
 EBUILD kfloppy-17.08.3.ebuild 751 BLAKE2B cf98f99c6571ad5192b4084279bab80445104622a7b70b346d8f25e29e5c908a8b80d866ba4fe717cfd41756010ce8275186c6da72a6b622055eb21b958fdeaa SHA512 4223597ae8ca8709ba0585b105816dbce048604a21eb74f69399b0bcf305c1b709521bab3e07f9480152347b329e017c95005fec326121e83a70201a415977c4
-EBUILD kfloppy-17.12.0.ebuild 753 BLAKE2B 984061cc11308d9713fbdec34a758c8d2459859b5c251bfbfe063b2df4e9615fb9b252247a009086ffc5d5e762c8307ad637f5eab3ce6ad479dd880a89808a31 SHA512 ffbe92671563022c5fba300a9861bd1b7fe5df99e2ae373b78982d1fdbd2d8009f004ccc61a62831538dffff21ba61e0d5651943a38110f4c2d5d3449b14b369
+EBUILD kfloppy-17.12.1.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-17.12.0.ebuild b/kde-apps/kfloppy/kfloppy-17.12.0.ebuild
deleted file mode 100644
index b2511432853b..000000000000
--- a/kde-apps/kfloppy/kfloppy-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="
-	https://www.kde.org/applications/utilities/kfloppy/
-	https://utils.kde.org/projects/kfloppy/
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/kfloppy-17.12.1.ebuild b/kde-apps/kfloppy/kfloppy-17.12.1.ebuild
new file mode 100644
index 000000000000..6bdbc688d3d6
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+HOMEPAGE="
+	https://www.kde.org/applications/utilities/kfloppy/
+	https://utils.kde.org/projects/kfloppy/
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 189028d47d70..a1ed133076f9 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-17.08.3.tar.xz 573060 BLAKE2B 2309ff12fd41b4c625d6f78e7d23203b2d86e0f770a231e279b06e548ca3500990026776fe1e2a6d8e34203dc897c93bc2395da0afc30b7389009566e95ce2ca SHA512 d3585c205dbbc8cc9cfc5d0dca67d63c82a23a54e953980325064df29ebab3766f2c1f940b1ab210d6455108a8fb29f7d29cfbabcccd8c4506d3a84bf6463445
-DIST kfourinline-17.12.0.tar.xz 573164 BLAKE2B f53aaa6db66c5de170ef24ed944d86e919614331884b6809c11c8da2040e27ba2f6310db7cae994b14af0fe73205fb0765f762995ec7b9ceed7c32af51f2f295 SHA512 c372f523337808660a95837df390129c71676fc6c1c31eae40bb48e3865944c3a6893dae1d973b1550cce811e12c4a097ca5da261c1455021874e95c4facec07
+DIST kfourinline-17.12.1.tar.xz 572940 BLAKE2B cb4b9685d681dd8c72bd11f32b44714d9e46345e80ad668ec9c34c74dffa675feaced0218743a2eea72890bdc20f657a3c442ae6f9076a245a0978bb0484e7ab SHA512 c11ddc05a4d487ad4f6cd55b9e66aa98720b15d1eb94eb9cba3cab720505d559d6418af1fc86b0d591f5d3b93759c57b7defdb1608acfb7aebea30efc692d954
 EBUILD kfourinline-17.08.3.ebuild 733 BLAKE2B 48c91d38e5b089ec89186217cb31f2109d34af9a9ff280efa234c432926bf2d9d0608b1404c0109394f8b17d69db780c6797bbf3b3bce3c2351442349c3da7c0 SHA512 77b43a1c4c1017a9a24e7415c09017542ce07a536ab2c301295f21ede6b8901a89d4f40bd4b44463aa5f3ddd7c769cbd01460b4ba9c08b5657f82bcee65981f3
-EBUILD kfourinline-17.12.0.ebuild 735 BLAKE2B 9f893bd7a286f7be5f5439aebbf6d8ba3ebe1ee9398ea9c6945a9c0f426bc43b7963bf713d34de0720b3fd1b560899bee9659b8256dba8152c9c2b55bac7e80a SHA512 0db7633f899ea171408f8c89b044a15eda315bfee61dc24e1bb90b7e18762b167ae31a8eb910076be87f87ac66702eae82f5dd94ff0049514aebe5fdd5e7fef8
+EBUILD kfourinline-17.12.1.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-17.12.0.ebuild b/kde-apps/kfourinline/kfourinline-17.12.0.ebuild
deleted file mode 100644
index c7f2a9f4acbc..000000000000
--- a/kde-apps/kfourinline/kfourinline-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kfourinline/
-	https://games.kde.org/game.php?game=kfourinline
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/kfourinline-17.12.1.ebuild b/kde-apps/kfourinline/kfourinline-17.12.1.ebuild
new file mode 100644
index 000000000000..3e6be98491f5
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# 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 four-in-a-row game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kfourinline/
+	https://games.kde.org/game.php?game=kfourinline
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 860d7887c530..c313cc117bfa 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-17.08.3.tar.xz 10916472 BLAKE2B 988869d5a4142a40bd04481b74e0f7172cc200ae353a29e1492f2b5b8a77890dcf1e69346ae8c805767dc4a00989ad841bcf141256e913f73fc81f42be86f8ca SHA512 2ef733697405356096e9fd3ded52622d51b32e3b4f92f0274d700f7957661bb529cc9eb430a1c3eaf26717b4634ff9734442f51dc8838eb5f2e01c035a14ff1f
-DIST kgeography-17.12.0.tar.xz 10922016 BLAKE2B d218372ce1670cd23d3779a519298ee9c46b4eaea06ce6277dfead38b81a5db055bb7c2378480f109c3fe6555129cef868e5a5f04aaa0025236552a544362025 SHA512 5671f1bd2c7ed374c85e93a550bad4eebe62c571351860809037d011c953999e66a5397c49490ce8ab0ada2bc49d2f414880b81cddf3b65f938e4d6bc48e2fd1
+DIST kgeography-17.12.1.tar.xz 10922328 BLAKE2B efb8e6713aa63acb96ec1db1ca878e1a896835f26b53ea05341e6581a514d72b57eb758f391261627325c9d944dbbc3b74b90e7e82584ddadcb6cc79b555e726 SHA512 4ae05c1e6372f9864dfcc7d67ab71daf22f699e19a467cf4069e97e50d4972d11db3a15e378e59162ffcc84ddd1c81f1e7a0fa5335b9c1c4e63b21ef443d63dc
 EBUILD kgeography-17.08.3.ebuild 743 BLAKE2B 1cbc351695db8c2419238314955260115f0a473af6a4e05fccbca64f0d7171ee33706eb246920355d9820f0b4bae806fe152504b5b2e256636878b170396b9d7 SHA512 a0846da4bd3d95cca769116d628f3499d367dddb9b7ffc7351477ba147d8beff0dc26ed4e4f2b631635e3c6e88fe8b78bcf2b625eaf4184c66dbc754812c2207
-EBUILD kgeography-17.12.0.ebuild 745 BLAKE2B 9919650fbd6a2b255f6dae6d7655988a0934bcb185b490b55dbf1ba2daa7461ceb561ceb8afb4e84d3a5a1dc68e6d631c35b387cb3bce40f643f04332e0d27f5 SHA512 efca9cabbee970c5f300d85fec9057f1f629ac80b6948417759b3d0302c211b1e79ebc066a2c8e30fec7d8cc4c4973bfba5364f2e07755694a96c74f4268f4d7
+EBUILD kgeography-17.12.1.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-17.12.0.ebuild b/kde-apps/kgeography/kgeography-17.12.0.ebuild
deleted file mode 100644
index 97161ee6d910..000000000000
--- a/kde-apps/kgeography/kgeography-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
-https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/kgeography-17.12.1.ebuild b/kde-apps/kgeography/kgeography-17.12.1.ebuild
new file mode 100644
index 000000000000..1a573e6946c7
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Geography learning tool"
+HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
+https://edu.kde.org/applications/all/kgeography"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index bd9c457fec59..3a4fd0a65856 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-17.08.3.tar.xz 1081880 BLAKE2B 021d60b88113a134f692b347106b9f87600bc0012a3351160ffdf8f7f6aa2a8d92dfb0942850a57a5abaa909fccdb40b416250ce6979dfaedd29c3f9c48641c0 SHA512 7766065ff062f9266ff7e7a193f5d007a59af408127d42dedd7c7d8dc990d89801c7237f2162e7e335896be5768ac247670992f4bf52776a1470a3d805c0f5c3
-DIST kget-17.12.0.tar.xz 5395992 BLAKE2B d00df669f559259b432c0d1c5b202ac7b05c742e0299df0a61674ec8d0708c70ab12d1bd29e382b81fd3de37e5e403e719a7d60b65e9083ac92ab184dbb76e07 SHA512 62259d13e1b4b3cedd0645e7c15df61357fbb5fe1be64be8e2ef878df5b30a05e48d48085f2b27e15209db035c815ec34c7628a2fa6daac9231606561bc4581e
+DIST kget-17.12.1.tar.xz 5388920 BLAKE2B dbbb3e1f0581cad93ec4dfce9bb4676e9308a8a5d1b5c40543810138868646a83a4f9c5079c831763409e5abba4db90e637c8643938bd72b562e26372ebdea72 SHA512 da65381c226240c423e9fa60243623638648c042367a0b0367b19869a6a123c8978714cb62a66ae7f8153135754c0933bc37c792e7c7a808923ef62bb0af73ce
 EBUILD kget-17.08.3.ebuild 728 BLAKE2B 4829723ae8a028947d28f21ab99ba7b8a12b60a766b5d406481885267dced7e4685fff2046b1e9140c3af702398b2e7c592a3f5ca3b0d7e6b4796d6ebb1a5ed4 SHA512 fd38a064b72dfd352c303d69cd6344c483b87f0f6e332e56b265d4d8c40a65dce1e14907da4f5cba617fcc07e3ae479d31bdeff5363d8b620d8c21fa0fa21245
-EBUILD kget-17.12.0.ebuild 1712 BLAKE2B f52c3e6a1fd554d2e4d7236d5364ce8d5f87c2274e0dede3a83d47026cef3f2b2d10eaa68d2060c26d441a1741775ad926a4498c358f8f4452b5361fb5686353 SHA512 d35a2977e28ddcb395aaa0774189dbe3c2af6186ae09e2e0bca6c29942b9103be8c2ab13c7b41a8cf4d609558b620bf0ef3aa8063cd1eb82da69d442f4a44d19
+EBUILD kget-17.12.1.ebuild 1712 BLAKE2B b803f87a698469b0c8111291e281aea8044e8841fa78545e53013b19102f06ce38332841dd640488af8bc8d57c5a51ba1271cd4438748b1a924cd945ffb115ee SHA512 46b809586d2d938ce61089b2c5baf88e57cd88154abd29df8efdb5ded345ba5cce0806b47f7e1124581ec77460bf1dd81690493f86ab508352cf0c6d7ad412e9
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-17.12.0.ebuild b/kde-apps/kget/kget-17.12.0.ebuild
deleted file mode 100644
index 6968c2dba2f1..000000000000
--- a/kde-apps/kget/kget-17.12.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="~amd64 ~x86"
-IUSE="bittorrent gpg mms sqlite"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kde4-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bittorrent KF5Torrent)
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kget/kget-17.12.1.ebuild b/kde-apps/kget/kget-17.12.1.ebuild
new file mode 100644
index 000000000000..a4c37c37db0d
--- /dev/null
+++ b/kde-apps/kget/kget-17.12.1.ebuild
@@ -0,0 +1,65 @@
+# 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="Advanced download manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/kget/"
+KEYWORDS="~amd64 ~x86"
+IUSE="bittorrent gpg mms sqlite"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5]
+	bittorrent? ( net-libs/libktorrent:5 )
+	gpg? ( app-crypt/gpgme[qt5] )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kde4-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bittorrent KF5Torrent)
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package mms LibMms)
+		$(cmake-utils_use_find_package sqlite Sqlite)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 825df8ef3862..673d208c0b6a 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-17.08.3.tar.xz 4399488 BLAKE2B 77611aebc0d293a96452e372cf8161a69fd42fae404be4cac472e59a8db0395e1fa674d17f22452ac85f465765d75c295c3f0691921ff5767222557d3d10688e SHA512 8dbfc935142e6da09a7880d1b7bc66bbd35070dc548a85363fed13bbc8a276b2a4dda1eb08ffa302443f0584401731aeb225a4457540b9afc55d8da020254f3b
-DIST kgoldrunner-17.12.0.tar.xz 4399996 BLAKE2B a236b0c4160b6f96727079cf411ecc4098f36c4317abf662c51557f33b578c0d30e7f3ac75606cc7e3a3b2e441e4257d91790a0b620300e99afef2a5e72a6ae9 SHA512 fd4b2928209007378c202544a593c2c975a372c3fcfc6f26c41a020a6c9af73deae002f29c98df71071ca0c5ff71b09391dbfaa1653bf9e1a52bd1e018e5a41b
+DIST kgoldrunner-17.12.1.tar.xz 4400872 BLAKE2B c7b95cf8abbfbb627eb99eb86fe94628c8d10abc5666221ef8951898e9e5ce5cd827e83baeaf16cd9e96e41d11690041616bb245610794fd69e60eca44d8b5ce SHA512 b5a2025f2852cfab49864b4667d092aaeec4f74b06d0a618ab259ad28d7033868b7cb74fc11b3c91ac765eda8bbfadfd1905f012f0dfa6bbc770ba96dfb8869e
 EBUILD kgoldrunner-17.08.3.ebuild 863 BLAKE2B 2678f466ee36eb9e8d01491acf586c8b3f2de0c4bb88cccba801e913afea9fe3e0407e289dfbe9b1f94845c3dda81d6e9a80d1fe37d89d994e8c446c6872b8d3 SHA512 ab03a6a7245ac2e66d84adce117bdbc16c2949f11f9aae88b7599388e2b4eb6c9177374688d8df894e9b7acbb46d060154944101f57b564ec02fa3aa5fd08d74
-EBUILD kgoldrunner-17.12.0.ebuild 865 BLAKE2B d0c240ce038bb217a6e2657177e1ed659fb872e6e93721078229fd163dad8f4349d15810d713b05afd9e269c21fd23f73f2cd8fcf0c2ddcf9cf6a4f270078494 SHA512 abf1125e55fb6ad504010b79f790836745f5066092f082d136ec88de539c473e48fd3b7fb86364b9fe1110828a7d5d6bb523571a189f210eae707a6a7085be8d
+EBUILD kgoldrunner-17.12.1.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-17.12.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-17.12.0.ebuild
deleted file mode 100644
index 5972f27d5899..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-17.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kgoldrunner/
-	https://games.kde.org/game.php?game=kgoldrunner
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kgoldrunner/kgoldrunner-17.12.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-17.12.1.ebuild
new file mode 100644
index 000000000000..1377b14402d4
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-17.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Game of action and puzzle solving by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kgoldrunner/
+	https://games.kde.org/game.php?game=kgoldrunner
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 16c18706c432..85c8b253f26a 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-17.08.3.tar.xz 2817416 BLAKE2B 1c8bf494b5ed87021d0fc32e88c0455bfb304bc2b86471b457c258fbb25ce6cf2396f5f8915ed27e63b272c5abef839b73820e841fa685c971b8dd7d10557de9 SHA512 0d941e6b9c8a5ebc87431d5922bbeb9b1bbb15177316bf5f2ac17964a676e81d23f50f0db9d92ca749b3abd67ff86fcac9289ab153da0f9320bb24973c41d1a4
-DIST kgpg-17.12.0.tar.xz 2817752 BLAKE2B 86facac92649effbc85bb93faa6df88f7bdc642d397d00656210d5bcdc86b8ffca3d142fb6d2afaef71ffb1dd8c0abea9b4c35e9afd0cdbd8eb00f901e7e398b SHA512 0213ff56a7b974cab1feeb9724c70aabd56e67cc0d428dadb300d7f6502db438f58b837ed4098f3579594131998319a3b6a643f3f9a08eeee672d9b6a379cae1
+DIST kgpg-17.12.1.tar.xz 2817848 BLAKE2B 5260c769ec70f75d846fd310f0c239ee618d3e50f9b238a448d81f6f31b8cbc148ed5e60ba4439f765f69395d674fbfef370a7bfc8a7c4d267ef42126a6cff60 SHA512 a498b74465cd6ca7a3540c95d2f3d3385d63872b87a2a40018a7481d1cc3d172a4b47c9d405977bfd924900522e5786626f38d2e5489f16b4ed9d9b300acbfd7
 EBUILD kgpg-17.08.3.ebuild 1275 BLAKE2B 9cd9ec2e959357ec4033840a0b58a61a3de8139d18cc85d66be189e0ced133b9ce07b67e2c431a4fb29dbdefa7078d09204e2e9fb9ad6306e68987ca6725f81c SHA512 5058fceccd745519eecd60e30f586c214b43316573db1c83f45770179a44e69b1962b104e13d3d0e547d2e59d1f5843016a2fff6eac89603b943f93d679ef668
-EBUILD kgpg-17.12.0.ebuild 1277 BLAKE2B d08aec1af0fc1434891a92012a140ce40df5318b65eed9ad047393c62a7d4a48d1c9d63d58159b171b3af612df2f81b8c9589adc0ef546628fb167f645618485 SHA512 c682cc5bcadc1d62d2d9fa9ffbffbca610e6b9db7d17c80fb79d63bdae8f35716dd741f0c30b7ff862cb4f20f1c356ce1152b8c3845df78141a53674d89b95bf
+EBUILD kgpg-17.12.1.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-17.12.0.ebuild b/kde-apps/kgpg/kgpg-17.12.0.ebuild
deleted file mode 100644
index b5eabdcbb2e7..000000000000
--- a/kde-apps/kgpg/kgpg-17.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-inherit kde5
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
-https://utils.kde.org/projects/kgpg"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/kgpg/kgpg-17.12.1.ebuild b/kde-apps/kgpg/kgpg-17.12.1.ebuild
new file mode 100644
index 000000000000..9179f8168592
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-17.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde5
+
+DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	app-crypt/gpgme
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/gnupg
+"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 6ca26cee92d6..8f5d8edc3592 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-17.08.3.tar.xz 6452312 BLAKE2B 1c454033f526e1b72652e9812462248179a868f4c4eef779609e672dd402607222edfbbcef598b2fec19285e635ad239d31b66554b90b72061d3d622af7ae690 SHA512 f7293dc17a6d478754d8ee48787b4d0196f6efad2927961754e1581e995a20bc0cd9f7216cdcf548fca49347ce1e0460edf806ebcf0c1ed80bc43b2b77af1720
-DIST khangman-17.12.0.tar.xz 6454496 BLAKE2B 8c293b5e5bcfc4288e4bdea9dc0e4f0e7f2a4c0f7c79d330dff59bc65cf1aa5ca669409d2f2023e0b2f0986837861af05a63dc12897b415ae63cfc795521ee89 SHA512 dcb88b255fa1dd51f02c627ee1e282c513aceb5ac4f55f6db4ca49b6c2fc03bf3fa80ce5e650e4b18c97cfb5f2e6e99632bbbbad58cf208ccc25d7af8e82b774
+DIST khangman-17.12.1.tar.xz 6452132 BLAKE2B 3929be80a835ed7d85d4cf3055526c5e07d816d69a2aa2a79776c7a0521034a8882d2f2a4dcbcd87a9f5ad057fe3c256d2169adacc86072b72f838feb880590d SHA512 3dc75f136d1e4b1bbfb58e76ef8c783bfbd1cb474b147bf33cab39ac9eea2cec8449069bb7de82aa1e4fb437015efbc6c3f589541dca08a853de7c362c35c446
 EBUILD khangman-17.08.3.ebuild 1039 BLAKE2B cb1c800833ae61e4c33c88d06b3f900f63cfa11f0c485df8149323729404ee1a5287e399aec95a7b9a152300253da6f4e5c842cfb7a630cbec250601c4a1b09d SHA512 d23a4201fed1790c7f730b6c7ace8688c02c31544c5a3f70f135567cf5aa8a6815365fe67026498b86121eb4c8f6c98ddcf85967cd478b6929397161587fd7cd
-EBUILD khangman-17.12.0.ebuild 1041 BLAKE2B 062c65a0a102f4df871b5b4011a0d59f38e4dbbf0261ba8b8a75e329e7c531482a189114075f2c6c8a0ef310bd34a7cd7de21b987181ecaa9b58303fee8a3aba SHA512 e6dbb32e143f5c8bc19b674b2310291f582ec1928cfca36da52de73ec9acf04dbf5c3879d76e34fd8dd4511c55361c13aeeb00c4070665c326f19c0bf244e3e3
+EBUILD khangman-17.12.1.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-17.12.0.ebuild b/kde-apps/khangman/khangman-17.12.0.ebuild
deleted file mode 100644
index bedf58f61f14..000000000000
--- a/kde-apps/khangman/khangman-17.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://www.kde.org/applications/education/khangman
-https://edu.kde.org/khangman"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtquickcontrols)
-"
diff --git a/kde-apps/khangman/khangman-17.12.1.ebuild b/kde-apps/khangman/khangman-17.12.1.ebuild
new file mode 100644
index 000000000000..cb57c5103efc
--- /dev/null
+++ b/kde-apps/khangman/khangman-17.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Classical hangman game by KDE"
+HOMEPAGE="https://www.kde.org/applications/education/khangman
+https://edu.kde.org/khangman"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtquickcontrols)
+"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index bab9185c1322..82b2f4e62ce6 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-17.08.3.tar.xz 3024844 BLAKE2B d65e6a0d64d63b4627615d9f51e8574edbb594572d3edb60f29e0fc8e9979766db6ff8bc5c02ff95371540c7cda331b8e9458a7711362f9693e7fae1e510abcd SHA512 49533fbc063422fdd8931165b2465be8c5d6b87b264dc7f4ed6c6d123ac7ff4bea62237eb48cdc2aff2be670a682790936afe8645ad2793a2835169c8c14d107
-DIST khelpcenter-17.12.0.tar.xz 3025596 BLAKE2B 200a50f2ff520421bf905821a932eeb67e7505f151826e5689cfbba976e575547301478681bb91720a81938d232edb964fabc1e00f05a93a740639c0188e7e77 SHA512 6881ef5f0456b6777a6832fb546812374659f0e8c9d7a12b95fe542b5368f13632217bd0baf07cd33965eddc8d27fa462d9c59457ae0e4ea875c7d09e13a533b
+DIST khelpcenter-17.12.1.tar.xz 3024796 BLAKE2B 61dc13d8de7123d83ccb2a875079f07571212e9df1ae909ecf549edbd0dfaf8b5bdc9833b8749f4273f13be1059f476fe99a7cd2ccdee8f92b2007d8b8afba7a SHA512 1dee188045d1761410057772af5becb3d4dc18224266faa3b76cd5041847bfe023c8b869c1c09c16e91b952d78aa8fe8a4b9511a5527635e19257e1845ebcf46
 EBUILD khelpcenter-17.08.3.ebuild 1074 BLAKE2B 2f40e7939174cfe3bc2de22ea5a4699dbbe65ddecb8a1d61c051cd3d6fbbcc5cc394f6fc1576a051784fc295a31ff826e34c4d02497c7b4b5f7a8c8d6a1c3cbc SHA512 4389769916da88e7fc98f8c186ebc334467f9345f51605b2eb70c9d849e1073a467283f07c0a2055e57404fd4e99bff3b7f352eddfc8a51cfb85fe063831779a
-EBUILD khelpcenter-17.12.0.ebuild 1076 BLAKE2B ee4f80d985e4e37d79f9ba1b606fc535bc8f3c8dfa1b3d4b8bd1c8b5b029c15e2f8ed89ec8daa735bee397aca3ad3b8423e4a6f317aeaa2a1eb6b274a33e8564 SHA512 21c7e55b4871430baa7d62ebbf099be1978b80ff179553d1604e91f73b41fe01f001e4e3dd2020c7d772b1ba68683845ecbb6f608b08b74319bd9d0a786c9e50
+EBUILD khelpcenter-17.12.1.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-17.12.0.ebuild b/kde-apps/khelpcenter/khelpcenter-17.12.0.ebuild
deleted file mode 100644
index ecf2ff4fa059..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-17.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-apps/khelpcenter/khelpcenter-17.12.1.ebuild b/kde-apps/khelpcenter/khelpcenter-17.12.1.ebuild
new file mode 100644
index 000000000000..7a7d14ca377e
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-17.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxml2
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
diff --git a/kde-apps/kholidays/Manifest b/kde-apps/kholidays/Manifest
index cb04a0e6e7ff..8e1c1b0762b7 100644
--- a/kde-apps/kholidays/Manifest
+++ b/kde-apps/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-17.08.3.tar.xz 202580 BLAKE2B 9d98aea2e60039b3dc9f2aaf5c918329a344cfd80ffde18dfa84a7d23ad6dc40c4bf327c7e295dd7da70004744f1cf96ce99bab4cab896680348b137f0dd86dc SHA512 aef4cedf7d621b236cd09b990f9e6e2177d63af1831b17bb5df390a1a182e98f8e9d24a3d8fe7d763d9f7f29bcf6a8e23dd1d6da0bb1e289101aaa50c34fa040
-DIST kholidays-17.12.0.tar.xz 202380 BLAKE2B 2e0161e677703add9467877a0cefad3b78563d7482658e7153370a968a0ebb20aaaac5f234cc36a5ee5cd5e4162250766121c5797201808f4f45a8c14d1ae52d SHA512 07b3f3a6f3893a6bc67b34d55c61af4f768741a907eea37905002b48066e761889d3bd778e5a60a540fa88e1a601b95665538e33dfe5406e1375cf63ed210267
+DIST kholidays-17.12.1.tar.xz 202512 BLAKE2B 3aa9e7c8f0ee35aad38efef73af7f596e9978c7626e64ddc42495bf17275ef62955fb7fa038197ca095e2789be16927b4214296a3cb65389b27f0cc48f7b94b7 SHA512 cc28539f3a64edf6ace5d1afcf3a59683c8d0b421b29cbf1c31c04c3444344c6bae616d50c54a522c0f2f754676e1bb6b75c143f00e5fd6a44c4e5117e605ae3
 EBUILD kholidays-17.08.3.ebuild 586 BLAKE2B 71dd6e096faf45fefe503a7afffca8eecac8876f2d9ff7229d32733b50a3899698978a4fb14c98540bc91565b0285fb21aa81c4b671511bb5d6ba4a81bebad3e SHA512 74d0fcb63edd4824f836f0631f8b2ca5fd8fb4605beae3b0b9964c7f84528b673e0f864fe0c334ab41cac92b237a377016e517c5ac2c0a7633e6d2a778a36d3e
-EBUILD kholidays-17.12.0.ebuild 588 BLAKE2B dcbc033eb3b3794d07c981aa8e4086a80359f33ea8bc6e9f8c858886c06cdcd712df5854b80fac4ed246504cd716f70c6501946b2ff87dfa61de780cbce36d85 SHA512 1fad1152680876d49ff60e3cc7f1ffd594b478605812eb125ecee890ebd1b9fabbeceed841a602c1c068d20fa8cb2a1c4b907ae66c56510a2f6cf255fab43766
+EBUILD kholidays-17.12.1.ebuild 588 BLAKE2B f862f92310908f41e0a395039b364ce773521ac8223d2fc4c75ea4143dad5ee7d30526781fef846320a8d506c0ce4f22047ee9bd1ec30e16bb47981c8b96e4f0 SHA512 dc99c36561f7793f873cc685d6cd5e321ff81ef9a78c95631b7306afcae96bf1642e67b986d289214416239261d176c0db380bcc7fc9418bcff1a8e6c46d36d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kholidays/kholidays-17.12.0.ebuild b/kde-apps/kholidays/kholidays-17.12.0.ebuild
deleted file mode 100644
index c434c031139d..000000000000
--- a/kde-apps/kholidays/kholidays-17.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	kde5_src_test
-}
diff --git a/kde-apps/kholidays/kholidays-17.12.1.ebuild b/kde-apps/kholidays/kholidays-17.12.1.ebuild
new file mode 100644
index 000000000000..9442c0f42755
--- /dev/null
+++ b/kde-apps/kholidays/kholidays-17.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	kde5_src_test
+}
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 83f001a615d5..cfed34db7746 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-17.08.3.tar.xz 147724 BLAKE2B c190256743d11e193905dfb9a3f6701b5874ff733e62236c86df829139337aac3776369ce8027ed4a0744249f7b778f38907a5baf788c36a89a070e85a5c4c5a SHA512 67efacb2ce3c60511677d658158abd4a4c00905408fca0a7c4be07fc63267c2ada5a48a642769c754d58bc8fd75f12f7de72eba8c18cbf3e6bf4c2a771392634
-DIST kidentitymanagement-17.12.0.tar.xz 147732 BLAKE2B 8f78502a60954d2cc5fe3ad71caf15a8415b6979b63c41b89aa5058ec30a1111f47a3219913399288304ee4e9ce9c3ebf94c1df5140f2b6578d7c3a90fc339a3 SHA512 2edc028207a1bd048ae1df9a3e0e6e5e43262ea5ef9726d29931f900e6fb16c36dc6a303e8cb1c9a902373965e576b689d8d9843fe9cca1632073acba6e9c533
+DIST kidentitymanagement-17.12.1.tar.xz 147712 BLAKE2B bcf3f432fe843c89d9b1859c9e3b09668e538c52b65f30709677b7a4d36a1044a02ab9ce4a9644a576da66b28683d1e994e218a7a07f39c4451f5af02e704c19 SHA512 feda5391b7947db65ace08ed2e9e0bd85c94c01588eb1002e8f8c4669cac6c17443149d8913c3bb9093f5df4f499f66ace5cdd03839f56c130c0886b1ac0bf2d
 EBUILD kidentitymanagement-17.08.3.ebuild 768 BLAKE2B 5c2f128f265c50b5caf506eee515bd98b3674aeee6da6f581d73806b5524090e5fad880e210d6f43e0584310980c529464951dbf30d685933026044d867f9216 SHA512 6b2cefe34c6244c713c763d31b137c063fa3404157b2ad746ea7b39db291cd347a92c8de4e5c80f1ab75caaa12e6463cd07ab5bd53bbf5fd197091045a723c40
-EBUILD kidentitymanagement-17.12.0.ebuild 770 BLAKE2B b39ad0f7054960af265b6c1215866749097d6a7191f689a042dfa10a7c8b3e0eda277fa442f3aedaa4620a91a806bb12525f653a55c884d1ee6f40faff05d3a6 SHA512 9f589711956fe18cd06b3d700e063c52dcf2f0a376c0b76216a6f621070eff3cadca95bba78a264c9fb6994b246f1e5c4ee4683bb01c73ced85a6c80b55aa28e
+EBUILD kidentitymanagement-17.12.1.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-17.12.0.ebuild
deleted file mode 100644
index 3a7c77c2d2bc..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for managing identitites"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-17.12.1.ebuild
new file mode 100644
index 000000000000..9cc840613bb2
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-17.12.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_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for managing identitites"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 019248a1618f..172f6014d11a 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-17.08.3.tar.xz 3588344 BLAKE2B 37d0e1536f7eb17eb731ea5411de0edc018d87a92d8a401f9fba5100b8533cd4f6daef3dfa8ca0b7e7f1058cd033872219b6ddfb1a6c5b1be33e72641f123566 SHA512 9ce781ee32697fd69274ed5899bef6a176e9dcb118f2aab7dbebde1b3a974fec4d3bf702dd9bf06caf986f304f66cbfd2300554ff7df469035b07fe426f1c025
-DIST kig-17.12.0.tar.xz 3589748 BLAKE2B cd34c7bb36ae46e0c8e6fdbaed8850c5bb8b7d8fd1cedd6ed96dbc99a4fa09a1b95e6c3c5f5cd36d9fb18776a122b9c6161e79d91df8815ec6c570570471f8cf SHA512 196e3a4c2c41acb54f1ce86aaa82eb773aded763c74724346fe24da47b6cb0984816b9a44fdb1c761c990cb3560522ac701513f0d046e25544e3488f61a5c067
+DIST kig-17.12.1.tar.xz 3589748 BLAKE2B 286f728cbfec3f9f59d4bf6d8ee95f2f25fd0ff0ea6bd70b911a1765a3db61732019663d03ced71a499cf6b3e0667bc26c245682058fc8aeae8334f2b8a1fa20 SHA512 635082e00c3ecc41cd50651187d7338a37d4eea686a54e689773cf3160c2577cb8a3414abcf136a4c509431809ae20bd7462b0cd705fef64ea38d2db47dbbf9f
 EBUILD kig-17.08.3.ebuild 1499 BLAKE2B 2c8eba9550d0666ac256fe68c711ceed467f895246147ebc8261005638d4f1c577be9b081127513ddf61b6f0f8761f478aaf611c3b9f83ef1e5f615a1f06d2a1 SHA512 c8757df0e00da55e73fc93bde57b1769b4ce076699c99b7b940abdc0750768f697ce62b61becf6a36ee326e301f14f5b8dd80a29a9e10a9c55d5aa463aea7324
-EBUILD kig-17.12.0.ebuild 1501 BLAKE2B 543eb279ccf2b44403f1974ad87ecabe24900a20b2018b042bedb4d166ddf4ee2d969602e687b7848fc5df428329ec322e6499ecda61454d70e5ad8e9ba46029 SHA512 baad75ec845489e6a5191ffc0b91e48f86a1349ffb8460fca4d64d0fa01c0458394e136a047b9fcaad1a9263f3d55ba2f10887877f823a6d9aa0519d5dbd91ce
+EBUILD kig-17.12.1.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-17.12.0.ebuild b/kde-apps/kig/kig-17.12.0.ebuild
deleted file mode 100644
index c28dbdb68ab7..000000000000
--- a/kde-apps/kig/kig-17.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
-KEYWORDS="~amd64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	geogebra? ( $(add_qt_dep qtxmlpatterns) )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktexteditor)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kig/kig-17.12.1.ebuild b/kde-apps/kig/kig-17.12.1.ebuild
new file mode 100644
index 000000000000..7e2644a1fb74
--- /dev/null
+++ b/kde-apps/kig/kig-17.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
+KEYWORDS="~amd64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	geogebra? ( $(add_qt_dep qtxmlpatterns) )
+	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktexteditor)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake-utils_use_find_package scripting BoostPython)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 655a7b663e83..0138e4f90318 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-17.08.3.tar.xz 5222016 BLAKE2B 2544496c74592bbd2bb1ca01582c4a5a855f4db7f89d781ef8c74bb23aa1a7723983a3a9f3d68e01c20d6cfcbbe1e47e9f392046033cb7c51ffdd98d52f96c54 SHA512 c6ef6cc70f31be32fd48736fe993e84ad3eecabe3d40df1332b9d5ddad49ef40682f3cc9eb5be75e29bd2df5360b33fcfe66752d560b793fa957bb9dd77b7820
-DIST kigo-17.12.0.tar.xz 5222340 BLAKE2B f1744ed1cd2dbbd14b226dd7144ae568f7bca2daad70f50559bb45fa99cb2a795aaf362d2c4f5a831c601dfe6918983806daff3a1d61ab41049b230168df9c59 SHA512 90a8127a4eb6b0c358972dff5df23c18491c3290198fbc0fa474cadc98911d2b377625bcbc4fd308a759755ff210aebc985b90fd5dee066240ff4cbf369dacf2
+DIST kigo-17.12.1.tar.xz 5222256 BLAKE2B e7da4f38ecd7218be88b6d259d4d075818626ef5a1b359b2871add6b83838872534318bccedf65ef7fa51efb636beb5898762c53538fdbe80fac4876afcd652c SHA512 cdcc081fa7571bc2af6a75162dbe45a9062168c17e16c35a34d51f7e49de6ed98072d9355bd814e26a4a9a03c0350db970f0dcd567a837220e78b64074d1c8fc
 EBUILD kigo-17.08.3.ebuild 853 BLAKE2B 6ccbcebb69970b98f21dbb0dd69abb33f3cd60eaf8189546d36cb9e0478dde0ee0c9a555884b6da5ef8fa26c1fd4ebfd116fc925da1cd8dff2d1a40aefcf6d2b SHA512 8a182164ffa27296c7f77fbe56eca304317a3beb8a48a14c42362ea559501d5f017ee01b5228285a1a11772e2f457373ff6246dc2380ac5b090bae719d4cb6c7
-EBUILD kigo-17.12.0.ebuild 855 BLAKE2B 532be0b799b08e63f95fe75b5a18818246bc2b8f8b2f979cf5558f17b01cdd85995d74a0a39644df69d37260313c00516d311719d3751ca2f69cc1e1e2e3d922 SHA512 36441c800b7fef924b4f9dce85f22c39106d7ce3b999a948ab08a1bb861f0c59ac980cdfaa9a347c6af9fa006cf86b61cb3b82d668a35fb7ffbfb9ea4b2f0f6e
+EBUILD kigo-17.12.1.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-17.12.0.ebuild b/kde-apps/kigo/kigo-17.12.0.ebuild
deleted file mode 100644
index b1469b915507..000000000000
--- a/kde-apps/kigo/kigo-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-	games-board/gnugo
-"
diff --git a/kde-apps/kigo/kigo-17.12.1.ebuild b/kde-apps/kigo/kigo-17.12.1.ebuild
new file mode 100644
index 000000000000..3dd95da49b6c
--- /dev/null
+++ b/kde-apps/kigo/kigo-17.12.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="Go game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kigo/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+	games-board/gnugo
+"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 9146691b07bb..3de572059b93 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-17.08.3.tar.xz 1166128 BLAKE2B b99c46ae471df1164455d324ec3bb742fb3310e59d47a206f2665a5f961a01e29e5f115d114be6f0a06b2add09c86430fcac0ef6c105105d395d2ae4e8f450e8 SHA512 3582e7ed568c8968e53e761fb581a16027a1d74743f412516e54efd901fd1ddc40fb4bd87ddb3b9616b99621039c4f185e55a6f92dff2756574f3900bb934070
-DIST killbots-17.12.0.tar.xz 1166164 BLAKE2B 9b0a35663e28533a02a1d62d6a50936726475ae549f61c14dad60b7ed01824c074efea3abf11919778c96e976fe94bcc617300ebcebe42ea17f8d731a5db1d08 SHA512 6a9d4a1adc6f057d37f7d00aff703c5bc2bf0b83e35efecd374a7b001ab10300502d4b72c3d7ef2ecb6ae108c400f8cc7e279ac797b5052703588961e4803e49
+DIST killbots-17.12.1.tar.xz 1166100 BLAKE2B 53b682377f8b70fd5ead41b28e0e0a6e865e94e5ecda71b578b1403ad4656f269611085f42ea5e8af33007e9420555db165c3ea36eb554538b8fbd92ac743b41 SHA512 1cd32ee7134c5373789c51d7c9e900076781aef5c236fb8a095eb727b89b7ac55ff61ca71c3409d3a62c21293e34e681594a3241ac62ac4e2d778981553cf74f
 EBUILD killbots-17.08.3.ebuild 715 BLAKE2B b7f22ec795ce033c9ee0693ab7dcf7f2063757d9f0df94b67d000f4e91096593de3bb953d2fc4457ba96cf05d90187763338eed3a8474c6dfa1c1e787332abe3 SHA512 45674c79603b7505b25c7662c7b37b781918f91245c85edcde21453cf8dba673cbb04a797ebce118c28550e37dc4d44249ce0ca85ac0a659b0d6a4522a8574ec
-EBUILD killbots-17.12.0.ebuild 717 BLAKE2B 5c4aac6956ac2db45a368dbaa28649f30471ded2ab54fbd1193e576eba640cafe0e7af91f951a0266dd539e57de11590be23c2cc7f454b231e4a94b7de925655 SHA512 877627ed6aeacc35fa38d70a041f89ef52cf320231f8e97c01334c3b211d263f3b38f7503e96f6bca7fe9fec454f67f67ce30ee06719c478539020fd6d8aa33c
+EBUILD killbots-17.12.1.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-17.12.0.ebuild b/kde-apps/killbots/killbots-17.12.0.ebuild
deleted file mode 100644
index 4304fd185af4..000000000000
--- a/kde-apps/killbots/killbots-17.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/killbots/killbots-17.12.1.ebuild b/kde-apps/killbots/killbots-17.12.1.ebuild
new file mode 100644
index 000000000000..eb0d9bdadcb2
--- /dev/null
+++ b/kde-apps/killbots/killbots-17.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Kill the bots or they kill you!"
+HOMEPAGE="https://www.kde.org/applications/games/killbots/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 2b5955f90c39..5f4bc3cacfb5 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-17.08.3.tar.xz 407148 BLAKE2B fbcd6fa339e3f5a48c885f4eed645143d8208ed61434612a4a2a88a2dd2c8a34567da6155c38ee76768ae89d8dd03cfe89ed37f53347c4fd91f0df8b4a571ae2 SHA512 115b1cc4238fc1c07a2994cb4493598b725aa986d9d69676da0fb7657b31ea1ba960b062e4a84cd0d44e318e8379378c70520402241a49e3a613f545e177a301
-DIST kimagemapeditor-17.12.0.tar.xz 1055624 BLAKE2B e941d6e7a1347a547a2366c3a7d8c0c54bb2b3002057fba0873a59cdf5013444c78019d122dd0001dd23148a193da28baf1080a87a6d69fad6ffbc2c95ab599c SHA512 b043a596042ae085abcf0689f2464d65fbc0ff922c3181501ab96b9d2fa1ec7d1be7cad17178b623af40a7c9a8b647a224f08dbc7a30f6ca16e2169fcc7459fc
+DIST kimagemapeditor-17.12.1.tar.xz 1055076 BLAKE2B 0f44a7b3a14a0f1f2e7de28553eb8d19c29c9383946666a02702d9d78021f56752ff235b117a0f1f452e5d83046858e03784c59bdab8fa780cc778d6bfbfb14e SHA512 70964a73577f6059665ef917b38fbb121d30722e82d9adea627cb20958b78a99482b1519950606508956d35fb83c4ebfd72556934c06a738dd2841b2e52d4c1e
 EBUILD kimagemapeditor-17.08.3.ebuild 319 BLAKE2B c6829377f1728848c2b428203307000b02f2ac80ff2ac72e8add88b314a693046d58d02ea6bc964e1280fec989a12e5ddbc379d49e68d01e4438fbab7c1e80f6 SHA512 985aa24ffaf07097daebd0e993365ae347c14d523b335ea5c488a505e4be873d9598047b58de9f2a279038fbc02e9f50be8e913b08de1e37248a2a13c21b8263
-EBUILD kimagemapeditor-17.12.0.ebuild 805 BLAKE2B f9b5d13da1eab9b4cdc4592ca9a0112b6ad84a612d339bf0bcef13d90dca873ad56cfa3df9f1ac8fa3c0692e4dbaf7c389508e88dbada9fbf3100f46b4c33ffc SHA512 df1f1f887f9dcc6dfcd94991145e71a506688636002dca5f80907fd34c7ad946c5a2e043da15769109a602784a7f98c6f946c21ffeacc3c8282cecc5bd038276
+EBUILD kimagemapeditor-17.12.1.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-17.12.0.ebuild
deleted file mode 100644
index 515fe64efc74..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-17.12.1.ebuild
new file mode 100644
index 000000000000..a457413fa6e2
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Generator of HTML image maps"
+HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 4ce08f3476fe..d63eda10d89d 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-17.08.3.tar.xz 119852 BLAKE2B 8460886f0be75e53985042e9b0c103b379b5c6821e983f5550ac300e883c702812e808b9affc17b6188c9d5e5e385e2687c95dfb5d30acd3debc9974077192a6 SHA512 2945c19eeb04e4e49a496e33ce29ae0c25d7a2613b5d59c26740bd91d7edec02177fee2965d099f36badc6cdf5507dae54676138d8d68d4a23a5a656153f7041
-DIST kimap-17.12.0.tar.xz 119676 BLAKE2B 67211cce5f8b4e911924b6c8cf4887a23a705d01607f4d9ee415714102317931aa96f0e00c7d3fa5c80349fad6be4b001f0753e92cc2092a8313b39f76269b2b SHA512 6472eb7c28b949a311dbe2c3b67c4f799453dd4c40d2af6f00a24872d891a20b4c0980a2ca9f7184402a2883554ef16baa3ef1c34472c90593cc6f0d144c05a1
+DIST kimap-17.12.1.tar.xz 119692 BLAKE2B d8f54a190ef1060cdfaf539f8a5ceebae45b5316107cb3d39aed2b5b10deacbad6633058bb363f3433a91b3154085aa4221d4f6fcb917feef9a906a07cf9d90f SHA512 03098dfe1d8d540d353a40e5dd4450eb7cad898636a7986e921d78c615c6a1d6abe5532cd98561db04752c4ebb498c6426bd72d7039344c7d2d6a3ca92323929
 EBUILD kimap-17.08.3.ebuild 608 BLAKE2B 56da5579f6d38b231724b3aa632261a7d82aabad3f848cb1fa5bdad33e68d5bc36f0d607b284aba0c071963fa6dfdaf002bd74aa7b9bc06317a76a5a9eb78f04 SHA512 7a3827f0235841d7375cb6f94951abb1b689514cc075311850f92601663fdef8c7434f88d0a79db12a64d0abbd850c78c94fc0dc200b4fb738109f71fa93cabe
-EBUILD kimap-17.12.0.ebuild 723 BLAKE2B 6e851161581899543967afc3f75c4cd6df66a8b29563d80979659d54f6875d4927416cd7ebecf9a3ade8ecc6a4607345c7fe657226b83280cfe41775e91dec84 SHA512 8c6bd6ea66d821362213dbffc49649efed747c0acd168efbd9a6002a9e8a7c8c2592e35dfbf977526360601ecfe0009ef3786c92a3648959c76b214919374b7b
+EBUILD kimap-17.12.1.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-17.12.0.ebuild b/kde-apps/kimap/kimap-17.12.0.ebuild
deleted file mode 100644
index fc39c269408e..000000000000
--- a/kde-apps/kimap/kimap-17.12.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
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: Convince upstream not to install stuff with tests
-CDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${CDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kimap/kimap-17.12.1.ebuild b/kde-apps/kimap/kimap-17.12.1.ebuild
new file mode 100644
index 000000000000..e7bcd2eec264
--- /dev/null
+++ b/kde-apps/kimap/kimap-17.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for interacting with IMAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: Convince upstream not to install stuff with tests
+CDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${CDEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# tests cannot be run in parallel #605586
+	local myctestargs=(
+		-j1
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index f55eeda2631a..467f2e9ee75d 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-17.08.3.tar.xz 556316 BLAKE2B 9dc5d9b20c459777c2d5ae5445c28a2b7576665a4a6edec5329689fd35be3ab86fddf6bde665c5c0b00570bea01e498f8998796ad244df91db42bfd889ebd84e SHA512 660370a59bf506bdb1ebaddb7de639f67021df4d3c7c26866e35135a66d736cd1dc11fc1a74f880d38b9989f656d14982bf1ddf9b26d6c7e8b1ec81228f6a2e5
-DIST kio-extras-17.12.0.tar.xz 556016 BLAKE2B 8526eff9de1be0e206aa55e6ce5917ee0b875b3009f2e7910f7ff0626cc0fd89d7b94808773fee2be469bdbd8784461eb4b0b1e925ee8bb4fbac6cf559cf8e82 SHA512 5996c814bfad67f8de207d44aa362d4dc751dbc83a6bddd1ce0a4c81aa1999cbfac595a17f1e668734d0d9fd33642c209101536f918d463402ae7805d146701e
+DIST kio-extras-17.12.1.tar.xz 556140 BLAKE2B 9af667bc6fd417c3dc97615ebbe024c881782c6240f20dac9ed2b6b5abb3cf4b8de4949ceeaff0bcdc8d18fefd7c7c68265d00e9b970775aef4d22bdcbda8f1f SHA512 fe322e91a08c0b26b31f92a75826e77376dcec7d83e2cb63e3ae4e7dd424a9c92c0a83b4be643b69c3fc6314007ce252920ed657a16da357330b6fb9b4c641eb
 EBUILD kio-extras-17.08.3.ebuild 2319 BLAKE2B f3ec58507312f0d326afb2d942c6d88558e94a9f3ed98350cf2ef722266b70e2f9e2ca861282829c4c1ab974ebdd5751d730828f056b55bf88b7f1c95d6e0751 SHA512 e646cd362895575083ff7e8f784db9a3e7b8eb84a06246e7b31fd90fe6569447ca610945066d0ff490b5fc3941035bbafdd538825db9b7e938d67b244090ede1
-EBUILD kio-extras-17.12.0.ebuild 2298 BLAKE2B 1ec2e82715cd53448cb6caef75b26ec8a9fef0ff446ea7a37462ff22019ace141f58cfd475ff5ca667387059bc8e6767b4b46bc6dfe9fb0d8a2e076eb46d49ec SHA512 227e1048a98e3c84c548cc7190a79378ec83402337b0ce130413f20aaf70dbea2e8cbc036b48073db0c0261df18071091908a18df5097f69edfbf25b80febbb4
+EBUILD kio-extras-17.12.1.ebuild 2298 BLAKE2B 4406945ebf87f46534cfeb49ee5fdf216949c621155e08fc19c72bbeea92df7dbbc0e21bf5b40ac35c8e4ef2204f4c0c31887bb5f63760fd27a320d7a0ded710 SHA512 e45ce10f20c7a9b0c5ed3399ff248a193c6b87e3d507841de1342f76f11362ea3db3e1edb911bb0ae915627e34a5218dafbf6eb29a494445f86e4b0f6bb36233
 MISC metadata.xml 679 BLAKE2B d5e3be772a13920bb093a4314931eac48f5a398582794ef769869d4f1e7c0d8136a12ebd1ce2fecccaaae99001194533b6c08b34a7f1a1e33c711e233428997a SHA512 018a5237fe9ace1ffba82c4dd5d3a4ce6228244476a163fb01ab5f914262cb20ff77d58e8dcc99713071ceb1764b9bc24fb61a8713001059b057963a9620abf3
diff --git a/kde-apps/kio-extras/kio-extras-17.12.0.ebuild b/kde-apps/kio-extras/kio-extras-17.12.0.ebuild
deleted file mode 100644
index d8937b02076f..000000000000
--- a/kde-apps/kio-extras/kio-extras-17.12.0.ebuild
+++ /dev/null
@@ -1,80 +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"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive 'bzip2,lzma')
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	activities? (
-		$(add_frameworks_dep kactivities)
-		$(add_qt_dep qtsql)
-	)
-	htmlthumbs? ( $(add_qt_dep qtwebengine 'widgets') )
-	man? ( $(add_frameworks_dep khtml) )
-	mtp? ( media-libs/libmtp:= )
-	openexr? ( media-libs/openexr )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? ( net-fs/samba[client] )
-	sftp? ( net-libs/libssh:=[sftp] )
-	slp? ( net-libs/openslp )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-	man? ( dev-util/gperf )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package htmlthumbs Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_find_package slp SLP)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-17.12.1.ebuild b/kde-apps/kio-extras/kio-extras-17.12.1.ebuild
new file mode 100644
index 000000000000..5a1c3d2548f6
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-17.12.1.ebuild
@@ -0,0 +1,80 @@
+# 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="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://cgit.kde.org/kio-extras.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive 'bzip2,lzma')
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	activities? (
+		$(add_frameworks_dep kactivities)
+		$(add_qt_dep qtsql)
+	)
+	htmlthumbs? ( $(add_qt_dep qtwebengine 'widgets') )
+	man? ( $(add_frameworks_dep khtml) )
+	mtp? ( media-libs/libmtp:= )
+	openexr? ( media-libs/openexr )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	samba? ( net-fs/samba[client] )
+	sftp? ( net-libs/libssh:=[sftp] )
+	slp? ( net-libs/openslp )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	man? ( dev-util/gperf )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package htmlthumbs Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package man Gperf)
+		$(cmake-utils_use_find_package mtp Mtp)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package samba Samba)
+		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_find_package slp SLP)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 43062b92209b..2de86fd9fb07 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-17.08.3.tar.xz 325888 BLAKE2B a38db05121a419a3ed572ca7d1116d74148ac8132ed3084923ec83739843223be3336ff5e955f6188a156b5b432ab038287866ecd6929557a1eb453d7e613006 SHA512 2f858782e74bb953e1215348b0850f8c33fc0e00cf54e6ce098b0c9cc6de68a6c2a1bf641a6c5d097255db593dce66b0d93d6474a9ff6eb79a9d5418ee37948d
-DIST kiriki-17.12.0.tar.xz 325856 BLAKE2B d4e1fbdaa8047bd2a18fff07f265986ec21bd4ee35d86968524ce22abd8f5e6bc363cdec9a09947dfe1991fd3f5a09a4626a372f41d545e5f49bc77275481a76 SHA512 a3c25a78c520068d9d5a69fbbfe8bdb9010d047d4124dad903c0f87c8e6024f6adec61989c0b2f8824c6ba05e8a38e5d830879363d16bbe68deb20d891c6d236
+DIST kiriki-17.12.1.tar.xz 325856 BLAKE2B 5e98a16e0c3b012d138d64b8f6e67677f146455f69a0c25c3ecba4d57b1fb480476b96f10a00bafcded2b749bb3ed4be4e6f5f295dcae18492412bab9a8576ee SHA512 d4a98ee84ffdf557f9a95799ad1b2200b1b4ee9b89be3c73821e608b754e52b5304f1912d919d3f8bf992e6b768039633044c181884bad8a301f854aff47b535
 EBUILD kiriki-17.08.3.ebuild 780 BLAKE2B 162e749a3d18a36c6459a3452b450e3a7c788b2508fb49af0347bed34107a96c388c12e33f3828c5f3aee26a4bd804594228c594467997fa50ce04e02828da08 SHA512 a9c920183366f9b22083b383248576a377a1269fdca21eacb77bbc08ef51695a0304d4c35f63efea4297ac67eb2b1e5f04055c5f51f1ac2b25dc3493aa3901cf
-EBUILD kiriki-17.12.0.ebuild 782 BLAKE2B fb8251d96081ef7628ed2cc8d7b24299904176f89be7ddd4718a6951c2a075b09eaa803539df8c948e320fdf9bbc90498c44316990f2bff08a7942e20f508320 SHA512 0c11d9d0e051e63ca43200aa205d051ba1ec73a997837627df823d30c595a9f20b5deac38d8946f9347012558199a4c4526ce0b6b9c1a5f0ebc05870b1ad506a
+EBUILD kiriki-17.12.1.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-17.12.0.ebuild b/kde-apps/kiriki/kiriki-17.12.0.ebuild
deleted file mode 100644
index d0784c55f7b9..000000000000
--- a/kde-apps/kiriki/kiriki-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kiriki/
-	https://games.kde.org/game.php?game=kiriki
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiriki/kiriki-17.12.1.ebuild b/kde-apps/kiriki/kiriki-17.12.1.ebuild
new file mode 100644
index 000000000000..b0d97b3b53b7
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="An addictive and fun dice game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kiriki/
+	https://games.kde.org/game.php?game=kiriki
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index a4bfb0e2d6b6..a19a4ab7675c 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-17.08.3.tar.xz 11555492 BLAKE2B 29314e9c05c323322c4663bd4a584b88ce002f89cb3c2370d4c8e4ec5b45fd8c279ba453292e203fdcb18fd8547d581cbc75ac705bd182b0391a21fdc03c8f3f SHA512 f3186138cb898042bc727bc5c4b4a454d52f461c77c7d4fc8e5c9aa685980957fb3f8b15dfacbacda155323a72208805462987226afefe79b39355178f15db6b
-DIST kiten-17.12.0.tar.xz 11556176 BLAKE2B 2964d43a772d055e290b586c391360428f3e29b755c0ecd8f7a57eb47a0e79a2006b87cd0119ec598296cbd293a4469a3ebeb5a5c9fb8611f8d99605836a5893 SHA512 974ba9008b04e2c03eb7fe0930a3c24a4c9282aaf7100b0cdf9bf6d7dfdcd7c71ab5b64f972d20d29a6f6e75dbfa1db2d24bac7156df6378c51bf083eeccc04b
+DIST kiten-17.12.1.tar.xz 11556064 BLAKE2B 34e44f24836c7335ae368cc886e7f74a982633f67a6e5130fe5f24479ac45d39bb49747061aa86820f39c2bba5fd6a2c4f69f775e3173a8ea10e52708a519f37 SHA512 cb0ade7053307aa79125f424cc959d4e0f4d42f82f8c2f509e645ee32ac60428872c114dd7a9499bb7c2d126ac065b7af4be57ce35c68579683c56c43d3f2afd
 EBUILD kiten-17.08.3.ebuild 811 BLAKE2B 8e8bba88cd39f95eed1e502a3c0403b99cb1045046f346ee28838d5d8a9ce3ff37437bde9e499fdce6c686f7b17917b73deba6c45be2fa125e488d0c6725b064 SHA512 f44ef52fd8bf6901d641ca8086ef9349c4259c0f124ba6b420d7b2efb14a7aa2e740bc80c5549a44b6d40a401e031d4705cec9213ace23afb566fb969bb24d70
-EBUILD kiten-17.12.0.ebuild 813 BLAKE2B e3ddf62c9de3570539c87d1858d8a505509b66b44674f689dab888d7a1f0b5d806dc854a00e67cdd23256c2b46b255b3082be4500c3b0b2eb1448bd39f063a28 SHA512 c3c79c054c63206bb0849776a573d0af3ebd6b591ce21e6abd15b18708547d735ab23ffc81eec27e5af2ef6a54ed3d66517eee74a2ec32c58351cc2a39fc2483
+EBUILD kiten-17.12.1.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-17.12.0.ebuild b/kde-apps/kiten/kiten-17.12.0.ebuild
deleted file mode 100644
index 8ea0613b9c60..000000000000
--- a/kde-apps/kiten/kiten-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/kiten-17.12.1.ebuild b/kde-apps/kiten/kiten-17.12.1.ebuild
new file mode 100644
index 000000000000..19dcab41571c
--- /dev/null
+++ b/kde-apps/kiten/kiten-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# 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 Japanese dictionary and reference"
+HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index b0cf9b3cc1e7..94a6712cd1b9 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-17.08.3.tar.xz 293260 BLAKE2B 774b2781022a03b6add90a4d1b842cec9e42c245329708ac7efc33fbef470ed7c3d8e60839883c4798101df5e5c66a8d22739166ce6e387fc812d1b2e0a2e5ea SHA512 b90e20f7762581a898255cff2cc2760408994be109e838a83c336db20bfb4aae2b3a94fa98816752af0376de175c2cb84ace9b3a6dfd240771bc74fb135516c9
-DIST kjumpingcube-17.12.0.tar.xz 293440 BLAKE2B ebd5e04ab6a4fb3ae5f8ab596169d31ab10015a06d5487d80f199cc9b9f7101f326b303659355eceaaf69bdd448ea78a8dd725bfa45b2773e254d287a318f038 SHA512 880eeb589f3a1cbdcaafef9c54bd5dc4bfaeb84d18f526dff7e5e7e18cd09b40834a71516a97cf6dca055999a0906b8ac7e1533a927e162cf4c86cb6edc53db1
+DIST kjumpingcube-17.12.1.tar.xz 293356 BLAKE2B 4424d2fcd7d2821323ddfc83ef1b44bd3421950d47827f1c1b6d7402fa724e42bf2312bee3395036c27eeb1e8d46d32c2a89929dbbce1c9d824edf4b783f18e6 SHA512 97dab83d42c2f176cde5a17f019b556b3c62f2380695f5183d07623b32012a975040ed0e1cf9f59646c93ca23238a52d656d498be0d7e8df105f13046a9e7be5
 EBUILD kjumpingcube-17.08.3.ebuild 767 BLAKE2B 85ecf26c2f2201b6af16572cfb7e0adb846a6ca61bee09f7fcfd92a6c07814d1e85970f5c520f91e37a58c13ecd03d6aafa7c0c4717404269b69fb093e976576 SHA512 d4843a5d448449c822566454bd14c61c0a42b29a90a5c1c47222ecf98bb42a686b7ddd1b6e03226b567e3176b7c53fe6659aaca582d489cf60fd242f170593d1
-EBUILD kjumpingcube-17.12.0.ebuild 769 BLAKE2B 817b4a5588503d5dc92a6aaa5194ce00c02faf4501d232e95a8515d28702b2182dd9c4043e9a20691a4969340b109d13a332a9c9540db58e0c1d929f937d1e8e SHA512 37fe9838d8cc7e1327f5dd632c1aa004d5e170e07e61a736d7e4f581941e01184b39c2af86ed42f0ab6fbdd96bdc1d69931dd26a4db21b9d627be516a2eef83d
+EBUILD kjumpingcube-17.12.1.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-17.12.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-17.12.0.ebuild
deleted file mode 100644
index ef0ad95ed6d3..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kjumpingcube/
-	https://games.kde.org/game.php?game=kjumpingcube
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kjumpingcube/kjumpingcube-17.12.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-17.12.1.ebuild
new file mode 100644
index 000000000000..24ea87a948d0
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Tactical one or two player game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kjumpingcube/
+	https://games.kde.org/game.php?game=kjumpingcube
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index d43a1027ceeb..10220b810c81 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-17.08.3.tar.xz 154864 BLAKE2B ecf22ab36150da39dcaa34b391864a7e6f7b3d4335e998089c9c7ebf582436aab0bd59cb3e04572dff74b2125ec5c243f8b2413bcb5be71168de4f44e3a30120 SHA512 b32fa8dfc9125a4f944aea710871268c64492cd4753a6be6f48f4bf314f9c66e56493c0d1bec0d3420edb6998971a9e1d941a050c038764e07b323b9dde8be53
-DIST kldap-17.12.0.tar.xz 155088 BLAKE2B a2db7e2a24ade3effa0fc74f36ca06182d0dbff582fa8f1a1665d4844ae1257f907317681b8f5a65eee5dfb099f4de1abe83e7114af01e717020873432121675 SHA512 1b53624a6aca494e3b249eb6cf1fbc8b89ab1412d31e9346c913d63c9080d6d10fc03ffd5f203a59260819b8c3b57a63ef67eb9c2d85de0049d94465acb33117
+DIST kldap-17.12.1.tar.xz 155140 BLAKE2B e2b1fbea22e8296c4a3849da3bca32fbcc371359f1b93ed77d96e6b0c0141936804a8e035a661cace3f56d495da0c73e77562e3f638921a5984d5a2cdfb3b5a7 SHA512 73d99db7f4f229fb44c90bd52c9929e8460cf44fc5e4ba734faa9e4a97b698afcee929ab23729a60ff0193d27f57bd5d00f4f81a14b882f7a824088de57ceaa3
 EBUILD kldap-17.08.3.ebuild 760 BLAKE2B 8d3e294d73c7dd5d9153aa64975c77f71920e1fbd5c881bc1f965ed9dbf4afe9c07ab2708730d6cb64b1a0d35f8c8470ce8bb01fdf2fed100cfc33dc3cc3effe SHA512 87eee96a0bc229e924a7a366eea5fbb34a892e6c2e287f8476bf560fed56933878e2606a401286c7b45f6def55d2f3f374fc83b0b3e02c98ff625294156a8701
-EBUILD kldap-17.12.0.ebuild 762 BLAKE2B 799b55a0d151822ab03f561b2ed3b0be25b5a7c0c7488c75e9a26043a6c6152e45aafea2b2d1de3672f636883338bb104e1ee03053a819701874f1fe3dab5a6b SHA512 afea073343533da923272ff05ba23c9a10411972faa57043d3cee7a97bf6b2711ffbc8b305f9ff4def1f4811eab14fbf7d86840c2291a6c98df3a35a9d2f6e8c
+EBUILD kldap-17.12.1.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-17.12.0.ebuild b/kde-apps/kldap/kldap-17.12.0.ebuild
deleted file mode 100644
index b55334312e57..000000000000
--- a/kde-apps/kldap/kldap-17.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for interacting with LDAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/kldap/kldap-17.12.1.ebuild b/kde-apps/kldap/kldap-17.12.1.ebuild
new file mode 100644
index 000000000000..fd1452bcfd54
--- /dev/null
+++ b/kde-apps/kldap/kldap-17.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for interacting with LDAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+	net-nds/openldap
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use_if_iuse handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 18368024fe9d..badac2ab06a5 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-17.08.3.tar.xz 1889344 BLAKE2B 758278159bd2069a0d8460e20da06f2400904e634248ed94b077782f01df437869241ec9d590388b205615849191cd36445060c1da58f6cbc0ff169950d1dd80 SHA512 b842b71c7394bed7ed3383b037b2258c72056b81d678350f1f6f4cfa2f75e269eafd45b82b78c3f7cdda659dbd9b2dc273a8d3b0ddd5cdc774277355578bbfe9
-DIST kleopatra-17.12.0.tar.xz 1897500 BLAKE2B 87b8230d80c91da4c6d0470ac6c98d2f7a90fec0ec3b7358bb2f6df8600841030ced54f1ba2adc77d7b106911d7f8dd2d7bf33d411cd6eeec58fab9e1e590f0e SHA512 568cf371b37f4e5ec2a597e35188386b0e2ee73e521aff5b1537b1078534800193c9c582c131f07be6e9275ff8650706f8aaa5c16b9347c250370d6078e949c6
+DIST kleopatra-17.12.1.tar.xz 1897856 BLAKE2B 2109ab6d50c2ec134a2364e899a45907de107809f0d1c03bc8edf0cfa58a9c917e543bc6b6ed9db11de7be777ac5eaf6966789735834c85ba1d558d6ec7ccf9f SHA512 ac46b4f5b5e0aec9c9300a364353a887b8d9c6d8ef91a67fdfc8b7b876339b462b89e569ddc16f8f969398e16b2a05d7832036bf12f16ef5362cce371eb3508b
 EBUILD kleopatra-17.08.3.ebuild 1265 BLAKE2B e8ef98107b6827256d85b2bcd9ab555d9eb694ef0e72e7f6ba06245a8c3f0ed42777f24a785c19c97c3fbbf54c7b6278aeccdb7ea98fd93baa2340d4a632def7 SHA512 49a52aabc3e6e0d847ab8541776ebe4b6720a3af250f430c8b503aa970204bcfea75be02c4e94d113e77ae5799c46309036cdb657c11824c1fdab2c33ac847d2
-EBUILD kleopatra-17.12.0.ebuild 1267 BLAKE2B 20f3152ba2b7f4509112ff785aca66c42e67323083e6f0997f68021186510bc76df17227d328de39e376e645ac8fcff939688d8329b79002effe90538b762847 SHA512 adf5c86d0789f1f1778e6a03bab8a14c69865eed05a13ea2f1db4bd02ce38fd5c8ab65efc0577756555bf96d2ab6e2ff5d42546c1369a68f232a91f79af3cf1e
+EBUILD kleopatra-17.12.1.ebuild 1267 BLAKE2B 33c25bf92de41c68c47205d330e174cf22a3dd4b1cc9ca60593b17cadd1325f1a02e6403dc3c4709dc54919daac091146e0dfdec56b923c5662a713fa1e01743 SHA512 4bae5f65523880caecb66e9805ec2167c3d838856b14601da600c993813b3d6ed67543ca96b0d4942dad87a10376b109c5a8915d5d6578efce65656b07a6a385
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-17.12.0.ebuild b/kde-apps/kleopatra/kleopatra-17.12.0.ebuild
deleted file mode 100644
index 33df52a5d6ee..000000000000
--- a/kde-apps/kleopatra/kleopatra-17.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
diff --git a/kde-apps/kleopatra/kleopatra-17.12.1.ebuild b/kde-apps/kleopatra/kleopatra-17.12.1.ebuild
new file mode 100644
index 000000000000..e0f1c3ee3c5b
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-17.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 02273dd61c25..4e1659465a4f 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-17.08.3.tar.xz 21712408 BLAKE2B 0bba477d71f60899ec98abbea21fb6ae00e9155a726dd7af60656f572ba28b93240042973dd72494c9aa2fab1ad100f4895529ef2de225be60f670b0c0bdfbb4 SHA512 9c6af3c6ce36c20edb583e27d121024027efb6836aaeb97060bbe6d31ece8b5d93050c8b2bf5fe84c7e40a0dffb2710b403a62dac7aee7eaaf2482427864a9d9
-DIST klettres-17.12.0.tar.xz 21712552 BLAKE2B 2a478a3512f6b7ae9d4b048d1c0ee18d08d75d5b5696b14cebf9a77f565837af7b210ea16f8743b529783249ff33a81edca365685e5d77b7536fe963591a9bd5 SHA512 08057ece3944585cca6c15c471af96cc3ba21d62a953b153c59a3ade88e59ba8f1886fcb660778da01c242872bad33d635eb4eaa0b79275df44e6e7d349d2d80
+DIST klettres-17.12.1.tar.xz 21712584 BLAKE2B 21c02b65c524b51b3f87a23c2f768671f95a97110babb867c2cd614e34e115ed78f52151a0c0a0027b03a4f4cf1efcb40460b6ecd20cd77f4914844ca5c1321a SHA512 4825dd75af526077db907d854d9c94aaabb50cd8189e92d8f67a9d92e0aa1277da796b70ce5a35ca3050e092fa9f191851c65ff5fe5a478d434be10410078f47
 EBUILD klettres-17.08.3.ebuild 771 BLAKE2B f4379e2855d538449c07a1e977ee5e9527bab3d10d89ae9188eea9751bbdfd78fa581b6e62ad4569417c6ec0d115d0c81781751c634bbbc7e606837c6da84aed SHA512 bce02a0904d54706bac9d6c63cb0d2cce4524b9258916d1e63f2e12b3287cd45171d7d083a70e25522d84e0e3c65f115d8424038796d5caf1af64dde72776f1c
-EBUILD klettres-17.12.0.ebuild 773 BLAKE2B 6a198b8d80d1dee29a46d790d3304d0c2cdada85de9a45a9bcee3a01a7383ece14251aeacdb65f83565c28b73797e713f66b08282bc0ac4483fc064d5dbcf793 SHA512 471e9f5282017a31b8336de2e2509d520ab8985ed03b15aa83b02278bdfb3c5aca0baef80cd9f58f9b3ea9cc435beeb82a7e0ad4ff0c19b2ee121415d0b9df22
+EBUILD klettres-17.12.1.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-17.12.0.ebuild b/kde-apps/klettres/klettres-17.12.0.ebuild
deleted file mode 100644
index 5d17b13624de..000000000000
--- a/kde-apps/klettres/klettres-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://www.kde.org/applications/education/klettres
-https://edu.kde.org/klettres"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/klettres-17.12.1.ebuild b/kde-apps/klettres/klettres-17.12.1.ebuild
new file mode 100644
index 000000000000..5a99090d00ad
--- /dev/null
+++ b/kde-apps/klettres/klettres-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://www.kde.org/applications/education/klettres
+https://edu.kde.org/klettres"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 1813407a6a40..d5d237b6125a 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-17.08.3.tar.xz 1410500 BLAKE2B c25e125944ff9060e759223dc53f05237688ff17a851b209b16712d4026195f3224daa19d4618c39058c3ab83b8a7eecbb49cb2e1922c4ab8897040e919d841f SHA512 9633b9f9d82e00ca07f95cd6652e56c362a3a74f663beaf61422330f06620e7df83be6c8eb9764e0f01a93a9ae82c46e88e911e6e93ba0df9273c477a9e6e17a
-DIST klickety-17.12.0.tar.xz 1410264 BLAKE2B 167b0b7f7f18b83caacd392e86d11193d7ecb78ba31e78038d68110d088af2d3040270f180ddcf0472af3d104b8d9a9e5afc1537fbc14a46b5f2dd39fa2ffd16 SHA512 ef3c7c576b955e906e13edbc9ae20e6f205aa668b1b96cebfe483317ccee2e3e22fe29e65520d744dbd7a3ef2d5633a56592a7b8ded734fe2d9b4f38ded26965
+DIST klickety-17.12.1.tar.xz 1410352 BLAKE2B 3465960b889a3e131a4c630ad67b333646a7a3853533b45e42019151d4428e7a90c0e4810620dfc8aa491f4462d53d6d34304d35c8f0fb085fb7374b3e34cde4 SHA512 857e76a4f3f04f04b9c5cdbae658e6f32ca8b0578beb9017be167a36fb133c259ea2e118bdd0cf0b6cea94b944c790f4ea91fbac071a656ea5140d6abf9564e2
 EBUILD klickety-17.08.3.ebuild 777 BLAKE2B 43f13ac4a36ed25e282fb0f10821e85b537da3818815d2e8ed98acd64dba19eb6c7b229acfa96721983c23bf88e6f3ee40c0a0cc16ba02caacd748c5e3962a78 SHA512 6e292470843f7830896e714434fc2aee7b96ceeb0ed7279d09da29afb00db6a62a2f8942b3c4570d518d83d4c6209d1aa78aa866b9fadbee6df6904ea466123b
-EBUILD klickety-17.12.0.ebuild 779 BLAKE2B ad63deac3a8a082b17c514e0511d5ea60941d4818b0b39fa596da5bc3e248b40f5ebc37360158787c154c63cc668635889c8fc2c34e42b7cd155c4ce7857b6f3 SHA512 66209bdc2ac0b580e99390d21e58ae6ef1667d586753c57400d6f55c4ed6adf254d63b53c84774a39fb447a69f50447bf21351e22904cdf128ea11fde50988d1
+EBUILD klickety-17.12.1.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-17.12.0.ebuild b/kde-apps/klickety/klickety-17.12.0.ebuild
deleted file mode 100644
index edd9fa7a6785..000000000000
--- a/kde-apps/klickety/klickety-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klickety/klickety-17.12.1.ebuild b/kde-apps/klickety/klickety-17.12.1.ebuild
new file mode 100644
index 000000000000..29d07f818c1b
--- /dev/null
+++ b/kde-apps/klickety/klickety-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 5e63287c04f1..83d96b2ab8ef 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-17.08.3.tar.xz 1666976 BLAKE2B 26ac347461265c04c11461f81e56cf22e83b68020e18e180274ab7a1191555d3a7cd65e1c61623e385c3d9d326a521baa07106d73f10976587db047810d947be SHA512 830e3adf29d73d0dce14f67a42bc5b38f52d87ba935fdfc4b21d05c8aa1d83c284ed69a120b70927147b3c9173fe2611843e4fd5d7ee7905ccaf9cbf57ca8196
-DIST klines-17.12.0.tar.xz 1667252 BLAKE2B 3a0317b1dc5bb9f742895054e80de253b68ffec238c01a3111aaf7af6a993dd0f7e670ab99446eea0d794b6cf06c7dd607e72bb98aaea25d61d01a2251b88033 SHA512 f9f0b35e8c6152d48535574b31e1c356012741cb085efc9071f43b8d1c5135e6f4f20c08bf507a838d2dcad1697d1777ab1aed5da9fc63317f9e1a36d933fed1
+DIST klines-17.12.1.tar.xz 1667188 BLAKE2B a270cbe74da2e61979e553e69c60416fba118972cab082c4b16bba3d7bf1b6ac94937606c0417ca2fecbde27b0fc56c478f732213e1dd8a158fcf4a2f24449a2 SHA512 753146f47c9b17e6e318f5c08d7a8ba534d264d0ecc1118d4b6c6812f684f5045bf56dfc3cde37204cc8bb2a85d879fdb62fb6f52764b3d59c7d5e5064727c68
 EBUILD klines-17.08.3.ebuild 786 BLAKE2B d9b66e7afbb0fb8a0e8fefd8f731c42bbd0b469f658da2d120dafcf7628a784b74d96e2299b1ecd542b1c259aff184345b8f5fc652dbcd7bd09fc2808e11141b SHA512 ac9765f806af77feffc77262bf730e812cfe65e071b74d249fe0ba7ec2f294753a15d5e633768738ca8cf998523874a775d835a26aaea7abcc282e37f57229c9
-EBUILD klines-17.12.0.ebuild 788 BLAKE2B 1cf2b5f148f07bc53e2e1d7a9aa3946a8040a70c0dcc1944026a802c415454af8d9e781a5f32e31c11867168fd81e69437c58d24785cb798ec85fb466d4f4f67 SHA512 5146b809de72401005ed70698985b9a3d80f23531240d6142ed4b324b2fb27bc8d6c2e6d911059f058684c9730136b60f60be02f6b2456d72f0776cefd27331c
+EBUILD klines-17.12.1.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-17.12.0.ebuild b/kde-apps/klines/klines-17.12.0.ebuild
deleted file mode 100644
index 78c62d674dd2..000000000000
--- a/kde-apps/klines/klines-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="
-	https://www.kde.org/applications/games/klines/
-	https://games.kde.org/game.php?game=klines
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/klines/klines-17.12.1.ebuild b/kde-apps/klines/klines-17.12.1.ebuild
new file mode 100644
index 000000000000..7d4775b223b4
--- /dev/null
+++ b/kde-apps/klines/klines-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A little KDE game about balls and how to get rid of them"
+HOMEPAGE="
+	https://www.kde.org/applications/games/klines/
+	https://games.kde.org/game.php?game=klines
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 7cb21cb62269..1084dfcb433d 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-17.08.3.tar.xz 587000 BLAKE2B a29cb51cabc1ae3a3fac666333deef11d0d105b9a4e8ca02a235828b80cd3af7dcc0574c5017bcd6adc718f74583e2c8fd43f1a6665b040c8a2a321db67bc671 SHA512 19dd936a28cce60fcc20e0cc962833dd7d7ea010ffd80f22f4bad3d269c16dcefd648179f88a66a01054e91d28aa6e03dc7e3b36939457588c2c6bdb8c418921
-DIST kmag-17.12.0.tar.xz 588148 BLAKE2B cf29af8e0877ffa519f3a0062d9a2123dae047401e020577dc2ca647edbdd9a0e46f3f5779504f5a678c9d320ea4a424722ba70f936ac7f623ff046940be0879 SHA512 c55e08374e2e4a90b716db5e89421e4159daaec8ca5505e4c570166b04367f49065691de4013c25e22e950cf6da9632fbb2183c8bcaa6f4c399a822d5f4b6a19
+DIST kmag-17.12.1.tar.xz 588232 BLAKE2B d60090f1b3ced290abccd85f97784f2288c4a6bd5384e2a3b18b0b6deec5ce212b99d216ed1dd0a5412dc4073dce2b090ca3f68372db68038378118053db5928 SHA512 27054c85d6080185760abdd7a64f324f9b1263cfdb2f35c973c082fbe5079bf60bde37d2f2541dcd8e7fef765ae12c47bc9b909194fc2853dece76b047bd6669
 EBUILD kmag-17.08.3.ebuild 857 BLAKE2B bed9b886df7b5fd570d82849cc847c7e5c193253f913e8bce84f0e8035baa7056ca5c318097abe974ae2a4ecb2d7664b1214a5b6512fdff7cd474c4d3a47d772 SHA512 aaa6a2580747195f5dd82501b33a35aae34e37b9e04bcd6cbdb84da8f8f0adb77d87a1241bc57855bdbbaa8ff69608de67229286cb1d8f11776ba3114dfcd024
-EBUILD kmag-17.12.0.ebuild 859 BLAKE2B 8113f81204ec70e92d2eff929ba2bccc36f24145cc1868729131d1c7931b23e0c182ac6f5928cdae1765e18793fee658a520ea158f86c4eba1ff87c6c32cf80a SHA512 942fd68260575ee513a54402670b8b0a9ddf8c3a5aa1da7463297ddca43e64cb075bb329ec09d5af5224cf6efc94443f5893f68ec9a4b0b342b1210cc8668591
+EBUILD kmag-17.12.1.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-17.12.0.ebuild b/kde-apps/kmag/kmag-17.12.0.ebuild
deleted file mode 100644
index 1e24ea00a60e..000000000000
--- a/kde-apps/kmag/kmag-17.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="~amd64 ~x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	keyboardfocus? ( media-libs/libqaccessibilityclient:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmag/kmag-17.12.1.ebuild b/kde-apps/kmag/kmag-17.12.1.ebuild
new file mode 100644
index 000000000000..78ea685239b2
--- /dev/null
+++ b/kde-apps/kmag/kmag-17.12.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"
+inherit kde5
+
+DESCRIPTION="KDE screen magnifier"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
+KEYWORDS="~amd64 ~x86"
+IUSE="keyboardfocus"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	keyboardfocus? ( media-libs/libqaccessibilityclient:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index c58f5952a0c7..bb01862d834a 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-17.08.3.tar.xz 4084880 BLAKE2B f17bef7b823ffb7c297c1f0639c47ead525bc88c54285b06124cfbb20365cc25ec2dd6034459d5a3a9569020b4fb8a1df2219c28565503c74f5b4ee06541e281 SHA512 672d0201d0ce1451d10158f2824007a820236c5ad4c29e80c46bce34b7944aecb26deff49e4ea77a87c0d423a0d29a0abc2c4732f1fc90388d1342a1294e6d74
-DIST kmahjongg-17.12.0.tar.xz 4084944 BLAKE2B 596377463c06f6ba0e19b5bb24c792c1c1034f4b1b783e4f47753d12f68bca299bea890e456f41af5254218e6b87c94417d65ad7c140dbd149c42b776ec0f6ef SHA512 f0075d94b8a064ead610c2462afe8f54b4a1dccd39313196de0a57e83ffceb30746a6811ca7b9ee8536bbf939a4a48b76d88924f9fa997b8e6ab133fb5604196
+DIST kmahjongg-17.12.1.tar.xz 4084960 BLAKE2B bb141eace28936a1339c59cb53d870351fb2f8ccb3613600c25ed1cc467d47cee114f2b51bc765a22941eafe2295f6bdd7afe03e8e7186eba6d57c387c0181e1 SHA512 56aef8fd5d765c49f8d4471632fea17c5b0578b2a88d27647505cc4360837af19157db68c2c71bc59114d7b6c061302859ee0ca322d83537dc084e44ae28c841
 EBUILD kmahjongg-17.08.3.ebuild 919 BLAKE2B 381b279543efcd308045696336fc23b52c36431918fd454970a8842d9bfcef900aa25628c0f24fec6aedfce10e6e7209cb1e83d011c780b9c9c921d37c814ec0 SHA512 3d7fc0836e3d1e32ab91a489cf60466fe27ba37dbc70f737fa15a0cc24ad28d27e23236a2fe4914be955e4a15277e6dca0ffdf2b9f10095cdaf31085f21afddf
-EBUILD kmahjongg-17.12.0.ebuild 921 BLAKE2B d087e369d3e543d59795894a77b5052062435a84134888d740bf4c40a46b93e907813678b86a00de2767c571ca2d54d612eb4815557b6911d647eaa857e73727 SHA512 4f46a354830ebc82e76d6a67537267789130e0e9ffa59bfb1c53a8ba565d5bbd876afec361de693dbaf77d97957866c8ba5d375ccb984b787813ef166809667a
+EBUILD kmahjongg-17.12.1.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-17.12.0.ebuild b/kde-apps/kmahjongg/kmahjongg-17.12.0.ebuild
deleted file mode 100644
index d02fd81c0770..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-17.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmahjongg/
-	https://games.kde.org/game.php?game=kmahjongg
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmahjongg/kmahjongg-17.12.1.ebuild b/kde-apps/kmahjongg/kmahjongg-17.12.1.ebuild
new file mode 100644
index 000000000000..7f03c60e0f6e
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-17.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A tile matching game for one or two players"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmahjongg/
+	https://games.kde.org/game.php?game=kmahjongg
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index e2fd8dfbd9ad..308c182cf2a0 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-17.08.3.tar.xz 151604 BLAKE2B 70295f1661ae2fd4ab41f4b3ba31cb48b6228806e8dbc090d48791115446d818e5cdc8c916b8c6d12a621405c624f14fadee9e83c54953d4fac3d67eaef318bd SHA512 9ef29eaa88f29b5a89cf4eb5df23f46f916092786155889e49c7d30d4a98e48552260f676f804039b7645fb266bb420424e000bc211c25b3eb720210f9a8491b
-DIST kmail-account-wizard-17.12.0.tar.xz 151992 BLAKE2B ec2945c6ef988f417a6c70299337c867be03f27042292102e0b8b11e09dacfa84f585c9aedc04cc7a79c1312c97983c1525c980fde4681282fa5d7f73b477f59 SHA512 5d9e2fbb8cb56289f22a5e922130604b6abaeef67a25e183b4023a3c224f8490c09727d1dc3996354bd0035266e65411f8b91b6ffe453dc1e4b6a049ab314d4f
+DIST kmail-account-wizard-17.12.1.tar.xz 152000 BLAKE2B 77cb57e26c8f4759ac75c03b876bd1012bdb6c61695eabab5f38f6f4a674c3fe16f02b7cf77a4760fc4622da9ddfef9d11175b48d8324fe56b6f77b74a3cf32d SHA512 dc98d253af866d25330a7ceda3782ff159135998e5b0b09ba3a578e47abe275246e79980a72798d27ccb3e577c7312bef3553d014a4fd7420168bedf2adbdb24
 EBUILD kmail-account-wizard-17.08.3.ebuild 1443 BLAKE2B 0a32fbf7844a70e59138a13d0014432ef158140aecab66d3cdc3c5fb89c58c0e0771bafba751bd1083a41dd17e691bbb1f5bffa02fc556703621bdb3e5d15770 SHA512 e86ec7d039b89f4b8debf1a440aad5f2b250e60558c0d8e7c8cddd2b8050d36fee7061e34f113891db7ed8bb9f16d178174a4679d82df4d796b2befa3301dd92
-EBUILD kmail-account-wizard-17.12.0.ebuild 1445 BLAKE2B 911d24956478d4f1f882b9330e0060056693784d5c11d6de6469782cd0b89540d14490aafe27c22463fd0a69de322d2e088f38fdab6ba7fc7699a334f0b89120 SHA512 1efe34bab7088e1de3742e51752fd3fac942d64b7ac57d91e102cf56a9500b7939178295321f019707eee6bb8d91e43868e0ffe75ff8e519f849e55cd531afea
+EBUILD kmail-account-wizard-17.12.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-17.12.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.0.ebuild
deleted file mode 100644
index 5faaa5ed06b9..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepim-runtime:4
-"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.1.ebuild
new file mode 100644
index 000000000000..1d631b73e888
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepim-runtime:4
+"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 6eff7596adc3..e4b84c9caac9 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-17.08.3.tar.xz 4735776 BLAKE2B 7a83cc6cd7a00b4aa17521f4b3d8af95b8b6c1d229888a5d1b95279ab32615901619a816cc108dc56fa2009f7c52a8b8f8844762588731f30aec28de1ea7a58a SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7
-DIST kmail-17.12.0.tar.xz 4752824 BLAKE2B 0835188b23e185a63e50d0360be0ea5cb91c0e160de0dd93d43f3c35733d3712ca300dbb97ecc5a8cd9de0fe704cb51c5ce539e9078e9bb4dc19e811124cbcb2 SHA512 7c434390058e07984735dce933f2de39d96908a6cc7275a5d10c8167050a74cf17a3e66aebae85bb47247dadb19663b466ffbb3b7f04948500384e5e54121555
+DIST kmail-17.12.1.tar.xz 4752528 BLAKE2B 1693e819d48eaf10fc1cf61a6e487c47cb0682d5f9cc423501f4576d119ca3668f89a7dd98e379a493b06b204082cc8880c259403132dbd5ddb1ee89b5e091e5 SHA512 2c67cb9f67b11a532309aeea7386c516be413ec2a5670c4aa18ad241edbaf00fb6a7687f57d1771f0aff57208cf43969cc7270060dcd3f0f6fd73fc8aa43645c
 EBUILD kmail-17.08.3.ebuild 3160 BLAKE2B 3383cd41dfc78f384fbbd213502989dce0003ece10ead6ed03256078a017aa5de27a61440431bce8040d56d5ea51d4d6480a0d193171b460d76526e992ac7602 SHA512 775d88af08392905b6f6446f5297128c8aef7ededa45f52dbcf46e7fc17f8fd1753075e43b5b4a7ff4ce35578b5a47dbc45082b74d652c0e50c0ac3e47c5bf99
-EBUILD kmail-17.12.0.ebuild 3162 BLAKE2B e77ab8ee9d3cdc7517d1c9330772e87ef75a20e8c6a4448e76522d2e75784f7a8a0b0f185f617eee98bcbd207755dd952f97395a69726993f017da1ada01c443 SHA512 322e14a81197e1a79635df298c279e92c9e0b4462db4c37c50820958e82dbd2bc2bdf4228b651a57c552c2baa3724e4b5cf0a23abf179c36edb1a28db707635a
+EBUILD kmail-17.12.1.ebuild 3203 BLAKE2B 6f6087dc3b093c54c0c467d9284d01627ad77be64a688fc64bec6c94a526e69bf4a17b6b45032a806da1fdb319db7fb8b96de7431a23fc315d03d0d5825f84d1 SHA512 862190655ee234de81599e453aae86780a3164487a05cd45015d4a12c1fcd07a0ccb8882c942418575445c8cd36e251e594b8c54cfd2838926c478b90364dfff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-17.12.0.ebuild b/kde-apps/kmail/kmail-17.12.0.ebuild
deleted file mode 100644
index 668d37b9c8e8..000000000000
--- a/kde-apps/kmail/kmail-17.12.0.ebuild
+++ /dev/null
@@ -1,110 +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="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	elog "KMail supports the following runtime dependencies:"
-	elog "  Virus detection:"
-	elog "    $(pkg_is_installed app-antivirus/clamav)"
-	elog "  Spam filtering:"
-	elog "    $(pkg_is_installed mail-filter/bogofilter)"
-	elog "    $(pkg_is_installed mail-filter/spamassassin)"
-	elog "  Fancy e-mail headers and various useful plugins:"
-	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-	elog "  Crypto config and certificate details GUI:"
-	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-}
diff --git a/kde-apps/kmail/kmail-17.12.1.ebuild b/kde-apps/kmail/kmail-17.12.1.ebuild
new file mode 100644
index 000000000000..446bd9837650
--- /dev/null
+++ b/kde-apps/kmail/kmail-17.12.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"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	elog "KMail supports the following runtime dependencies:"
+	elog "  Virus detection:"
+	elog "    $(pkg_is_installed app-antivirus/clamav)"
+	elog "  Spam filtering:"
+	elog "    $(pkg_is_installed mail-filter/bogofilter)"
+	elog "    $(pkg_is_installed mail-filter/spamassassin)"
+	elog "  Fancy e-mail headers and various useful plugins:"
+	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+	elog "  Crypto config and certificate details GUI:"
+	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 6994ddc53742..f9ae6e723b0b 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.08.3.tar.xz 232936 BLAKE2B dd6f69e110dcb775e6cfacaaeb51acabda8d50a471e64ea9579313fef4a641a250245b8244c43f9c648a2e38d175d70012af0ca2a7be6ca7918d147e0f79693c SHA512 ad7d4edfcc63945c270e4b89f0b48be47ceddb1962e8051a6d3419bf41ada6c00739e6c75d8af1e30240c01721088e2e78e53227f96dd118da2d243468cdb66f
-DIST kmailtransport-17.12.0.tar.xz 165152 BLAKE2B 0b31513448e7731b2fb0209814aed93e4971eee3d296f145674857954e446a4ce67c0f38e00f159df25f9472db50cae228fb1ff03587ca5a0cda11c9832e65a5 SHA512 9806ab9b8b010bf79eab7c7e41f0d461f94580b92a473736f30a07734f404f6498aca88286edafe765d87e9a1405537982d45591510e7751dd34a15d6fa9a009
+DIST kmailtransport-17.12.1.tar.xz 165220 BLAKE2B 0939b06f55aea75ede4121b9f6a8215c018ecf65e35e2a356948316df338fb783008818d4c66e89dab59fdf4076439517e983d73a1c56af7c5d6a9e7c7ec7215 SHA512 56a9e2dffe6418f71587aadd98a98044fabb1fb5818aa52597904071c2301c53425e42759c240ef36c49df70708bbae83b1ebb78b31869ed65624e6eb09c892b
 EBUILD kmailtransport-17.08.3.ebuild 1157 BLAKE2B a76e53ace05dc677a12306349d303d55332b87c39c0fff5a86d515cd1bf3d16f31dd4e27bb1d46e5dc059a707152ac36460b88192bfe7c1cb1055108bd269f1d SHA512 700d660d2d56dd5ffb051d1bbc6041928e043264bb99253613dff7612a5da0541242c2dd84ccb1d71be538a09e4f34a8a600794270c2b955a3b69964fb781ced
-EBUILD kmailtransport-17.12.0.ebuild 975 BLAKE2B 50f5553dc4c7c802b6a0f2db4e96454407ae215b8be26bff447ffa63d77eef995953ea2c31c11f5072bb4cfbc375147291dcb125ec0a373c6bcdcfaadca5877c SHA512 53e58ea0c9ebb43d89ce9861eff070f5d09c37e6b37099f4ae0d585a1b90d19b5bbdc7d0a7610410001efdd53398f9770d96d69d21824f70a35cbcedb3053e95
+EBUILD kmailtransport-17.12.1.ebuild 975 BLAKE2B 78c0711458f21b99171236609866cf45af83d565cff74e784ec90b863f526f17144c252b4e544f1bef3984e3460f07d0368e87987de0d74290bdbd3f8d792800 SHA512 48a9c8bc71c3f7dbefe2f8c0a239ad4deede5446aafbdd60e2262270579cb7ca7f1317d4fc81f5274d0331272b0885ae08008c6a45730299a628e432bcdab982
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.0.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.0.ebuild
deleted file mode 100644
index 735ef60287ee..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-17.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep ksmtp)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
new file mode 100644
index 000000000000..1cd4221e5d16
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep ksmtp)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
+
+PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 2e321179939b..f02a11ba6156 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-17.08.3.tar.xz 24528 BLAKE2B 76dd44cc14640cec245867575373d1b56357e021b7ed8812adc63973673085f00483d44428cdee1078a5e730af7fa29b75c83deb2f952a7deae23db43e6fc552 SHA512 725f10c3e9b3ef062f90094ab82cf9c9c611250043d65cc8494d87e3ba11c098fe02b033ba1373979f84ef99d245849812dc4b2641ddc83f34f7ebba40ffdc7a
-DIST kmbox-17.12.0.tar.xz 24344 BLAKE2B 24840cbc68271daa6c09d81ab848ad1b65750c8e8e032d164cee59d7aa4fe1d046bca90d3fe590cabf9e435781d0ba1b873ac68c9b5abdc9da74b16691353476 SHA512 b9a2dfba8e90fe3d53afbb73de3cb693e970b48914c3fbb4270cc83dad155b006ec7054b245b09c32a8e19fa31bf0d66d644f3026f276cd4ada65025032680db
+DIST kmbox-17.12.1.tar.xz 24348 BLAKE2B be8a1af1eaa34449f52d4c902285544704dc0c06c52c2c513ac99d525f16bafe979a206288715147c8ef82c3e45dc6c482b5770b983cf59fc9a3967407970fbc SHA512 eb230ab18113375b6460c28bc5b9bcec9330e0589e26d1d73c14f95509186617992b19e39479a9bba3df3510d90b3265254c8f6aa0dcdb93919e450d5a7ed60e
 EBUILD kmbox-17.08.3.ebuild 309 BLAKE2B 0b5515f2a596012f5ba5de369110b7a10535bdc8d3bf9efb27732e23b0d71e475e4a2dee251aa26ea8863cff93be2d56b774dae2a05b7dea322ddbaa1b070bfc SHA512 708288cc0d5b69d8f212973aa6ae1067fb85f811c9b598c921683bb520d307ff9673268474a9bbcecb93f397f46c1b31de9328008d45760925a85e5f3eed8153
-EBUILD kmbox-17.12.0.ebuild 311 BLAKE2B ebf9daad3883bc3705819adac27344c62298bf681b6accdcbfd91dca284a470dd15d7b609e6d264de445319fd15123dba9aa4ddc0453791b53cf6e6799a4b666 SHA512 d235d92671d3bf8e2b755b03c127f5173de5421ffb1061cd3f5c1cd2a02cada5db80429784f978773dfcc3830235c1f7e04fc9ad2bdef54f78aa9a09aa4e3503
+EBUILD kmbox-17.12.1.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-17.12.0.ebuild b/kde-apps/kmbox/kmbox-17.12.0.ebuild
deleted file mode 100644
index af4bc864b1a5..000000000000
--- a/kde-apps/kmbox/kmbox-17.12.0.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
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="$(add_kdeapps_dep kmime)"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-17.12.1.ebuild b/kde-apps/kmbox/kmbox-17.12.1.ebuild
new file mode 100644
index 000000000000..aecae880bedf
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-17.12.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for accessing MBox format mail storages"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_kdeapps_dep kmime)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 207a7d857ed9..c8ab89863244 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-17.08.3.tar.xz 146008 BLAKE2B 7fa533dc999a10372f23f72a554f0585fbde2dd4782b829f65760bbdadb1bc5123b2af5a8048bf05bc6fd599a2afa5bcae7caf159be39c69655d1b6683ecd93b SHA512 af95a54dcd5ceb1bf215ec96e752ee4eb06edfb9e4adb1c2e1cac0bd3473e1a14e0d370fd9534fb3ff12b307b7dfc5abd5758231a92c7eacbbc58891adc21bd4
-DIST kmime-17.12.0.tar.xz 146464 BLAKE2B b1ced9ebbd5667d185ca5db3a2ee7eceb657ecff275fff959b25f6153fb7c57029d28b2a97c040c65ae32c936014a8b25db6ed3c7ba5374d1e8305becd0fe798 SHA512 e42f81e37ec50b7b525dfbf99561a59361a18ef1893a9444141ecb56d74610f5f77910a7b5ae2676f2c55f09fe5cde2279f9df664227e5cb336244f7275d33a0
+DIST kmime-17.12.1.tar.xz 146464 BLAKE2B d9f89a145f1a143e1fda8c114aa9042cd6c03220c58897be79f8b9553b04fb2e9ee0d1fa1404f300e1f2d507f50b9132e61e7456bebee70dc31556d8460659aa SHA512 ee07488e36bcf9d16f28246b0a5e7caee4a281311598b87d22ff9acc2ce72347ed48beda3705362e45cae3b84ac629afbbc9eadf2c1d0a167b2c7b899f9d1be7
 EBUILD kmime-17.08.3.ebuild 379 BLAKE2B b2d57743567666bfecfafe12183f94a5a5fce78edfc82b1c7383ae01c55faeff1f43f7d3a1f65af26c25e90d9394b39f114fd49e8ac23462dde15d55ae9d969e SHA512 b1c0deeb7c0ab4d1a9819f976fa0db6027cbfbb7656c133b24a89011eba8a5ee748b6ee7b8b306bf84ac96cd6d33525364d2113dd69c1af1eed2e0381a27b361
-EBUILD kmime-17.12.0.ebuild 381 BLAKE2B f8a1a5182d455de538ab7baa4acb2ca7cfa02acaea3264d2b1998356857f273adf640d2d0078a244268f4604f8eb23554d8ca49654c0ad8d5269ed5c27a7de8f SHA512 cdaaed1eb6e539b8a0657ba08a2633fc9c1272f8deb05e000b0c50e4ee8b39daae8a7b431e29378797fcd56cd5378e2b28dc02ada88351b787c7582b22ca9a15
+EBUILD kmime-17.12.1.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-17.12.0.ebuild b/kde-apps/kmime/kmime-17.12.0.ebuild
deleted file mode 100644
index ba8bf6558b7c..000000000000
--- a/kde-apps/kmime/kmime-17.12.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep ki18n)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kmime/kmime-17.12.1.ebuild b/kde-apps/kmime/kmime-17.12.1.ebuild
new file mode 100644
index 000000000000..18fc8866db0d
--- /dev/null
+++ b/kde-apps/kmime/kmime-17.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep ki18n)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 8e983b6fb5e8..af20501a319b 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-17.08.3.tar.xz 882428 BLAKE2B 7b051b7f6290ae453b1563e7d17e2bdc99a23f88b1452bad4a9aa614cff4f2c0132958ebe31cb3a11e3b8ba999a1e44bdd655e5bf0dc74f027fef64e9afa6b84 SHA512 d91cdb15a1941823d9d3117737f9c3ec8878a385087530af93153e2f4c125ec19dd27b32ccaec06b22115d24c721f4614072c192ab2a61cda11c5c96688b5879
-DIST kmines-17.12.0.tar.xz 882516 BLAKE2B d56af4ad346252a87a17b0d78e20e97486f38d52fd935b71799022a2d21cb3c97b631c607df0fc02d772062bf2ace96289b9ca9e305af5127098ea9ceedcf659 SHA512 3f517a5c143cd1f7adf4122ee772c3f4b5bb10c534d3ed9d04bfdfa86f9bcc1d83c6884943baf59010d0d7c022db47e90b9a0fe25fa016f80cc143a9eab1dd45
+DIST kmines-17.12.1.tar.xz 882524 BLAKE2B 3b782e8e975b382fbd14691560a12a6ee3368f948e959fe11d18593b9d063e2483fce6ef83779ab1e17c15c606551ae3e20d82a8f681c7879a29cc99d586e0a0 SHA512 1a2fce1ce40c8bd695fd0e596653eaf9428105415af10e401e267a69e6865b99fc910e439891b08e244f198b8efd3b3fb1bccd675479474a56e7be97f7c5e621
 EBUILD kmines-17.08.3.ebuild 773 BLAKE2B f290a16ad74d46b3f656aa8c430f82f3e0456b48d144b80e22a9985e78540738c1f19d5d8ec568ef0808a939691630dcdb048e4fee65df0a128dc9e9fa90a7dd SHA512 2d6bfe4104e872d3712df8c129ac5ec622447fba1ce60f6d49ea23dc6f276a66b621958e0189158ae45137c0bd0cbe847c6aa16af3b829893a459097c5d3d2c9
-EBUILD kmines-17.12.0.ebuild 775 BLAKE2B 067a88ae2a274bf2239afc980c76c73cc9d152fc849cde5a9bf0eaefa4ac543ac5fa4abc2beb789c74e55534efda16eb441f0671a0c9f4a5f9e843666c2771fc SHA512 aaef454f07ac4b64431619f801d958780e8e2ff264450dc20215db628de8d7eea7334847d27041778001a91692c1bffe2b514f6f207c51b9add8060322af2c0f
+EBUILD kmines-17.12.1.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-17.12.0.ebuild b/kde-apps/kmines/kmines-17.12.0.ebuild
deleted file mode 100644
index 31268cd81cce..000000000000
--- a/kde-apps/kmines/kmines-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmines/
-	https://games.kde.org/game.php?game=kmines
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmines/kmines-17.12.1.ebuild b/kde-apps/kmines/kmines-17.12.1.ebuild
new file mode 100644
index 000000000000..517fa32429c5
--- /dev/null
+++ b/kde-apps/kmines/kmines-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Classic mine sweeper game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmines/
+	https://games.kde.org/game.php?game=kmines
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index fb953df00ba1..4a17a473c190 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-17.08.3.tar.xz 389064 BLAKE2B 1f6d4d0c062ae2c98606a44329fa19de444aa37fc9b8dabf545054369dce45b5b6f3f025abf9042ec487a8823b45035b2068a49b53686c6acbd0862c795c0e32 SHA512 85c20b74ca755d2407095b6a86ebaacdf41c386120f83d5512f40c0c4b9fbff358add5e3fc9af9fb5d608fada9eeb9b5f6d4b9b3a8b1c02006e122b7f1b1756c
-DIST kmix-17.12.0.tar.xz 1281544 BLAKE2B 695ac4834ac460f353689956de269788297cf76ee31d92000f9a96f92818e5f04188612e6804ab940957054d31029c05b8513b6416c360b9176a83aae83f93b0 SHA512 c9c181294dd83cd15fe6b3617eb46ffc11e04bea0eeaf2285dd1cce42adbab0660be556195642e209c57ae817b4c4f38f47f3a2d3c419b315c79af562563a98f
+DIST kmix-17.12.1.tar.xz 1282016 BLAKE2B d8521388dac019c20ab6e94b4519825ddac206352f8c083ce33c1958427ecc651eef6f2ada301f4818a2ecee856914c5c66561e4638aaef40d7ebbf806e23347 SHA512 b51ea833a22f11fab0bb5fb831d8eb465d52fd4332e1553c558431c5be3aa4717c881d59b2ac524817e8b7671357f36dd52d35545a520c282bfc50186dadd17a
 EBUILD kmix-17.08.3.ebuild 1306 BLAKE2B 0803e6f8fc5769bc72c582d7b037fd99f2b5b65cc1dea12dd9e7fbf4d0c2ddcb02b50b0a8d5706e8e45bccadddb7ae912eee46148e85cf5f35ba1a6f0eee0eb3 SHA512 9e79593799e816b9e1d4c8f0fc1a73d4ab8f597f8bfe16dc4d66962a91fe5f18095d3d6cbad04b99171985ce7ff4d363528947be76ef76f8a86a6ce3cea8246a
-EBUILD kmix-17.12.0.ebuild 1259 BLAKE2B 1aeed39879422d229055b3077a72cdd2e0b5268ad300ee68fe1698da8840fbe011388d5e8be8954cd38722ba542ffb701308bc6bec7e7e399deb6b72d7edb544 SHA512 001af2dcf100809cc995ebcb0bc4ebbd7cbb724975762b0d788f780a0af5012333ced2ba42a5d97052d2ca5bc0283b1af55005ffd1c33ad46597b2e22ac79191
+EBUILD kmix-17.12.1.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-17.12.0.ebuild b/kde-apps/kmix/kmix-17.12.0.ebuild
deleted file mode 100644
index 41c0d9cf39e9..000000000000
--- a/kde-apps/kmix/kmix-17.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Plasma mixer gui"
-HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kde4-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmix/kmix-17.12.1.ebuild b/kde-apps/kmix/kmix-17.12.1.ebuild
new file mode 100644
index 000000000000..768fa6584e01
--- /dev/null
+++ b/kde-apps/kmix/kmix-17.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kde4-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa ALSA)
+		$(cmake-utils_use_find_package pulseaudio Canberra)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 9e03d657a9d2..26b63aeb58aa 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-17.08.3.tar.xz 110844 BLAKE2B 8e84b9f00457eadd043f5a9508b9409f787e4ee97b58ff0528bbba443703b6904c9754bf7e28a964c77d267f853f1a6bff387e56506efc0e6de6ba3a98be8411 SHA512 e9055fc2914487f0f705fc147e155a9f3e9f79bb6eb506e02c193262aa0621fcd495636eef205bf807488052b4d9ff2acf217d72a9331e2ab4dcd17db37f64d8
-DIST kmousetool-17.12.0.tar.xz 110816 BLAKE2B feffc90cceadaf0055f96b476e5f2b93fc38b99ea399d93d3fced99572a27b7513274762ef831283510708cf57dd546bb16a3bc053aaf60ce91725c0275a278d SHA512 0386774db9f9518c0ed140d48d95f77c165caf5898e9aa245f0dfbcb1363bcb47effb99340625f00e7088f46d417a7b704d2bd2ec9e5f0a9bb433b42245e1696
+DIST kmousetool-17.12.1.tar.xz 110828 BLAKE2B f565a207d37939dd0a9c669358543b4e702c406316309117877d1ce97a0dc7ee9f620faf80a825823687f69fa4f6acd710bc5b3b27e4c173d9dee7984cfc4dd5 SHA512 409e6d2cc238b3cc0e70ca5b40a691f2b010d5fb017188ef492b29eed922ce91c14356d381d4c394ee5abffe52cf1d0c3108cef8f1c0a5fac690d08b2eb043f8
 EBUILD kmousetool-17.08.3.ebuild 816 BLAKE2B d0866b5e963a7b19ef4d72560fee7f2be283127c2dc2d1293b2a127e97237f5f6a5bb2aa82a59e755852ee0319aa5e008e1d50fba047bad35ca7156036bbc18f SHA512 51c0c4322a06f051bf855df511b2a9d0a2ca33f9ad1ec0cc606ceff3e6fa4832719fb2403d7b7e66b7906f38d52eeaacaafbbd91b44ed03a963516ea213c765d
-EBUILD kmousetool-17.12.0.ebuild 818 BLAKE2B ebf46c2b90c2361fa225f2decf561c9a7988671bd69beed063eca23ad95409a1c6ece98a740f423556be85599ad9c3e77cc08ee53aa12799c8c0b6ff1de57271 SHA512 83b8a863f595690a21d117d9f932caaf1a93eff254de139e2826962659fe1979aca40a1f2ed2619b316427dc72f58448c3ae17960506b428e49e9666a16f3971
+EBUILD kmousetool-17.12.1.ebuild 818 BLAKE2B 3672770cdaf03ff3fd071c1c36428c231c6f8662536c5c6c3f27cbd9708f3b1ab22e105b80354d5452f967bf3090f33f7ff1de98d5bc81fe13f11db7070b9b35 SHA512 7c0b69e3e9a03bb4b12d843d4e73f310ca2db4b478c85fce540a84881798f53cef17720f4c7093772c6cbc4461ed562c7072b7d9efcb4755791c955c7957a512
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-17.12.0.ebuild b/kde-apps/kmousetool/kmousetool-17.12.0.ebuild
deleted file mode 100644
index c0099d74c6df..000000000000
--- a/kde-apps/kmousetool/kmousetool-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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-17.12.1.ebuild b/kde-apps/kmousetool/kmousetool-17.12.1.ebuild
new file mode 100644
index 000000000000..ed8aa9a18385
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-17.12.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-libs/libXext
+	x11-libs/libXt
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 06c0f89d5e61..ff417035802d 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-17.08.3.tar.xz 277600 BLAKE2B 069db0bfaaf5e808f1aa90123e474b478a4b6b271ecc5b2d73a6f49cbef695d4c4ff86bc1fea8ce1be87cf1d1db9e3aaaa88f86fa4bfec56a1eec2d3cd8f8a38 SHA512 7e12e71149089835d17e07414c6125cda1cc9c9354fd5f2838868fd31d0b0a8082a18ad04c594f8c5a2db1f9a0fad75be764da8ed70976695fc5ec6f2e436820
-DIST kmouth-17.12.0.tar.xz 1823824 BLAKE2B 9b586af4221f96f11feecc0d7bfd2c444d2ee6abb66aa9af01096d930956f82f63ed4046d06dba254f4d69b4bd897d76677e1d245b454536e15f377beac13e05 SHA512 69f04cf6dd76dec279836f573b005da94cdf87133e8438531700053ed5b78183283b7df9db178f9e991c8dcaa3904656049945c430c423ea58c7ee81609ec49d
+DIST kmouth-17.12.1.tar.xz 1824028 BLAKE2B 5276071622b9f2cfac5fc8164198888706b73d3d7d8529ae8d2fa6c377cbe45bea77a5ee2c099288a4a9422ee03497399d579f5049d30451ee287a1a68b2dae2 SHA512 ef6de27a036b3825861190906d7f33b70da44c314dae352fa3e55b081ed47a6f05559a152e7cb4222c952b5ccde0ca30cc43794f2b8aec3d0250037f1ffd93f4
 EBUILD kmouth-17.08.3.ebuild 333 BLAKE2B 31107940d9712f3a7047ee2f595da14be0a814ca46dc2bf439747e1c1e987c1e787044c548af965e1466aea92502d9ae0f0944c3eaa97881189b9df8fa820520 SHA512 4e11f709b65bda08d471da1ff65eab29021e6ddf28f76334c75b2d5e1692e86ddaa06c23375336c515999e4108b1fb6291da831a3b881e3054fce97662207b75
-EBUILD kmouth-17.12.0.ebuild 772 BLAKE2B 4966ea75edc7128f1f9bc03834042b31249a41bad59e1278811f308013e5b3a0053637ea5170aeca6642343c45ed912c578be67ebe74424a7b3df756541d5405 SHA512 f1f8f23fcfabd8e7c8ddc9a2032da5dcac56cb70627572c07cf4684bcadf71853c29ddf852c8af24b0992d2ef885f42dab0ba315456f55653f8552671aa3fad0
+EBUILD kmouth-17.12.1.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-17.12.0.ebuild b/kde-apps/kmouth/kmouth-17.12.0.ebuild
deleted file mode 100644
index be635cd0dee1..000000000000
--- a/kde-apps/kmouth/kmouth-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kmouth/kmouth-17.12.1.ebuild b/kde-apps/kmouth/kmouth-17.12.1.ebuild
new file mode 100644
index 000000000000..c648621058fb
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Text-to-speech synthesizer front end"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtspeech)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 43fb95a9526b..5abf0b2eec0a 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-17.08.3.tar.xz 3024380 BLAKE2B 660e4d606617ed45d46610263afbaf61d9c38a14c54379035a532b82d5b8ab19a6ad8bcc885a9f7f55d1a026e0b51aad6e9e4e8d56ad21025bb1267b55c0993f SHA512 1244e73479bbc9ab2f565ac0e195a53683469f6c5e73664093bb3463e20eec13dd7cb3d880d40127bbf79541da150238aea7754a23a1183d816fa4255c4f921a
-DIST kmplot-17.12.0.tar.xz 3024752 BLAKE2B add7c635228ab12211ec6c43539b90cec0d3dc7cd90a5c9dda9bb9a8c02194892caf1b83f49e9ff7e652483cd7e162b9deb0cad902cbe5503c329437efa41245 SHA512 49410ea7c451b2f03aa42cc9fcc64d73295978dc5c9e813cffda95d00ad97af3e808a2b6b73920f835a993a4337f7b7cc44bed2bdc92e9e1077909a1c1baefcf
+DIST kmplot-17.12.1.tar.xz 3024536 BLAKE2B c36ac17927ad57a5ee11d4e918cee6d2bf697ab325af23e2f961872ffd89e6c9b8ffed39a2a6af8b0de70435decb586d5cc6ec59af822cfb2644a0236a463de9 SHA512 be4d911de133072c48b02ed3ab2eea7f48447bb7130da2f32634e3bd9f7239636ff7e6b4cbfe08397cdceb798eaa936290328efb2929e5e27c8b9bd8596b3aab
 EBUILD kmplot-17.08.3.ebuild 930 BLAKE2B 5b7c80ec17559d7b564d2f2d46df1d03d12b5b5b6072ccca83405f673880700d3465d618008a7f277a904897566f99dcfccf5be4c6db0360b9c55da8497f93bc SHA512 3fb640958c0532ea587268e4a78b1d93643e280dab5a11b38a0c099721975422ee3eb5cdd052daa3003e6b55b5bc134863b8b934d2de438b0ff663bc9d1a7762
-EBUILD kmplot-17.12.0.ebuild 932 BLAKE2B eb04d957219b74c647b73c9557d2fa777d2b1861d6cecc35f2bae170c978e7621dda3329210ad8af9bd27e68d3d9c1241f4524f591fba24af12e7452b0a75ce4 SHA512 c2dfd1de68a8ed87a97e37c3f19f6c781b8f4c92b865f686fee3fa269f2c04e5fd89ba1c71030e51a5dc4022ad0c6f4ff7b467dd1331dd28bdc101ca4cb903eb
+EBUILD kmplot-17.12.1.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-17.12.0.ebuild b/kde-apps/kmplot/kmplot-17.12.0.ebuild
deleted file mode 100644
index b1552a6dc169..000000000000
--- a/kde-apps/kmplot/kmplot-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/kmplot-17.12.1.ebuild b/kde-apps/kmplot/kmplot-17.12.1.ebuild
new file mode 100644
index 000000000000..029f91d4ded4
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-17.12.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="Mathematical function plotter"
+HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index a4caa7dddd82..54349399c367 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-17.08.3.tar.xz 1219792 BLAKE2B 481f39a1290791cb99e463ddacd5a915aa897dfac98323392fa19984b8542f281ac9e38944774da49e730f589a0aa9a9f84f1d5fe1dff9ea77c1802d63e1a534 SHA512 f6fdad0dc209e66a01a43af9b9c0bb02a9af71ff12673193bcaf4025237a1a730d8becfef9dd7228ae71ee751f7fbda56c3c0736851b7aaf9bfc82f3e757f4c0
-DIST knavalbattle-17.12.0.tar.xz 1219996 BLAKE2B 0acd60387cb2d601a1f1b61255a675c0f2f42aaa2a0a03d16e6ae705ed20f6b8c3c65e56865e23b157a269333289a6732e22594cfb4a26f87f252602a0e4217e SHA512 c09bb14abbf8a6337e6772a84e00b504d66bc47bfd9da03b59873efde03f7acb3bea1cbe652cc7d572c530d0b350893b6efa96f079479bd4ecb7d54a88fde071
+DIST knavalbattle-17.12.1.tar.xz 1220024 BLAKE2B 2bcee3ef49d5568d605b613d3d966eb6ed84dc6d5ee47f6fde75d88067e80b9cf3d53c9051b6894173dc4c8837721e0963a90c70323f40a428b72ea47efdc354 SHA512 766d7b4e1661a9173381b2c060ef73321c08b49954d898e22dfe776f83b0015ae5ee7c554a10048ae5b7145a35f669e09dc61e5fb5851be392ee0150e795f68a
 EBUILD knavalbattle-17.08.3.ebuild 872 BLAKE2B 8cdb2dc7dbed6f25697b2a8baa4bdb5320562c12f4d88f84abae0d6c99cd5e1fa19048b916fa8b422660a92000ab0985419f73633b9c0319b80d09030cd275e6 SHA512 75ad29081775f7975d290199066821d96915614e44d6568530cf7d34cd24722f939d19653fdcff8762b4bf335580391a1cd9c9c6dcd89a164ded86ce0749e085
-EBUILD knavalbattle-17.12.0.ebuild 874 BLAKE2B ab3d98cb0d3b60c2a9eee60ae6f38b08fa95e69b532fe2c2da9272ce9cbdb6f282c21b4c7bf428cb7e847f51289413972cd5af76de3c03b8525c5e87f7eff1eb SHA512 80bcc9ad32d7e123a4863c40b2fd555074cffc52923f597ad591ef2ad1f625ef34f0608edfae05545aa3937eab25e0f14a41d48759fcb488ea0bec559ca660f6
+EBUILD knavalbattle-17.12.1.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-17.12.0.ebuild b/kde-apps/knavalbattle/knavalbattle-17.12.0.ebuild
deleted file mode 100644
index 0d122b31b150..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-17.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/navalbattle/
-	https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knavalbattle/knavalbattle-17.12.1.ebuild b/kde-apps/knavalbattle/knavalbattle-17.12.1.ebuild
new file mode 100644
index 000000000000..aa760fb43133
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-17.12.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"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Battleship clone by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/navalbattle/
+	https://games.kde.org/game.php?game=kbattleship
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 4861608631b0..3637e110af8a 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-17.08.3.tar.xz 981584 BLAKE2B d78f06884a1e4e155d35d5d1a0a11cd3380e1e7fed25e8225550119a7a98409f14d8c6e37dc415e84663f9d9eaf10067978cdf883f4d432f85cae95faf8225d2 SHA512 31d1ceb332f7394517bed394d11dd9669d463950491878f47ed007e51b38dbbd3885a0be370ab4588f6c415bdb98ec6ef74ad79d52b04c84dad99e5d06812f5a
-DIST knetwalk-17.12.0.tar.xz 981628 BLAKE2B 2d72d29f68b0f96fc725ae3eb6d8076dc7a802f34cf5317044c551290bed115d77e5b1af6e768a70fc76bd63f16ea2da9607fb1a03ea861e5d79b532e80be281 SHA512 4c72791c4c734adfcf4a1f6fefb97e7dfcb08f044e9dffab1a4e403c22c13e082b5d9dc34e5c6e06fa53437e1ebf67b8f7ccbe57c2e12f69c9bfaaf76590099c
+DIST knetwalk-17.12.1.tar.xz 981672 BLAKE2B 5deca4fde3e23212caa095e84cee6361d47d4e613b304a2dc0e2a920048f9aee1af550e76097d532aecec239dab3e34ee4e7f2241616a7db51668349d480f54b SHA512 d990f908b570a3a124656f291b46aad69e9f356bdef496849459f615df8372256aa55afde507aa8b7866250aa59cdd6fe42f538ab715bf837f6d5dbe69ef08ba
 EBUILD knetwalk-17.08.3.ebuild 864 BLAKE2B 783503ee49ba965e2191974964c6ecf5ec69ee28bffa563bc99859803d0f70e38148ace05e9194da9c5bdd0be0a96cdad66561445720b4ed2c61de6eca3af06a SHA512 a4e9f6bfa81d937880adc983589fd06dc91ce58ee360c00abd8a4150cf146bb0c23e28e499e8a46427638f83efa0ea138767c7a3a6cbae563e65d59e560b15f9
-EBUILD knetwalk-17.12.0.ebuild 866 BLAKE2B d0e5c4e24b1986d8e2e77b3d2455226b65c80d76179e10812841269136ed727752b2e57b828dd1d10ef3bcd305c7175291cdc895da30912fec01cec273fc86ca SHA512 b34f26c63e72a5fb5a51de52244b59abe86c0674d7cf0dcec1d826144a0a5407bb451d5f639f57e9a9a130f4b2844609f583f82c6e4b6ec74c409b2d671dfb46
+EBUILD knetwalk-17.12.1.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-17.12.0.ebuild b/kde-apps/knetwalk/knetwalk-17.12.0.ebuild
deleted file mode 100644
index ca144683321e..000000000000
--- a/kde-apps/knetwalk/knetwalk-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="
-	https://www.kde.org/applications/games/knetwalk/
-	https://games.kde.org/game.php?game=knetwalk
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knetwalk/knetwalk-17.12.1.ebuild b/kde-apps/knetwalk/knetwalk-17.12.1.ebuild
new file mode 100644
index 000000000000..cd1421b84e74
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# 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 version of the popular NetWalk game for system administrators"
+HOMEPAGE="
+	https://www.kde.org/applications/games/knetwalk/
+	https://games.kde.org/game.php?game=knetwalk
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index f6cdfb37466b..5cebf37b7500 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-17.08.3.tar.xz 334728 BLAKE2B 61c39c4f065d7c763cf1f9de45a2d84b1b7d71c616d266d6a9dc656e192513694d5d2f1e991520d912012ccd0c8b43b65f5caddaef473597e0b81bdb79d31fc9 SHA512 8afc903cec73283faba5d0f908004fc965ff501aec78904dc2383ccab8956b343dd135f58214372262e509298e57bf9d816067ff1cf18d592acdec97204dfd0d
-DIST knotes-17.12.0.tar.xz 336300 BLAKE2B 4b36f1fe0e66c0143d84e0eed3198ee9fd523fc5bd0d0e0ab6b856309d0152e80b0175018af52db76407989fef94a5341d68e2b2d6510d9594d2174dcf60ecfc SHA512 a866d178700f1e8312e31e31cd64c8c062954ab4211f10b24f9fc49d12467c79216e10b63e212d1cdf5453ec03e048d46db9e697346a76277fadece702378e4c
+DIST knotes-17.12.1.tar.xz 336344 BLAKE2B 83827ee2b07ce82b32f4d399b7f1fbd1260fc5504d05e1f40021961c93ab02ea762270ef62a65c723e224a5fdf7794858439c88cf1f988d2d84187624121e8ec SHA512 5f98fe0115a3f74097159e03722442a72a4b23a16f15fdcd7e1c8ba0c513c6fb54e42e986a37112b967b890cbce713da77e8e3a082cb34352e78f4f706aa0674
 EBUILD knotes-17.08.3.ebuild 1849 BLAKE2B cd7b44cf1d05972ba163a3114422e9d48aec63cb3b841e8aa2f1ec7e002ec6cfbc9946392bc0e9cb0013a6fa7773d48a43c1c7cef8c4dd273f059221ccd99141 SHA512 cff4ab0675684b20866543c8726205b40e6479332b171003bc9ff299175d171a665d20e2c3074ffd168771030831c1ad55a061b986b074dfce033e1ecb5abae1
-EBUILD knotes-17.12.0.ebuild 1851 BLAKE2B f94d3967d606bb396f3ba47393ab8f6ddd94c71bc9f80fcbf6a4362f9a892295736078828779e770203a8ef6b0a3c1981e76669809c1356e188b2753ae0b8964 SHA512 ccb2925247ec1a90e1a3dab4dc8aa673393eb40abc3907ad78cca7c409399e293035eaffa73db0085fd16ca627f03cb9da1264b7b00099bed702ef82c87b9288
+EBUILD knotes-17.12.1.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-17.12.0.ebuild b/kde-apps/knotes/knotes-17.12.0.ebuild
deleted file mode 100644
index 8c37161ae2c5..000000000000
--- a/kde-apps/knotes/knotes-17.12.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://www.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
-# 	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/knotes/knotes-17.12.1.ebuild b/kde-apps/knotes/knotes-17.12.1.ebuild
new file mode 100644
index 000000000000..95df2eeed40a
--- /dev/null
+++ b/kde-apps/knotes/knotes-17.12.1.ebuild
@@ -0,0 +1,72 @@
+# 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="Note taking application"
+HOMEPAGE="https://www.kde.org/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+# 	local mycmakeargs=(
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+# 	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index e366ade5afae..116e1d49567c 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-17.08.3.tar.xz 772916 BLAKE2B 542c17ee6be5543862c14c933054a21645c20ef18d8fa85b2499204ceac4e1ccc627595123914c64f85095d0e070a9e6f0e4c3d483197b43be15c0e82accf68b SHA512 0c3b8a48d592598f0573b925e84e02a540c4c54f9f34e1ffa6c619c193cda6a9aa4c584a465cf3faab08c18c143e665d2a33752c9dbe01706dc6751250ae58ef
-DIST kolf-17.12.0.tar.xz 927964 BLAKE2B ef3cc3145fbb56ebcb73cd9bc992b058639682c6a3fef224c4aec022c11418fa827556f7ca4a1325c9e85f535a068b578c9ff315ea13ad428ba80c0cfa592ddb SHA512 447947b9a524d649dbb1cca3d93891fcf4c64b4b8b5c325445c419581d9edd1a5cf050bb75417c5ba9af054d1c16fa5fb46331dc79aa7da9c73c1e8fc24ad87a
+DIST kolf-17.12.1.tar.xz 925016 BLAKE2B 4bf5649d112fe1cffd6dc78f3df8f13b2de48caa3b65c00aeff9d4e156e452edb6f3f97c75deca531071274ba1d6be6db86371f6c274893928129ae34d675047 SHA512 bf83de8f4b01466b3d3221373f07586dca262812e72d1ab52125510216cce5e8d3f3152eccd2fff76b8ad63599b259e1088b58df313b0b921c8775cd76fc2d27
 EBUILD kolf-17.08.3.ebuild 420 BLAKE2B 62e22e0836777725e06657e37d3dcfa8e8ffc8f90b0e7b3bf3c7313efa713a6d395f5d8d91a81d727bff169703efcf69e27528c9b930e534398195f7718d35bd SHA512 1231d9e0a9872945842cba4cc51f009d6941030e0ce153d2eec4ed29e4afa3eb230f15fcec50df8f69aaee783690dad5bdd4895bc1f483a762c3416e553b0135
-EBUILD kolf-17.12.0.ebuild 817 BLAKE2B 5170f823d3d9b7352c18b1d4983045c13c3a7edf033c82ce2966c3f9bdd65787d88f0efd1364e6119d58038a45f95a679d468c1f3bb6272d1ac4904483283a0c SHA512 c6d2ecbac0c13b74b979528a7e4b1f3b61d55015b5233823a072ab24922cfd385c776416613d64366d3dd259a54dccb0525aa0b4274693acbfe1896b58e0d670
+EBUILD kolf-17.12.1.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-17.12.0.ebuild b/kde-apps/kolf/kolf-17.12.0.ebuild
deleted file mode 100644
index 9942f2d0e9bd..000000000000
--- a/kde-apps/kolf/kolf-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kolf/
-	https://games.kde.org/game.php?game=kolf
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kolf/kolf-17.12.1.ebuild b/kde-apps/kolf/kolf-17.12.1.ebuild
new file mode 100644
index 000000000000..c4fe51941993
--- /dev/null
+++ b/kde-apps/kolf/kolf-17.12.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="true"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Minigolf game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kolf/
+	https://games.kde.org/game.php?game=kolf
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 6e778da0d43f..7ce42030f6a6 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-17.08.3.tar.xz 272024 BLAKE2B 92394cd030a90b24fbb6a3e9a965a1483b25f775fefc8cb7953d0a21152aaa345de77d7a6e80558bd7e536c92525b6cd29fcb29c6ed09be5ea6528f73df6190e SHA512 23fc8cc8a69d09ceb8682f3825f146cd2786c0306df5e93b19b93ced1c02c39e25dafa552e5f284abd54abbe97ccd0130b744a24b1eb0fbf4946d44ee51daef0
-DIST kollision-17.12.0.tar.xz 272068 BLAKE2B 7ca81b2ad8a23953fda063de8c1d4c4ae3ad16c97608c0406251df627b64c0f32eef605f3ad4a3311ad2869ca0d2195882000ac5d581ddb5695a892f2c8f70d0 SHA512 6323f585d66f7c79e24dd463b4bcc0b79e274ac9a6faff0de408553639c31c63b8f7ba23b5c543ed41d9efc0e04298775ba9ffc8ebb2d990e0482e1b4d0e15eb
+DIST kollision-17.12.1.tar.xz 272016 BLAKE2B 266e8975d87ea15193662d178ff0a8e160956fbf7c0462553925b7a4a965549be00393bafd48ea3cd98d233d9d4563fbe40a9245ce0323fdb88cfd10ae6559c3 SHA512 e8b9a1a2500cdecd8bd8fa1f974f5c7a3a361e37328d343c8df66a7a52ebf8b417dce6a73f99367b218c9315ec3ecb63d85775fdb0adb5620af02fdb663fce6b
 EBUILD kollision-17.08.3.ebuild 677 BLAKE2B 2e5e58aeefb6904df666285a73178ec75a5369cdf0412b499fb78bb0374083843840dd80f2168ffae00ae40f4ed6631fe0ef2c654a9629f26dbe3611c663d055 SHA512 ae88bec7edfe26b806a15b29a14fc317a757858e2081e15424b1db834b0930f2c2a17fc3e222a86243b3e2b86eae3b0e24cde1237a1519be276910c656029600
-EBUILD kollision-17.12.0.ebuild 679 BLAKE2B e0621a8d06f8102f878dc4db49103095807d8bd6d35c4c7120eb0d7b58936d98352eb0bc7b67bef07ac69ff93f5661001509282f50e586b61b63a721d05f8aa2 SHA512 b743569d2147cec34148f39a3b1ad2e50f335489f010ce4cc0afeeb0bd4855c25fa08455446cd805ca024b36dde65a610381c934f062d44bf225c36637588d42
+EBUILD kollision-17.12.1.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-17.12.0.ebuild b/kde-apps/kollision/kollision-17.12.0.ebuild
deleted file mode 100644
index 1a2f4242c9db..000000000000
--- a/kde-apps/kollision/kollision-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/kollision-17.12.1.ebuild b/kde-apps/kollision/kollision-17.12.1.ebuild
new file mode 100644
index 000000000000..159531afe066
--- /dev/null
+++ b/kde-apps/kollision/kollision-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kollision/
+	https://games.kde.org/game.php?game=kollision
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index db9c9f2c0bbd..f0b033e5aa05 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-17.08.3.tar.xz 5546536 BLAKE2B 14f1950f8b9cf0af985998489b7a369ad64ebf531d1a3c8763236114bb076db9a530c2950d877cf854067b02374eccf3367e9ef7694f46d0bf0bee4c8da4ce42 SHA512 4b7ff817eb8d35ae7d0d9c4f96036b1236d974e08f2db79080658b7b7b78111deaf23340f0216c9c60c367324cd36f4d62470220ab1bff27f6277c2a09b3dce2
-DIST kolourpaint-17.12.0.tar.xz 5546408 BLAKE2B 0f23180d56aad83df6663f86ef18f88e966b627c5d289dc0d73e4eb4f0402f5c6525e9b4c7cbe0145c903c4f8485cac051f54df406c2679d5d3952d74068f498 SHA512 523fa56796d3491d020a2f39ef26abeebf39167efd7274f85f1fec4a85dd6f99b0f07df92ad0c10d10bd017e7b107b403ac747f9230ae5099da51575a4e8890c
+DIST kolourpaint-17.12.1.tar.xz 5546824 BLAKE2B 2660b1c4d3736d1584fef23837e4283af67850e6719a3e3ed55fae04782f43c8652d3cc78b01f9e5736ae2f0e4a99f339b800fd99460a189a5a949517b5a0ae4 SHA512 194195fa8cab3ace61c3d17fcb13f291bdf258a6ba552fd52987271b65716ebfd771f31392f52bd1312b055a6ba897e91c658f917a1fbd60b403e69f62ac4462
 EBUILD kolourpaint-17.08.3.ebuild 1034 BLAKE2B 02f39ff7a3942020fc2a192d10d3214cc8909a1bdfc1eb5ebe57ddb9a9985de7d1a4c8d9754854d07fb89ccd7f41614ea7ec0ad1a8341c95c01690a6589ddfd0 SHA512 5ec98140f17a4ee634c73e374798bb90fc566b94f31c1d4adbec18fc53f3baccc1cc583f9a52f58d866e9d5b6774e03a2504cfd3e56c80f58db77b336afe84bc
-EBUILD kolourpaint-17.12.0.ebuild 1036 BLAKE2B 28244f68135e02f8d2c091bf1b88b1f9065326c027fbd6abe5ddf148e0ddabd5275b599db8af7b1ba9f93fb833db61bc4e123d2a2349a6a0b6434ca4278de308 SHA512 537cd2272bd0a05b13d1ba75aaf2b2a0d4d42bd5d5f40e534c48726892f0378642fbf31c51eb0774f27a691fcf1ac380f56efc2350f357211aab55e0c45f9546
+EBUILD kolourpaint-17.12.1.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-17.12.0.ebuild b/kde-apps/kolourpaint/kolourpaint-17.12.0.ebuild
deleted file mode 100644
index 69dda0e51a86..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-17.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kolourpaint/kolourpaint-17.12.1.ebuild b/kde-apps/kolourpaint/kolourpaint-17.12.1.ebuild
new file mode 100644
index 000000000000..5052eeec56d2
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-17.12.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_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Paint Program by KDE"
+HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
+IUSE="scanner"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	scanner? ( $(add_kdeapps_dep libksane) )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package scanner KF5Sane)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 2dee9e2ca061..a8ea265e8b4b 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-17.08.3.tar.xz 710592 BLAKE2B d0e30fd2f5a960d4ae621e04b5bbe0a906733bc03106bb264a20f89ce4b2f2c953542c6f1d1229208dbfa0c1c1be2d765f57301a5c324e06b9dd0d664c4954c9 SHA512 4e8145e0a5b9311511787228f510f0f7c5c8fcf498b4e41b2cbae4a77bac5989b0ed430eb324ccd1f3206fb05c1cfa754ef80a67db2de02c66d59f7939680d2f
-DIST kompare-17.12.0.tar.xz 712124 BLAKE2B d33a305394f4ba9c97c48a6911de489912574c7806a0598a71a33ad2cd2274bd562668448bbf25dcc1453b9e612a2a03580393787451c43d3f34f73a8ee555c5 SHA512 1a16eadacc7076ad6533c364d8db7b5d84bc6cc4341d4b0b52d67e39d6764a8822250c0ea2fd9e47b7484bd2f62931122c41739deaba2baadbb219ffcc0ed4d9
+DIST kompare-17.12.1.tar.xz 712096 BLAKE2B 033386a0c4e5ed2f123971d2d21f0c52d0ba3626aab08352fafb8c0203cb4e279fa8dc7b9600c190d0f31a92242eb94e3f6f2659fd2e6d9a45ba58dc7eec1f00 SHA512 82c0c0117784ec7317f031bcd25da21421b55544276b7d087f41a8216998ec0d49c3af11a3e6d1a6399303f4d4dd2c93b56cdad51b487098898d957bba336535
 EBUILD kompare-17.08.3.ebuild 957 BLAKE2B 15610f31a0581826c4f731e1bed69145c23f2ec9fe122be0225b904693243c675877b08a45ed5d411910d8e7876ebfb7002eaadbc08458a37528d105d5dde6c0 SHA512 aedbc03b3876183ed2be15f4a8e6e7f40cb7c589da938cd13c74826bbaafd47a40e394b397961e792501d67ad0e635e816aee0b0f83deae8ff77267c7f0ce0b7
-EBUILD kompare-17.12.0.ebuild 959 BLAKE2B 5fc2bcb57d1cc1264129ce80c6da98ebd8528097916a181f1c0b4ffcc500ed456c5304f0bc9ef54d84903add3be65b0d252f81a35860fb86d77200c2369af429 SHA512 52f6929f7d0d8da46a235f4d8af1be3494c56bd7f2c6713a793080688fa7647c87d3925de119ad3afde4d5cd062b3ac79022133a4a6ddd4e528523f18b79fa74
+EBUILD kompare-17.12.1.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-17.12.0.ebuild b/kde-apps/kompare/kompare-17.12.0.ebuild
deleted file mode 100644
index 903d62f4586f..000000000000
--- a/kde-apps/kompare/kompare-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://www.kde.org/applications/development/kompare
-http://www.caffeinated.me.uk/kompare"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kompare/kompare-17.12.1.ebuild b/kde-apps/kompare/kompare-17.12.1.ebuild
new file mode 100644
index 000000000000..5c3fbbe779a7
--- /dev/null
+++ b/kde-apps/kompare/kompare-17.12.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="A program to view the differences between files"
+HOMEPAGE="https://www.kde.org/applications/development/kompare
+http://www.caffeinated.me.uk/kompare"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index a5af6537bc3c..c918a2139002 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-17.08.3.tar.xz 7722120 BLAKE2B d835ad2259180d65d858dcc8ce0e2248ba71e2d36c789a6bbf5324f851dca3dae8ae4163f8f0e43d2bb81e154566d3d34ba93d9785f38b388f6d91bb420e071c SHA512 1eec491e3cf6ff8466a33e05723ae431da25fa883a9b90906cc9e06ee68d474eb25ea2a2032e27a4017c17659f5061d4ba2d7dc69f9637739717bec7abe50ccc
-DIST konqueror-17.12.0.tar.xz 7719876 BLAKE2B 0d8374f273198f83020697754af61ff682ef0ee79815882460865b4fa58e7e6374d2d882d2ac7cd3b807dcc259f2ff9a7bc955db11766c17e8aeb8b3d1531e1b SHA512 470db2b7cc036ace3114796bf3a7a72e0189af017988b1d71c3a46ed5c9aa7662745181e9582b615c6ebf7cf47b7e7c13a6cbe5130b57f1b4cd1c6f33525d7f2
+DIST konqueror-17.12.1.tar.xz 7721916 BLAKE2B 5260d03e574f596d31dd152c33cafa864a2db84b85d8ea251a16a3d908f311d71f898c169b4699cbe52aba60a1f376b8fa706ad8d76db02fcf24479ef3af73a4 SHA512 9f1e5d42f52255fa36bfb26522a5676c4a60382dc7d3f6067ebe5d806a46c8c1f3a3d4452ffdaab632bb4e874f6754c3437c7f58d8ab06d7933683d0c1c48f00
 EBUILD konqueror-17.08.3.ebuild 2851 BLAKE2B b50dc6dd721b111ae0d8e9842c0a6a711808dffd8a2feb9f5c76fd2c9d2e70fb72b9977824133bfaad5f817a3094b3abb3317fc621b33dc9437f4b631802fcdb SHA512 31814f65ea5b3c6ead7b0e1b814c9edb71672f0a76f86236560f95b6f91475280d7c35ef6926feb025926ff4c23c597595c14674ef884743c9fab032e11c26d7
-EBUILD konqueror-17.12.0.ebuild 2784 BLAKE2B 78731f0d6b3794a47d5e237445c66b5c254d9bedaea3dd9e44b55303a5ebf982fa8240680e143811194fdd54eaac3854ff28fcdd33cd32c93a6b7e69bcb2ac83 SHA512 ce94d9b288fb901152b5aca896db141fdbc5d35513ab941892a7f648ee5d90e044cc9bf8a087622c18ee1ab93542f9e0377bfa9b3d489f205198c314f2c598b2
+EBUILD konqueror-17.12.1.ebuild 2784 BLAKE2B 86eb6ec7ed7ec40243fd88984c22d95ae5636ca7f8beebafa4fd76b14e3dbe1b6c1e5b991d499f1b0dc263fb62dab2caa813ea07052738edd73e73c92443e07d SHA512 17c287ea87f3c0a0043798c063403dfefb590adc4196f34f2343964d70093fb8247225cac66848c2aef1e0331b12b6168d3efce06fab22622fb81b85bef3ee5a
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-17.12.0.ebuild b/kde-apps/konqueror/konqueror-17.12.0.ebuild
deleted file mode 100644
index 6fe0caa96272..000000000000
--- a/kde-apps/konqueror/konqueror-17.12.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 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 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-17.12.1.ebuild b/kde-apps/konqueror/konqueror-17.12.1.ebuild
new file mode 100644
index 000000000000..971eb9fb347c
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-17.12.1.ebuild
@@ -0,0 +1,104 @@
+# 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 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/konquest/Manifest b/kde-apps/konquest/Manifest
index 639cabc53db9..8fca8fa977f0 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-17.08.3.tar.xz 658128 BLAKE2B ec9799c07d99cea55770a9573466ed6c94c4e3a50b2aa32fe3d2031f47b45ac7dc7ca5d6751b2aa28540141b7a4a929f94c7bc1703e40053a6cc37057ddd736e SHA512 cf03bcb6eb612bd64fde7239ee4adce12ac317dc8ab17d43163b92ae05ca3e539850c2f419fb677e7b4b8c27e77dc889c4236170a3beb1352d7f21145fcb34d0
-DIST konquest-17.12.0.tar.xz 658300 BLAKE2B 97f152a0d72e7d3eff075fdffc59962a2a1d1763b071ff5ee9f3954d87d2171aaaf06f8cc03d7ec880cda6c2a9d2ced691e982329a0479cb74f355f4fc9dc253 SHA512 4d6fb2d19a4089cbd0d3fee3ac0a87d53cb1b52285cc6272c1607115aef947dfc1760f48e24fc3eab44736a107324a10bbe8437dcee5cf406386d65d75bde433
+DIST konquest-17.12.1.tar.xz 658260 BLAKE2B daff7c14c7ea13d60ff90e8e9087d4bd111c3a5021f3ef5439a23a0398d96b7a39659bc81b0b5dafa2d9081d1ac51ea5b68b5f61969ccbdd6ca1f8a2afe8c292 SHA512 0d3a820fc73575bbe742daae9992a730fa9de27005130c4c4274f77710832bd685036fa424c7940338a8e71a1a09dea5bb71174bc1bbbb941eee643fce9095a3
 EBUILD konquest-17.08.3.ebuild 791 BLAKE2B e6bcf5459e8783b43ac03d5285c9270bb51afdebbd568b431f605fb6450049247b006d06a4e3aed30d720cfe5a52802858cfcad5748458c38b4fd1a5748b39c9 SHA512 6b144c000c4a3c2e7b68f66f1366b9c84d3a0b1fe9efb252bbaceed5c87500632e4e9cad1cfe2d6d74b355aadf6df451b0dd422a4e807289b2ef77713e4e6eb2
-EBUILD konquest-17.12.0.ebuild 793 BLAKE2B 635d2d0f94c0c1f2dcc23e0318380e1a5c4109bd537a76a7bf11e4d1f5f480a640da4178840cfc5bf406a57e9474acc61900f3ae9e900c144ff259f4774d75b6 SHA512 2b7b1fcb68acb26269f21d859d89822d4d427adabe4a31bd27eb9b816a9cc96cbd51b79431b9f4db4c5f7d6cd5e77933ad690d718298c39f4e91734f1ef863d8
+EBUILD konquest-17.12.1.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-17.12.0.ebuild b/kde-apps/konquest/konquest-17.12.0.ebuild
deleted file mode 100644
index 1557150b396d..000000000000
--- a/kde-apps/konquest/konquest-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/konquest/
-	https://games.kde.org/game.php?game=konquest
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/konquest/konquest-17.12.1.ebuild b/kde-apps/konquest/konquest-17.12.1.ebuild
new file mode 100644
index 000000000000..f2519a625009
--- /dev/null
+++ b/kde-apps/konquest/konquest-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/konquest/
+	https://games.kde.org/game.php?game=konquest
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 9b3bc9364a37..4ac3df5767ed 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
 DIST konsole-17.08.3.tar.xz 1021860 BLAKE2B 62771c923614aefaa9a246fe2a937ba61f9de55e067dd04a8e24a9ad6f026b6c4efc36e3ef4244b98e6266cb685707b46be359e99886f99d1857a02b21570da8 SHA512 1d2723ba3dd988b3b1deaadf5ccf10455bf48d9c5961e9d614342bd5c0dbb7b42b461b529f4eb6a5ba855951f5b2d7d1d4f93170091ea3b47f02ac70c2583f4b
-DIST konsole-17.12.0.tar.xz 1026484 BLAKE2B 86bcb4be874ea05524673e9c143fe1b69aeb18d62383bee749a21907419d319ec182942c79272b5af8b7ea9cd4aceb49c978394bf0a14b9e4e2fa28c3e6e832e SHA512 67f30ccc01b1b81a01407a9959efd2664cf7f60b2839a3111eb31a7fb3a037080f83c416197ee33f280dfa0cac6c3fe0668222e37a766a4f99c10027e3a6e869
+DIST konsole-17.12.1.tar.xz 1026684 BLAKE2B 87601e07187721e8533f919cd553d97ec0cb2a8e986f4b049c4ae4eb80b93e42f33d6357734fe10492ec2db0210ccd4bc81a6950d02971e71caad952eadd5000 SHA512 af1e2e0ecb18a213de0ab452ed7db5b17ac477571b9d5ebaadad407714733e80f379f7ee6a506312c42e9bfe5990087b6f63655d18dc1cb302ff1bd446c2dfdb
 EBUILD konsole-17.08.3.ebuild 1387 BLAKE2B 4e21aa58c799e91ab8aa3894d512f1d15310e1f03c3ed5aa6b8887dc0b5944ac94fe1a9910941a68810705ea1fe8d9605aafba29dfa12e9bc046d20376f93ee9 SHA512 078bcdb02eaf222909b09d801617918cabe53b16ad80270b9136f2089fbb0f37b0b82d42016f5502c06c4413541ac3b958d0ba2319a08fbb612fa0806c92b312
-EBUILD konsole-17.12.0.ebuild 1389 BLAKE2B c061c041b3023883bce67b1c5f50c7c9848f678d92d0b71d5f467d7f779f0c97c591770018bf351a13de8549411bad62f2c97813c34e2022282c0b7577831995 SHA512 8f5231c57d4dadab45fe67b0e086bbadf77bdd96861ddbb26d702ff6f588c4c8150da606562b577a28def5cd80b652b58903569712b51bb63252b293239d3c14
+EBUILD konsole-17.12.1.ebuild 1389 BLAKE2B bd0818c2f126c6442662bb569b5a4e9b5b19b5e6aa09b2785b73943f3f3ee90ef5ccc784021a18f3d273d491ccda6775ef3ffb96a7816235029c5772ac7fecb4 SHA512 ba7de247be3a08c413ef6e1efcc6d1eeb3187e0c845f132c3fc80f279f20ca8df3b23a95c85a6ec658e26d764ba9472c2d7231377ab3f8a82bdabae52e859324
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-17.12.0.ebuild b/kde-apps/konsole/konsole-17.12.0.ebuild
deleted file mode 100644
index eefabb85fb83..000000000000
--- a/kde-apps/konsole/konsole-17.12.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-17.12.1.ebuild b/kde-apps/konsole/konsole-17.12.1.ebuild
new file mode 100644
index 000000000000..c091c44e38a2
--- /dev/null
+++ b/kde-apps/konsole/konsole-17.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 92b0fe091a0e..8d33cff5ad59 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.08.3.tar.xz 223524 BLAKE2B 27b584a5a06c7d5388c4a182f824005e8905b54773dfca8c010faba4d254a73d794ed4b1eebdc516ba7a100d0e3b841f37b4a23e2efeeec6416813c2ed63f949 SHA512 9ff26e19f7fcbedb76698d40f781c4e96f97c6441e5002b3fa0d63b22558563ae8f25f8343b05acc400af2fa5e96b7f96c4fa3a9ffc82cbf5d01cf21e002cd40
-DIST akonadi-calendar-tools-17.12.0.tar.xz 224588 BLAKE2B c9d991270f00e9abcc84317d01ad605a47c917d366a6b6108b07fc76c7dc57b7db9102ac97b3b38b84e89eb24f3a63f28d289c9f5eb6aab0c18cd4e65b09e40b SHA512 f76b0d6417bcb17b62da0612c55da54878951112da9060ebf66505e6ddccd9d28caa6e2c6cd4d571e4496a2b6bfba6bb7f680e3f74ecac7e1ece521401358fdf
+DIST akonadi-calendar-tools-17.12.1.tar.xz 224584 BLAKE2B ca816ecc8deb68032b3063cdb777e92b4dc94b9eba782e285a99eacc40742e412f55c6c6f9fca3797b20692a2f516cd2414a0425a2a40a6a3b0ca8bf5bb614e1 SHA512 a7a30b833a835921b071a6288507f131b3688de38262d5fa6f49acfb32148d1625abd5c3e777af6452166d54d374e2991b02c11d328f9aec2ab337581ca38311
 EBUILD konsolekalendar-17.08.3.ebuild 942 BLAKE2B 5896ba74e73708ca3c7ab252505b8fa206299217b24624a11431c0f8591b57bfbbaf9abf7e03e264e96ffc7f911852eff67b6a96dcf9d3fbd034f947ea6098a7 SHA512 8be34329395cd3c0ab6a52a8708a169d2690003901fafb7b851a1da309c9a70eac6f88fb805d71a8eee45fa3ed211bc3bbc2e5771306f2c4db9ab9898d269f3e
-EBUILD konsolekalendar-17.12.0.ebuild 944 BLAKE2B 062fede993180550c4a52f4a9308ce4ca49aeb09701e801be103b62a6027ce166691144d7dbc6659bedc743ee1de62695a3ef782dffd89672e6e6f0bde00b45f SHA512 19a10c9c33fca1e092f3af2231272e9d76ca6560b0adfaf25fc887ba36dbcc81484489bba8585ba4d50f9665319ee8d2dc619fd8faee8163fb553f563c565578
+EBUILD konsolekalendar-17.12.1.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.12.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.12.0.ebuild
deleted file mode 100644
index f6884c92dc96..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-17.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.12.1.ebuild
new file mode 100644
index 000000000000..5e43736100e8
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-17.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# delete colliding calendarjanitor translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/calendarjanitor.po || die
+	fi
+
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 49cf46a81ce0..61ee60a9bea5 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-17.08.3.tar.xz 864628 BLAKE2B ce727e20dc91a85ebcf5a4d014dfaa837455047771332a89a83860fc29db6b9cfaba3cb50b6a42b168c1cecc66fcf337b26da91e42352195d35d3ba66c9b8c6b SHA512 9dbd0a967425a6aa9c8b24fa28bf71d9e32329d1c9ed7f0f6eaecdfa12340efe9fc991b3591f554a2f4e0da1322aef75026d38a5bbb1ad53114a17004c5445fe
-DIST kontact-17.12.0.tar.xz 865700 BLAKE2B 6f0341989d924cf2ae7837e075f42959aaf992031b7f17f5e53c59b9abea614a46025ccbdcaf0fcc3d76a2eaac2efca28723a82f20150e658e28367ada8c0d03 SHA512 35944badf8565b206031c1abc61912818923e6a02466c897c16b392747f49a465abdca43513187af8baab95c2bb8080751af07580d4a33dc967bf3fe7140946d
+DIST kontact-17.12.1.tar.xz 865784 BLAKE2B 2d9d5016989ede972f112754953fc5e3261568626a3a2e489537caeedd520987e371ea41e940f0b733485807f15d8856cd2dddc99cab80a571ae265cc08616cd SHA512 06dc36a382968e55302fef50ac5c63cb4f75697be160b0af550f7bb641777b3c124fa6575ab314ea56c17bc76544bc871bcc987be59b19e306cf9cf725dcf7d7
 EBUILD kontact-17.08.3.ebuild 1201 BLAKE2B 37ea6ea682630ecbd2d4d8a9b2227b3f09c0d82114cc064218c5e6ff5de622de3df850ad6b3c4ac83773f298a2019f4431329db73797488731d8526163f33350 SHA512 0205aaf4638617f05c8791a1b41794202cef1006008d592c0bcd45e36a68577d2e466aa8166380eb947fc5ce0ce6f2c97fb465e654eacfd2feeea01b97c1174d
-EBUILD kontact-17.12.0.ebuild 1203 BLAKE2B 1911aaa94125280cbcda3f3c7de8455b7025a1836165a180eb4e83923bd59dd7ce1d85d8c2d0280984ea6082003c83c459275a3394e0e8c91eee92e8f3778582 SHA512 76be8da778bb254311f0c6c5659afa9e21cb83a9201744422f3519b489d29e391ccb2828b13dd9727289b3086c60911c9ef63a1e83bc7396acbcace833b10e5f
+EBUILD kontact-17.12.1.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-17.12.0.ebuild b/kde-apps/kontact/kontact-17.12.0.ebuild
deleted file mode 100644
index e6eb8f57fd9a..000000000000
--- a/kde-apps/kontact/kontact-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontact/kontact-17.12.1.ebuild b/kde-apps/kontact/kontact-17.12.1.ebuild
new file mode 100644
index 000000000000..e768a574bfe2
--- /dev/null
+++ b/kde-apps/kontact/kontact-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 1d4dbbaa5f70..9cd8b43366fa 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-17.08.3.tar.xz 32896 BLAKE2B e9c2c8227104a43cfb36e7ee8731198afed4a700ca6ba55f58b887f02b83562c7c4e7575a60c90e837d788448a4a045526a9f8a01963928a840ae900f9b2b4ea SHA512 d7eef2a1adbe4e904f86f0bab70f64dde7517b0eb71fca3b5d7f9231a8b63f811112f2c1ac696a0bfecfeb51ef85072eb61b6843d1eb290e7bc9ecd9e5fd1cac
-DIST kontactinterface-17.12.0.tar.xz 32720 BLAKE2B 73dd1850affce5b113df8864aec8d7ef0d726bc90b169714994f7c41a1eb9ba385c91da91469a0cf950cac70910de741c32ad48573585efde7895890c34ca55b SHA512 03f9e24c07ad0b3b336befe1f843b33e04d6f719b82e90c26275f01f1c37ad5b48b52288de5af9f946033c29549e610f103ac210d62612e6e52ff6e17b3b3198
+DIST kontactinterface-17.12.1.tar.xz 32768 BLAKE2B 225bc0ee9d9e3917e00d723c237299ebc282b7775eeab0a1370cf4ef20db26ce161a62c45084ebe3fe5f47b1ed66079cc9fb2435d46a7a8a9491fac659141a9f SHA512 a2d0f63a5c332a3f03331ebf3face27f4dcd56d66b35cfa27f9e8c55d2afccde1dba9ac74ae5e2e33517bd1529728aaf1b033afe56c78f63c8c087c82c9180ed
 EBUILD kontactinterface-17.08.3.ebuild 592 BLAKE2B 1d8ff617997b876a112068dcaeae50f7dc94b89b8994d739c6626696300e29ca6be5f1baf5429cdcbd051e67a7c10cd8bda0604cde47de550e0f609def1c1d28 SHA512 79f488fd7eb156cc3eb7377cfff867ccc08e0dbd0d5b235f72360e8321f5c274e58705cbdeea225b13e6a733c1190ddeff66fe66af67102bf425bedffb1707ba
-EBUILD kontactinterface-17.12.0.ebuild 594 BLAKE2B 58075c0d195fc68922e2d02c15d9dcad4ec1061c2602b673d573055ee22497c57391cc98010c1dccab4fa057092348fb03c8cf113a14377b7d9bdca267eb7760 SHA512 9b1f6590df80536f2740d0f0c24c0e6d4353926e391998063ac5b25b027d291626f1016f9a87cac24e6ae909bd5af70e5d0f83585d2b7fbd6ccafffb0d5f0e4a
+EBUILD kontactinterface-17.12.1.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-17.12.0.ebuild b/kde-apps/kontactinterface/kontactinterface-17.12.0.ebuild
deleted file mode 100644
index e2461b1a0c60..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontactinterface/kontactinterface-17.12.1.ebuild b/kde-apps/kontactinterface/kontactinterface-17.12.1.ebuild
new file mode 100644
index 000000000000..9622e2e660cc
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library for embedding KParts in a Kontact component"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index d85d98e7460a..b5e003e76ae1 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-17.08.3.tar.xz 2268320 BLAKE2B 32760f7531af06b0b86c0bf766aa743f4b62aea5f1ccc1923a4566e602d06d2ec18c6daf2ca58c984066b56dd96c4cf0e94fc09cdb9810288ee59903a272d659 SHA512 1e9c037fdecc1b3cdc22bdbd45098cdeb8cf5a4334b0583601dd499f4b277229d5481363654373a2f5cc115c9741ac2943c651ce697616c9c970cf5aa873f88e
-DIST korganizer-17.12.0.tar.xz 2263984 BLAKE2B 449e4c871d2736cdc6ebbdeea991421243c5ad02c9cba52ad3f558da59000b102227ca5ab85aa89c0cceca95171e9bfac270a74882a9eef54e966fef7b663c9e SHA512 6e46863b18b3bd64b0fe00ef543950f975f6a6ffa6a23f6e6a20b6a5d7f5be6983a07add948bcdfe02e12ec2900fe4574ff2ff29721dce33230481a0979dc1a4
+DIST korganizer-17.12.1.tar.xz 2263840 BLAKE2B c891052ea1b0b332a2b09504a7bf0c75333460390303864707a086144ada2ceb93595a84c716cf9fa6a10a82f563f482976657bef19c81f1b3a6ae6c5319fa33 SHA512 71decd0d02084c40f3c602fc5de4e8b7de111a1d78561ee4412edd2edf68b4b8d1ce3d77fe5bcbc2a3682ff7ea899d25f3a566a8ceb06fa56247796123df9089
 EBUILD korganizer-17.08.3.ebuild 2440 BLAKE2B 052f3ee0c9d8034ba42a622118d303e69895ae0db81f543333eb604ec52dbf38d7286864e61a0f5dc1fb1a9be86c11723c23a4c506fbd12e35b0c791845dfc04 SHA512 71e7c961094f64a5f1e8ed71777debbece55dd6c1adb1f15f5da94cef6bc7901fb5b6db2dc1a86f48c706133e15a41a1568656e74f90fac4e322800b0a95e19b
-EBUILD korganizer-17.12.0.ebuild 2442 BLAKE2B 8060a522843e524caee03b007fdd714cac91f64c69fec2f9dc495ef41b7df6df21f660c4a545b99287f43eab250b68f0959acdbe11aff9244122590c8138032c SHA512 d641fc1b863e99e8146a106841bd72a9989a176f66f88f7ca9e89c4ad1cb82d2fd6d6a8d9c51e127d587d8365062e7fdabdd5f7135d55661d0ea079aa2f30953
+EBUILD korganizer-17.12.1.ebuild 2442 BLAKE2B a5659bc9e995d86e46de1cc5a808d721db9196425a9c47f5a06985e8a4426c9d0bd26484ff6f04b44cc896c130175749d545d4764f153be437281cdb10d0679b SHA512 1be5c2a7f8463e4a3b53e57d43877257ae74cba436e4095975e7e5d217d3dd8f67a473da0f7fb046eb0352096b86122779faef62afd50a87a8021af7d98e817c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-17.12.0.ebuild b/kde-apps/korganizer/korganizer-17.12.0.ebuild
deleted file mode 100644
index d65c7e9f2562..000000000000
--- a/kde-apps/korganizer/korganizer-17.12.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep designer)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-17.12.1.ebuild b/kde-apps/korganizer/korganizer-17.12.1.ebuild
new file mode 100644
index 000000000000..1cb104909d33
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-17.12.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep designer)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 78a48e2477c4..efbc7b3e6d0a 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-17.08.3.tar.xz 3565464 BLAKE2B 49f72b9264dd0dbece2a834f2c227835727ff9fd6d3f2f08dce9109c85b38a764273f2efa0731c1161c9216a34de28afe8277ed20ffb8cb7a4e5ffac0c7a6eb6 SHA512 895b23a9a5764e22f3041dd1c6731a47519921509f5bac7a865dbc5ff86cf96edf8c396a78d0ebe880bbd5286271bd753505bb3de8cf67464c4ffb3c686ee573
-DIST kpat-17.12.0.tar.xz 3566412 BLAKE2B 360a06b646cb2f99091e8c0d8e52f76b1f8dc5e9652685a2b7cbcdbaaa268b0b56b0cdbecf17f291c097e9138d1874bcb510ba40c8c0d31847041b1dd8d48bef SHA512 73ddeb488e51cd74c38d2fadbe7b1773fd71451681adfbef3cc7503a5366c20d3cbf1bd9521427c84d90c7fbef1e28a20fce99e1e4a4cd955a86109d6d99c2b2
+DIST kpat-17.12.1.tar.xz 3566276 BLAKE2B 1b12282be2be49b2f4428d194ca99a7c91a4b8fd30879705bc8987f87d5cd9ec46d471a5a1944ce19872b728682a37171e463c4ba456623155d730ac39f97d98 SHA512 9fc380dfa34db015d29e56c4c281bd2809a73544796633bf9fa0fa6f1d219038e188c303674e2775e2c33b5324bb3cd9864560618b9d16720df33908a05d8e90
 EBUILD kpat-17.08.3.ebuild 853 BLAKE2B 5b4f69c71b5d7e65ea9f3a7335106da71851f1c757b0d6133b8a5884799740657f6936aeab39e7b14f97c0c1162971782e6d8fd030d89f413b4538cc1cfb8e5c SHA512 43c5dc46d33213f725f50d892bbe2bcbc20bc47d860dd3dd30917506671f098ba5fdf93ef07673c14f25d98e3a28d3fef8f45c1607632b81bbedaa620230525b
-EBUILD kpat-17.12.0.ebuild 855 BLAKE2B 7238301467f70c54137b95e0456cd5435eeb47bdbd4ce077828b60f7cd5c6c6bdac17ae11b3bba7a56c68ebca355ab3a151459f24456f3478cb7058e15f68e8a SHA512 73efe356647eb9edc7cf393a54197a9ab3bf156d2f111ecba3679ab07effbfa2dc49a170b7995048651344536b3ae893797450a7aab83f588c27273d559b7504
+EBUILD kpat-17.12.1.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-17.12.0.ebuild b/kde-apps/kpat/kpat-17.12.0.ebuild
deleted file mode 100644
index cf64aeec2e90..000000000000
--- a/kde-apps/kpat/kpat-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE patience game"
-HOMEPAGE="https://games.kde.org/game.php?game=kpat"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpat/kpat-17.12.1.ebuild b/kde-apps/kpat/kpat-17.12.1.ebuild
new file mode 100644
index 000000000000..14604a38fb25
--- /dev/null
+++ b/kde-apps/kpat/kpat-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE patience game"
+HOMEPAGE="https://games.kde.org/game.php?game=kpat"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 46dce0406407..b7eee910b918 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-17.08.3.tar.xz 140944 BLAKE2B 8705e649ae6c13c18e9286d7c66442ff345f0370104497660e54fb317e8bf3ab64a85763d19cddfdcb223c4c395197d2ef0b7e4a97017f094e83d442d1a1ebac SHA512 7ae14f11c67ccbb2e5bf88437444d9e9242c6a0b92b0a06425eaa37274409ce215b0129dec3131c8d135b825954b71435ed445fe0e4bfe7db5f17976fdc3189e
-DIST kpimtextedit-17.12.0.tar.xz 140776 BLAKE2B 72e9d0e6a249b5fef80812c0de785299deb14ed0247d9f37045d580def645e0778849641c71a29e716a80ce4622da04537442adbc5b6f2bdc393e43e3d908289 SHA512 79479719bdb88e9e050f16034e410543c579523e6220fd2fedaecd684d379bd3c1b98218e0c646ba9c691210a80564910358cfce8052e69469d5f710ea7b88a7
+DIST kpimtextedit-17.12.1.tar.xz 140784 BLAKE2B ef68d5555c82618ed4ee4a5b22d928b791a9973879a7544c126b63289920da040869e49a35c39329cfa4abf15f7b80eb1f254fab4c584255a405ef7a725ee19d SHA512 06006c5e0079cc77fd1519adbc8023237981544d43ef7e8e88a5f18494204ea348bfa0453c0f9ee5614ee1dd9136208acb7fa9694986427fa64b86a3799da26a
 EBUILD kpimtextedit-17.08.3.ebuild 1129 BLAKE2B 5103ec1ff03e1cf3e55b1e2444b1dca551bc946f316b1748681f470cc9796754ddb1c729120a21d9bd7b946b07ae6654dd214356789f7388c074fdfe2586394d SHA512 13999911c77c045b767835e3284e340f7107fc7b2ac8208d7f6ac17c5aed759da066c8011265aae1e7f3bbd4cd1a746c62a480c9be5ff56821a8795a5590346a
-EBUILD kpimtextedit-17.12.0.ebuild 1131 BLAKE2B a95d0ca741c5d983b0ee0a0cc11d9a7fb116a05335d979032e7c3b31c6682ae3e5bd4d326bd7a3bf49b6e036cf25a7359e86a33b849e1b8a6bd50eaac5cd372e SHA512 7fb5cb55fc3f8e6b27f3a27ff468e9f2816c0873f1d5506e40eed0a31ddda38589bfd929d5fdceda33a6dc77806b860844c810d04f7c6973644910047fdd8241
+EBUILD kpimtextedit-17.12.1.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.12.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.12.0.ebuild
deleted file mode 100644
index 99cabebb5c06..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-17.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A textedit with PIM-specific features"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-	speech? ( $(add_qt_dep qtspeech) )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.12.1.ebuild
new file mode 100644
index 000000000000..4df08dc9cce6
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.12.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="A textedit with PIM-specific features"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 5a5c75627cbc..b409fc726624 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-17.08.3.tar.xz 25488 BLAKE2B 4623bb2e051c16071ff27c3f912bc34e85c5d57ae771ad5e6ab4603b3b5f26d7ece53891fc9064fbb6a8563f03fe3e811e423b4812574fc61d1c3b2eccce5d25 SHA512 a0d701dd61fde3a82da5c4433f9f7351258308322935ca018913518bc1fd7dea4d6636a0f57db08bfc5e93d535b9be82ae55cfad7e79cbdaaffca65e6befe365
-DIST kqtquickcharts-17.12.0.tar.xz 25512 BLAKE2B e46d617208e7636ef0047e0afcbf0f47412aca812d1a236d34c824928299144d7622cd52686135e878a81846b0a9682c96ff7a26fd628f3113d8009854141c07 SHA512 50b9eec7c3720bca398301d5015cd090b5b67fd7e049684c34818804cd7ef66be3a67b7750f5e5231a2baf4656691f4983381bb065914e190fb4b8059b30fb46
+DIST kqtquickcharts-17.12.1.tar.xz 25512 BLAKE2B 2fe31fa5ec83c6c830a1307f88a60e3b5babfffa9fac0b0c33bf3e54074ccda7fc7ff9450436925e7f83f2cb98e02209d0bb5605c42f338e7ac58a808961d22e SHA512 42c992f588654433f62c96abe8fc8215080ab4fc0a4e61afaaee9db6bdc861303b6ea293babfd00e0e56b3e84e62afbdc66b598d0172ce7a77d1179fd91962b3
 EBUILD kqtquickcharts-17.08.3.ebuild 308 BLAKE2B e2238f6d40770bd8a6c741f1ac51d469fa94134e31a8bce3f08273960fa25159a1e69d6fa3db98a14d41b2a7a6f71a9467e7b4f1b2f84f2d5a6277afe8004a80 SHA512 40a866e5f95809f4399dba885d72cf5821568f61d1cff0fc1a090886040e80641a74a33be72629f989d045348778b6367ba2db77e3c472afd3388da91d001816
-EBUILD kqtquickcharts-17.12.0.ebuild 310 BLAKE2B c00dda787f92362ebf3eb45a486fe00055e4360ed9e9e5ffbdb3f79fdba3c60a818077ca890d5633badb1271ebb7e0cee4993ebae2a33600efc44c6c291f44ab SHA512 c54cdb98f7b6da9786bac6b42905f6508a27665b39fb84a5a2076771c9e454a01fd3b206ce4f7d181c96f32911b8bb9ce7e7127d45b6cd97283df720aab77e4a
+EBUILD kqtquickcharts-17.12.1.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-17.12.0.ebuild
deleted file mode 100644
index f3ecf96d6887..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-17.12.1.ebuild
new file mode 100644
index 000000000000..25309fd1765c
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-17.12.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 90da67d32727..baece55bb4bf 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-17.08.3.tar.xz 1554500 BLAKE2B 1289c760eec1570a39a8c2364971c91b386d3858963ba1cb3cf43665ead714c35281b23887a2f2a718bfcabd98052c05dce308bf2fd114624bb3c0895e91ef91 SHA512 6f0632a83c0159e317a0f3e9e054857af5103ecf5b597a46514c0d02dcadb422caae7b59f103fa6d0f1a0aad53518d37b10605c312b2c2e481a4d6605288bf95
-DIST krdc-17.12.0.tar.xz 1554772 BLAKE2B 7bd37d95c635e98de435d9a9ff30c2e8bf8c52c95ce43eac7031c44f96dc13791106beceed1c1f5b401eb1f96f3331f64d6a0aeb63fb9d2dc21459ca65956148 SHA512 e3ac9f2ba954e401fafd6f777b365acc63efdf5b698868136660e7182f021a18adb6dfe7fe2aa7da792ddbc95930152d617d4eaffc6613fb1843c647c00b12c3
+DIST krdc-17.12.1.tar.xz 1554924 BLAKE2B 865d320175e95990b6ab718b3398e3da5e5cff30e3dd556bd0a6d0d0fb0628b7c0e3540d30eaea23269f760b826fd95360e3c8c7eb335048b070486154f7cdf5 SHA512 0c45cdd6e9b9ffca847342c3698a6ffd49ba2e0548746e7e4d41089b988ce4111720c16bf63304bd1623a650880dd67834773b80d4b7989d24cf10d039e1a331
 EBUILD krdc-17.08.3.ebuild 1175 BLAKE2B 88930fba0212b90246d861eaeab8515bbe3cb30aa2f229b06c24f89df3de805108e540f7049461b7930579178648ddde42c0444f7b140c63b3d739bfd746a378 SHA512 40d576a2edbfeca330b1117866be2079e486a2c4064b047844c48f2acb674932c93b4067f121e547ba6a7e359ddd6656d4be5ca2de796de978c96d38b069fc9f
-EBUILD krdc-17.12.0.ebuild 1177 BLAKE2B 1127c3a95a46c7a235d5893d08965f91ccabebf3d547db9454b2d2beda513925ad09aa9c19ef5b1ddc00621ece7bdeed01c7c477b062005b639dc60fa32be2ca SHA512 f17036e929efe6c3b94682afe2ca72f0ec99bbe15ffc612a0f662dacbe81fa514fac06acbfe26d9d380f1d9514fc339762e03f038b298f384b2d1948abfbe1af
+EBUILD krdc-17.12.1.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-17.12.0.ebuild b/kde-apps/krdc/krdc-17.12.0.ebuild
deleted file mode 100644
index 65b39cfc33b0..000000000000
--- a/kde-apps/krdc/krdc-17.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+rdp vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	vnc? ( >=net-libs/libvncserver-0.9 )
-"
-RDEPEND="${DEPEND}
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LibVNCServer=$(usex vnc)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/krdc/krdc-17.12.1.ebuild b/kde-apps/krdc/krdc-17.12.1.ebuild
new file mode 100644
index 000000000000..b2db820336ce
--- /dev/null
+++ b/kde-apps/krdc/krdc-17.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rdp vnc"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	vnc? ( >=net-libs/libvncserver-0.9 )
+"
+RDEPEND="${DEPEND}
+	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LibVNCServer=$(usex vnc)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 242e215579a3..9b9472c7816b 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-17.08.3.tar.xz 909192 BLAKE2B a63f445ab333c92e009e5461cb5b3c830ba5e34472f2cdd6fcc2d24fd441d8b59ca5c6c842a24e66d66759169879da985a69268fbaac0074fe12b23786fbc342 SHA512 5e412fe58804524b9b7b774bc816ccdf061f6cf36a0f423ef5272477811d035390dd728f12f9c19b2a8e98aeeeed951e6f0b172c9baeb2a1b1123817613e6f31
-DIST kreversi-17.12.0.tar.xz 911464 BLAKE2B e70842f79f7e4da880e2bf902573bb82116cd95beddb5ded6a55dddc14d12da9ca3c8554ae96ff237a7a14f8088a650461ce5eb1eacd8602692f84753d6b8c02 SHA512 ead1486a836b0e790bba8222d050035cb019fb8cad865c7a5d2c74ab8474e6c1f38cc4fd4f254369283d7242dd0415afe21a64d1523cfd774f8a2ba5aee1b26c
+DIST kreversi-17.12.1.tar.xz 911408 BLAKE2B e03768172c6e1354c99c34f63cc3fa5ffa20dc5b14bbbe9fd5eca63d2605e1581b32690050f06ce8876bb416aee249de1ba263c026d322969b604b2d070eddf4 SHA512 f8dee2d0e5f38690afe2f26f5b2df35b2fb627969974f3d59ed27b7b03c66728a08105e5443aadc76730752cc2ed12b5026086c7cd95035b08d603f0dbaba56a
 EBUILD kreversi-17.08.3.ebuild 929 BLAKE2B cd4fb534bc1d5a42c6cdcf7f90cc219c9de972aa67678332ec03561f79dbf483bee2f065cb9defc9cca7587b1b263213049a53392d8a4ab08fb87af2dbca2f76 SHA512 22ab33c82ac24e7af4f68b45e81d803fa2e0f0c9eb7e4f57ef3deb30c8159147cf255b44b24840552f677a1faffa10a91ca95d4296d2d5d8e93167661e8ffcd1
-EBUILD kreversi-17.12.0.ebuild 931 BLAKE2B 03116b42f4d2e5ce652cc8adcabaa4f0cefa3c837a956a3450b04706a47902067a3a02d4d94aaab3f8c2ee32f571cc87894f5a794a1e9ecacdf1fbae33d3e8d2 SHA512 04d8cdee9203e29600f88c4fca1200ba6607864f94169c456c9a6381fadcda58299bb3ec899c285055ad55500fb93b83a794ad47fa0327bdf1f4a6948894693b
+EBUILD kreversi-17.12.1.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-17.12.0.ebuild b/kde-apps/kreversi/kreversi-17.12.0.ebuild
deleted file mode 100644
index 9da4ade01bb0..000000000000
--- a/kde-apps/kreversi/kreversi-17.12.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
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kreversi/
-	https://games.kde.org/game.php?game=kreversi
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kreversi/kreversi-17.12.1.ebuild b/kde-apps/kreversi/kreversi-17.12.1.ebuild
new file mode 100644
index 000000000000..a18a0c64d8dc
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-17.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Board game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kreversi/
+	https://games.kde.org/game.php?game=kreversi
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 949c2f891d66..2c7819890757 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-17.08.3.tar.xz 991148 BLAKE2B 7f84c9d0aef3eba1c55755b5a787a686b5de7955f1575926d7c0b6c3b5968d97fcea482c0651debaf869282b7608e8e2b80feba5fe6931c2be28784915ef14ca SHA512 4e234b432fe847e63373737c017f8a96e4235db2cfbd186bdd38fe16a4e9dfa4b0df03cff93b77c1aeb69800a109271b9165f8b4c360f6450cfa8d25fd5a3114
-DIST krfb-17.12.0.tar.xz 994280 BLAKE2B 966b12c32d7525548269b62a75c40df67cc1a4bf1d979cc2b1800d8dec68571e2525fddadd5a0d1e12f15e780e8060976443f1d37a233e0056aa76e4e6878ebf SHA512 4dcde89e7de794eb4887ca04e6d53658a022ba7b223a4556a7f32f2d54a430f8036cf3e15e6150f7fc608e60bd4a7bd58efd5ba5fa13e1bbf7ceb8b2ab188ced
+DIST krfb-17.12.1.tar.xz 996996 BLAKE2B 3d6bde10c4669f658a0bbcaebbe4bd6aceef0d1993e2aebfe9730a5098e2c59e7b7ee36b1b4b2b675ec3ad4b98b056fe92bd2cbf140c437ae7d5a828b0ac0ebe SHA512 2c60d09bdde644f018f0b0367f984de26d0ef3653a41fb2b8f9fb9aaffa6610290e852dcf035a042546f5e32528ee97532cbd1df7b9664d61533d1d2d30648d8
 EBUILD krfb-17.08.3.ebuild 967 BLAKE2B 0b7f2df928a7fd514a228e2fe1d2ca983e0fa948f24fee925b36ae57e7e116f21acbc0d8efc7a2475d7a4efb34fef8e08d4560674932c07689f8f34600053110 SHA512 d1669e17d3eb7bb9a4e56acd3e09eeff5eeaedb9f720a9b035575f5efe92d7d2148f2e00187de3a8af9e0b3d72ebbd22153706b7c4bc78ef975187c65fa261ae
-EBUILD krfb-17.12.0.ebuild 969 BLAKE2B 378dfe53af29df8f3edf393dafdb3777597b3d22df6d9874e3320eda80f51a1ef5c9bda4b4647904db2fcf52f9ae6131852445fd068eba2685c3766f6c632f69 SHA512 168c0d62226a8c4fddb0746576922717c9678d68eafc904b99c528bd9a7698282632b44431c98350fbbf5102caf7e38a0124926ffcf7d99671534d47e434e805
+EBUILD krfb-17.12.1.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-17.12.0.ebuild b/kde-apps/krfb/krfb-17.12.0.ebuild
deleted file mode 100644
index 448149cc4ddb..000000000000
--- a/kde-apps/krfb/krfb-17.12.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krfb/krfb-17.12.1.ebuild b/kde-apps/krfb/krfb-17.12.1.ebuild
new file mode 100644
index 000000000000..479224e0ac41
--- /dev/null
+++ b/kde-apps/krfb/krfb-17.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
+HOMEPAGE="https://www.kde.org/applications/system/krfb/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=net-libs/libvncserver-0.9.9
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 3390868d2168..91cae85210e4 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-17.08.3.tar.xz 144400 BLAKE2B 07f400eecea1f68b9b9e96d463741ae72400578b4250a750db24784cba9f23f8b1b7706373ecca80ef5187b8f2f2803dd6eb70658b4ae8ea0e7a4807d190a75b SHA512 6cd64bb587ca3cd3b51cefec246b9860f7ad63e9a86867fe4630422a9d09c30522c3ff933edded27b8adf4ca71737790179cc884990cabee5007b37c1e424e93
-DIST kross-interpreters-17.12.0.tar.xz 144444 BLAKE2B 2e490010bba150655bc6f6433314a614903ae671c193714bd539b79f3dbd3f545a8d6f0048c2a977689f27b788b79e7fe1144d3b9b687fcf76b50f876e6633f1 SHA512 32c12ebb41f5097e80e5b37cfbf0d2d3bc57f3f8f5e8d92d35b14f0d490f97017045cb1a4906f5d4a181ec8788c030a2c1b0a8bb37462629dcb694b209182cf5
+DIST kross-interpreters-17.12.1.tar.xz 144452 BLAKE2B eec5b71291e039ae4fcfb32c7a48696c19d18ee9611232398eb4a63a83444178423bb921aa9a5fd0cc4f6b176c2e767ee6edaf7869f2d7026e2a83245783144d SHA512 81701978abab167957306229ebea79a910c7c86f573b2bcbf82e1e9d1dba0bcd7e32954b86ff4390ce00d5d9bc896ba98b081c9eaa1dccd097c3372dfdcc23f1
 EBUILD kross-interpreters-17.08.3.ebuild 491 BLAKE2B 837a7816fb9827a6e085119553f27c304221c3b73165ba133c6153dfae8456da88cef139615c7a01a09beb45c7396b0ce6d680bb84bd76ded12ed6a0b8d82f2b SHA512 664ded28b14f45c900800bee627d81554f6f5dd2e1ff7eca0640ca823b3829daa4f703fa7759d276eb191147deaaba551a3354612cd6a0a14e4c5db47df1ed35
-EBUILD kross-interpreters-17.12.0.ebuild 493 BLAKE2B 2e62b08cece02c2ceaa75f2c54471ab74adf2de27cdd587789225c162fb2db59ef62f98afb9be8c34873f62a1557ac7dd941716a6d999d8e33a7a686561fd4d7 SHA512 b71cef2f080a4cf19c9ecf398bc6b678b91211420d2d8e0a75d8d7d043debb65d74fd0b15b2f9ee204e16938125b404cbcd106ae93432a8f705a7b96e32b88f1
+EBUILD kross-interpreters-17.12.1.ebuild 744 BLAKE2B c8deb48a67e2ecd8b4f940b2dbf8cecad75806a22e34dcacd597ca0af7992b9d21af933f4119fe16399ba6efebe4d81b0be13e4d6e18ede0636cde0fa52c6c37 SHA512 42cbc345751c9bcdb46509e73f1997de2e55850d89615c0165e19f6eeffa82a35b6b1f712b79d387532aad2e900fe9bbb8ac54d4da54b6689922357af6b1230a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.12.0.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.12.0.ebuild
deleted file mode 100644
index 004076404748..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-17.12.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde5
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.12.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.12.1.ebuild
new file mode 100644
index 000000000000..2a316da806a5
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-17.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22"
+inherit kde5 python-single-r1 ruby-single
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python ruby"
+
+REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	$(add_frameworks_dep kross)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_python=$(usex python)
+		-DBUILD_ruby=$(usex ruby)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 9c0133a636e9..5c2cbcf40690 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-17.08.3.tar.xz 258988 BLAKE2B 76a5d3a9a343eb0fc52806b730326f92eae35b4f303260ee070f229d20c164241d30240c959111123c690b9e04d008fc25877733338d10c6b0ad23da37d844a4 SHA512 dd2a7e948bf85b934cb2845d0af4265322f8df85a44bee3cc48f6911e4f7a8b596823596533791535ecd6730519e4cedd2051d47c190804ad402088a129d628b
-DIST kruler-17.12.0.tar.xz 259752 BLAKE2B b5e62c0b31067953ded1a910ca5655fe1208159c08d61e04441714958364a83c86e39e76ab8617bc5a24e6f8996cf261ac5a73558d69c9a4f4df6e4cc0953460 SHA512 af1cee45a9da2601534a80238fde511120246bab06a67b8a2da212c9c01185dd8fd6470ee076c8e87407a9d518072226041c5ee97761f10091618024b9a16cec
+DIST kruler-17.12.1.tar.xz 259792 BLAKE2B be18b74cd55fc4f668e7950f4f9b5782c0716f3544edf505e0f7a81ec17019a4e24ea25ed97c33c289af0cc55c41142234234b2c1c0bb1d8e7bdcf8ddbdc87ef SHA512 699875f2921aeb83a63f60ec8cdbd8d7ac0e7ccd48f61db908f1536d08bf513284ae0fc02b9cdc413638ec9cd7cc36dc8cbd559b06ed65855c0caca9f90917b0
 EBUILD kruler-17.08.3.ebuild 844 BLAKE2B 469d6c986346ae0b4d6922c1793e67ce52a1b6c4893c41d34a941130fae2b14e0d14204ac5ccb5d925398295902bf00dc3411e9333a0e3e625dd5bd61be71d83 SHA512 bafbc71090351d72086f2bd8ef7ff89dbe91b351b3133957b94ada5c57249339a3e241ac6b15c1a23bda5814db247fd88f7624a6da27c28d2703ebe930e5b5c8
-EBUILD kruler-17.12.0.ebuild 846 BLAKE2B 79b26e8583f18e291d8ecbb591afc5c22df0aaf863599f42400cf5b0a3dd3b34723dfef41edf9ec8bf07c5c47339ca42c0b7814e947efb933dc45f904ee0467d SHA512 ae4aec97db65eef19688567de5ac5e27bc97abdbfaf40c69b2e6572bb06971166de15cbf3f1be6843c89013133bd1f3a352687723d725f15f5266293a58d8a8c
+EBUILD kruler-17.12.1.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-17.12.0.ebuild b/kde-apps/kruler/kruler-17.12.0.ebuild
deleted file mode 100644
index bbe7e036de64..000000000000
--- a/kde-apps/kruler/kruler-17.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kruler/kruler-17.12.1.ebuild b/kde-apps/kruler/kruler-17.12.1.ebuild
new file mode 100644
index 000000000000..77f5502679f9
--- /dev/null
+++ b/kde-apps/kruler/kruler-17.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 931e8d3ed018..8468548bdd28 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-17.08.3.tar.xz 708868 BLAKE2B f7ad8a40a159a4ccd47633d99929da38ea999f6b11c315375b2eff414217fee0ef79134f5663da80db01302d99dbc70b091ab7833b873dd283e39bd50feee23c SHA512 ac61020615070e65b0b89d22fd82d41073080d9ae838ec9c394d68e43fb12d6bf20b60682359949b300cb38394c2886ab3b66cd724a086a248702a6e2b7e7348
-DIST kshisen-17.12.0.tar.xz 708880 BLAKE2B b6ebd17c8871297a7a1f709c95c0dfd198f0be8e85c58169c918858acc81ede0611f5005ec2032ededf8d6bd5041cfc4f564e271dffc9376a3eb902777416c6d SHA512 b5d4705e3de32c3e9922822fdf86b4d051a2ab53608c84d07d132cb767d5f11c450c2a3b562a0e581c595b66686b5d87d53c701ec60eae773d3082a1e3877408
+DIST kshisen-17.12.1.tar.xz 708756 BLAKE2B 0123451bf9365e4275f1c995bbdee6896c4782a4aca614033db17e5227e17645fe1202bb7e48d1cf31cbdf0a7ff9788df015171671f2613c0335f0e7d294f4a0 SHA512 e13fb07de9509d889a08a2728b7462a628e526a992f1a70c196bcc10c4907c1021ebd8e0e1b852bf31c188533559568d6c48e7cf2a7e49303b59eb2ad5e43ef6
 EBUILD kshisen-17.08.3.ebuild 778 BLAKE2B 52155ceb83e19f94126fa9022911ea611d4ac27a1b8ba9348aae0bee1be9440862bf4e15f91a9a1d260a198d3f7a4978308d0074262662fa9c319381d124e365 SHA512 9034e524907183a3273c9a8b2c23f5013885892f462e07778cfe203a323b144af5a16a98d126bc7cffcf498e5ff61897ec97080ddc8259a202477b311f758e62
-EBUILD kshisen-17.12.0.ebuild 780 BLAKE2B 725b9b400a15e646fd75419bc632d5cfa6e826d404944c324361e68bde631bd145a3b5efd16b1678a4444f0b7e96b21dadeaa9ab112833b1f6a4e41cd9bd36e5 SHA512 13afbc10b897356ad21b717e2a970426a4c549fd798e9d76493810bcd772d452d2ca49df85aab770fa536d67c3799ef3e2d8a4ccc8735e7771ca4cd23625311e
+EBUILD kshisen-17.12.1.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-17.12.0.ebuild b/kde-apps/kshisen/kshisen-17.12.0.ebuild
deleted file mode 100644
index b5f61cee7e0d..000000000000
--- a/kde-apps/kshisen/kshisen-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kshisen/
-	https://games.kde.org/game.php?game=kshisen
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kshisen/kshisen-17.12.1.ebuild b/kde-apps/kshisen/kshisen-17.12.1.ebuild
new file mode 100644
index 000000000000..907e49003ece
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A KDE game similiar to Mahjongg"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kshisen/
+	https://games.kde.org/game.php?game=kshisen
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index a8b01095aeda..88388f769f1e 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-17.08.3.tar.xz 5499732 BLAKE2B 19c67631dd0ad457b682c5447fd5410aa747bb3c042ae8a9591e0d73cb56a3469e098a1120e9c2b0ba69a00104437c028b30df00c2574ee14133e63e3064d837 SHA512 e56cf7b86815583bdeb3313adf988663dfeea5df2b5a064f5b1470c35b8c9dfe9ac526eeafaa9740250c4ef162ff7184acce033f80e4d87986914aaf1ca73383
-DIST ksirk-17.12.0.tar.xz 6990520 BLAKE2B c39c0278f24eb30596cf1312a8ccded4990def946e0084db32719737a7ea8eaae26cf0f99e87409e44a956e812b1e9958f856c2ab4791386ac48ce826ba056d8 SHA512 17a81dcccbbbf8aea87162caaa705a5463f8d973a0d17da171bc4ccfb23a30b5030086b58a44079065f788ef3ff195bab92043d1f61a6d6c1c64b52c1b4b65d6
+DIST ksirk-17.12.1.tar.xz 6987016 BLAKE2B a96e9c3888d90ea52e7bf4877503888e026c741983db2aea9982ba62691927829ab8d0d15f71546a8655075ea7033abd2d52e670f1614b2523a354b39c460f45 SHA512 95d49b9da0d6731e13a9ca85b371072db6f165db282fe8ec21b065d9c0e92884a4af535bf0ac22619cd07163e369f34704a724200d855afa8e25356586c20e4b
 EBUILD ksirk-17.08.3.ebuild 463 BLAKE2B e6db44cc68878a34feb62748bab6cfa27835370b688efab4dd665757f36d64c0349737306eb9c479724ce0287e47d0cb644d348fd28f013ea153fecc0abc9ad9 SHA512 1e62d577cd23f7772246006eb8d899e8c92216877363ed09df62a52bb8431f65e9c3d47cfff419b830db20927c5d60bed66f05a212be14ce44cb6e2ae7862b72
-EBUILD ksirk-17.12.0.ebuild 991 BLAKE2B 65af6a5045901e53e3119a48286bb70b207042e4791a05d7c9e9dc04caf4527cb2cb7b5dee7f6f80bef90d46044d197ffa4d05aece74043748532b8b156743a6 SHA512 842d070bd72772a554dd3a8ec22a3bd54143eed4457a23d52d0e6f8a097f65fcb7c6ede69d77aefa2bb8e33a5965b6d48a25411e0e1b116edb5d46fc8e802dd2
+EBUILD ksirk-17.12.1.ebuild 991 BLAKE2B 1da9a20bde3ff4f3bacb71f0bed51caa7a571b7605c26506b62b2054a4c12a17f899c8861325f267ba15a7358fca5387d874645b81c93c04d28ff7911d79aab0 SHA512 b737995a13591feb0c799628a2daf784c3868a80c766277dcecad6d30e70ed8b73bd4354992ef19516408309c747b9ed79f7d087c675f577cc368f7e319f28a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-17.12.0.ebuild b/kde-apps/ksirk/ksirk-17.12.0.ebuild
deleted file mode 100644
index 115ea4bd1466..000000000000
--- a/kde-apps/ksirk/ksirk-17.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Port of the board game risk"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksirk/
-	https://games.kde.org/game.php?game=ksirk
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/ksirk/ksirk-17.12.1.ebuild b/kde-apps/ksirk/ksirk-17.12.1.ebuild
new file mode 100644
index 000000000000..a3736e0d0852
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-17.12.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_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Port of the board game risk"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksirk/
+	https://games.kde.org/game.php?game=ksirk
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5]
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 7251216f5b4c..e4cfeb1d147f 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,3 @@
-AUX ksmtp-17.12.0-correct-hostname.patch 1799 BLAKE2B 0f5965312cf307809d7aef4579156245888dce5a3a6a30e08aa010b460fdca1952e8f29c22b7411f444fad2fdd578db0ef61ff564f750d3b7c497c9b98b70e0b SHA512 e5ac06c9b1f5e98a5fd6910cf0c38561436ff555778ccebde69bf0a648057fa2f164b30443b9099cd47dd09fc9619a8abe2b16b0fa85aff4adb3fd0bfe619314
-AUX ksmtp-17.12.0-ehlo-auth-fix.patch 3283 BLAKE2B 69e1cc31cb31829aca1b24650c8c42e3bf548ecac529f5f12ed0503b17347f515418f108ad029def7d81da51129e5743033ce713466233c7e0f8772c69b6b8a7 SHA512 f7082efb07a3cbcdbe32d1d8a2acad148eb34a66a874b3b9916f51fae048133602f1bd29ba93aec27f6710e4517c4353415d316a719829971851b409bc2edae7
-DIST ksmtp-17.12.0.tar.xz 38132 BLAKE2B 8a78e06c02ef2b21c23d3251c3e6b92eeae7d578bbdc34ccd0837f73898efb8e8f3aa4123ccf7892d2e27292128ad74572c8c7d173ce534e9795c8b4e338c297 SHA512 d42dd363086d5d9beec7e759aa7234f33c0c62fab5ae0f2f2e78cc81c9bb053729cde31ad6243e9d46e77d937cec8e7694cded4ce726e8a6583ca9be97ad43eb
-EBUILD ksmtp-17.12.0-r2.ebuild 589 BLAKE2B afc09e57d5e74c5a24444096fb012758e30dcc2709af14664da92320f4070619ef565fd8bbe00d8716bafe0fdc0b160451279b8059b34ac83fc55f2c16b10120 SHA512 3398ddb3578074e4c8614f0d1a276c63f285fd04b3c39172d2d1a0adfd4a00c914698ca0dc2ffad3754fc05bbc57ec38350b4b5d6ab25b8020b5a5da1db75665
+DIST ksmtp-17.12.1.tar.xz 38384 BLAKE2B a2dc08c473b16305f2b5318cc0d4acc5818eaf9f634d3814c08dc18a4a085765f3b97233da13b759d7e70365ed46c42cf2c310ce3b0225aa57b4e67183231c81 SHA512 b3d5aaf1bb9030615fffa9af0ed80a97096c80fb40c64e921d125f2809ed282ea2cb07e88f6d2134e154534751ab3ea6bf2067576f7b89398ca274955fac1a20
+EBUILD ksmtp-17.12.1.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch b/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch
deleted file mode 100644
index 8860c59ebfde..000000000000
--- a/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 5199ed07428a03f1aa340da3ae99fcfa62ba2751 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 22 Dec 2017 22:32:49 +0100
-Subject: Send the correct hostname with the HELO/EHLO command
-
-Summary:
-It sent the server's hostname previously, which some reject.
-
-BUG: 387926
-
-Test Plan: Ran nc as smtp server, uses the right hostname for EHLO now.
-
-Reviewers: mlaurent, dvratil
-
-Subscribers: #kde_pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D9485
----
- src/session.cpp | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/session.cpp b/src/session.cpp
-index 4320adc..0be26a9 100644
---- a/src/session.cpp
-+++ b/src/session.cpp
-@@ -27,6 +27,7 @@
- #include "ksmtp_debug.h"
- 
- #include <QHostAddress>
-+#include <QHostInfo>
- #include <QUrl>
- #include <QEventLoop>
- #include <QPointer>
-@@ -82,6 +83,18 @@ void SessionPrivate::setAuthenticationMethods(const QList<QByteArray> &authMetho
- 
- void SessionPrivate::startHandshake()
- {
-+    QString hostname = m_customHostname;
-+
-+    if (hostname.isEmpty()) {
-+        // FIXME: QHostInfo::fromName can get a FQDN, but does a DNS lookup
-+        hostname = QHostInfo::localHostName();
-+        if (hostname.isEmpty()) {
-+            hostname = QStringLiteral("localhost.invalid");
-+        } else if (!hostname.contains(QLatin1Char('.'))) {
-+            hostname += QStringLiteral(".localnet");
-+        }
-+    }
-+
-     QByteArray cmd;
-     if (!m_ehloRejected) {
-          cmd = "EHLO ";
-@@ -89,7 +102,6 @@ void SessionPrivate::startHandshake()
-          cmd = "HELO ";
-     }
-     setState(Session::Handshake);
--    const auto hostname = m_customHostname.isEmpty() ? m_thread->hostName() : m_customHostname;
-     sendData(cmd + QUrl::toAce(hostname));
- }
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/ksmtp/files/ksmtp-17.12.0-ehlo-auth-fix.patch b/kde-apps/ksmtp/files/ksmtp-17.12.0-ehlo-auth-fix.patch
deleted file mode 100644
index 903bfe0d1144..000000000000
--- a/kde-apps/ksmtp/files/ksmtp-17.12.0-ehlo-auth-fix.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 4564d77d3c644a7d1f99749c4e934969b4e21952 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 22 Dec 2017 14:22:49 +0100
-Subject: [PATCH] Fix duplicate authentication
-
-Summary:
-The response to EHLO triggers an authentication command, but with TLS
-two EHLOs are sent: For the 220 from the server and after TLS negotiation.
-However, sending it twice results in an unexpected "503 already authenticated"
-response which ends up getting parsed by the SendJob, causing confusion.
-
-BUG: 387926
-BUG: 388068
-
-Reviewers: mlaurent, dvratil
-
-Subscribers: rdieter, heikobecker, asn, #kde_pim, lbeltrame, cgiboudeaux
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D9476
----
- src/session.cpp       | 29 +++++++++++++++++++----------
- src/session_p.h       |  1 +
- src/sessionthread.cpp |  1 -
- 3 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/src/session.cpp b/src/session.cpp
-index 861419d..4320adc 100644
---- a/src/session.cpp
-+++ b/src/session.cpp
-@@ -80,6 +80,19 @@ void SessionPrivate::setAuthenticationMethods(const QList<QByteArray> &authMetho
-     }
- }
- 
-+void SessionPrivate::startHandshake()
-+{
-+    QByteArray cmd;
-+    if (!m_ehloRejected) {
-+         cmd = "EHLO ";
-+    } else {
-+         cmd = "HELO ";
-+    }
-+    setState(Session::Handshake);
-+    const auto hostname = m_customHostname.isEmpty() ? m_thread->hostName() : m_customHostname;
-+    sendData(cmd + QUrl::toAce(hostname));
-+}
-+
- 
- 
- Session::Session(const QString &hostName, quint16 port, QObject *parent)
-@@ -277,15 +290,7 @@ void SessionPrivate::responseReceived(const ServerResponse &r)
- 
-     if (m_state == Session::Ready) {
-         if (r.isCode(22) || m_ehloRejected) {
--            QByteArray cmd;
--            if (!m_ehloRejected) {
--                cmd = "EHLO ";
--            } else {
--                cmd = "HELO ";
--            }
--            setState(Session::Handshake);
--            const auto hostname = m_customHostname.isEmpty() ? m_thread->hostName() : m_customHostname;
--            sendData(cmd + QUrl::toAce(hostname));
-+            startHandshake();
-             return;
-         }
-     }
-@@ -346,7 +351,11 @@ KTcpSocket::SslVersion SessionPrivate::negotiatedEncryption() const
- 
- void SessionPrivate::encryptionNegotiationResult(bool encrypted, KTcpSocket::SslVersion version)
- {
--    Q_UNUSED(encrypted);
-+    if (encrypted) {
-+        // Get the updated auth methods
-+        startHandshake();
-+    }
-+
-     m_sslVersion = version;
- }
- 
-diff --git a/src/session_p.h b/src/session_p.h
-index 875f7be..90151f6 100644
---- a/src/session_p.h
-+++ b/src/session_p.h
-@@ -73,6 +73,7 @@ private Q_SLOTS:
- 
- private:
- 
-+    void startHandshake();
-     void startNext();
-     void startSocketTimer();
-     void stopSocketTimer();
-diff --git a/src/sessionthread.cpp b/src/sessionthread.cpp
-index 1e4db8b..c195826 100644
---- a/src/sessionthread.cpp
-+++ b/src/sessionthread.cpp
-@@ -223,7 +223,6 @@ void SessionThread::sslConnected()
-     } else {
-         qCDebug(KSMTP_LOG) << "TLS negotiation done.";
- 
--        QMetaObject::invokeMethod(this, "sendData", Qt::QueuedConnection, Q_ARG(QByteArray, "EHLO " + QUrl::toAce(hostName())));
-         Q_EMIT encryptionNegotiationResult(true, m_socket->negotiatedSslVersion());
-     }
- }
--- 
-2.13.6
-
diff --git a/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild b/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild
deleted file mode 100644
index d4eac8670b30..000000000000
--- a/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ehlo-auth-fix.patch"
-	"${FILESDIR}/${P}-correct-hostname.patch"
-)
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-17.12.1.ebuild b/kde-apps/ksmtp/ksmtp-17.12.1.ebuild
new file mode 100644
index 000000000000..237add174dc6
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Job-based library to send email through an SMTP server"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtnetwork)
+	dev-libs/cyrus-sasl
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 1ba045d2719f..8805a301775a 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-17.08.3.tar.xz 605676 BLAKE2B fa4afcb74ce85d6083c4069c8aa1ee1be2eba2bd1d4d0278dfda7400ef796fecfc83768b1359748ba78c7318d7fb2ebab85240deecf81a41dd8ea0fb388de4cd SHA512 e7bcbf94ecdb737d47278dda5387fb12251cd169b5167fd49edf89593f06d69adaee1a78d70f1969e80d629b214ebd7d63437b3a2f677438de99011213f25067
-DIST ksnakeduel-17.12.0.tar.xz 605844 BLAKE2B f8f34a164d9be5362e0374b7bc3a25080e4fbd1a01bb9811b36173b7e29c7efcc74c7f92578f174cbdd469c002847a5f9e245663e6020c6850c5a4e70ffd011d SHA512 e5a87afb5780ac7ef0562a33d6eee25ec3340203240fa0a0af527f278a8fe5a429796f65b9261dd2bb80e47fccecda0d0c752328b615e2e21fb7393cc7ed85fd
+DIST ksnakeduel-17.12.1.tar.xz 605972 BLAKE2B 769202ff30d6444ba262fdd0b21ddd4a4a8d6392c77b000dd96c32442936ec1be21e52c682ffbd8a5143a48833313edc2fba9e71bfc6bfd31ff7b8fd660f33f6 SHA512 e49aa264d326133a4ab2baf537cb15d6dccb75fff8023a617db8cab61666b4f372c3968cc7bb7e443a36d516206cf1e7b6979de804354565af65822ec61851bc
 EBUILD ksnakeduel-17.08.3.ebuild 799 BLAKE2B 0e9608a896620c04bd7904d0b40760392dd4f20eb77bd1988eee4ab34272f5e0ebcffd169209dae6c78f707d52d9aee646c5778fbf359019818b836b8b2cc2f8 SHA512 72eff466a8d6f4ee775e6e3033c89a634afa39aafd067a80ad5b1c768b5e40d659778fd2bac9862ba7f4adbdb8fd87e5d5ef1dde374398b073879799a7c3db93
-EBUILD ksnakeduel-17.12.0.ebuild 801 BLAKE2B a2222af23c8cb754951972c9cb5256dada55446542c7f46947f7cae65d3153d6a21aa759337de78736fd50e60e204bd07bae1121981d395ab47c0ba94e8a723a SHA512 fad2a82edd8a29bbf736d3d5979da05684a271674a1c8fbf1800dcaa99e2a6bed31f40ef702a1fa876280f5eabfa1b1bdeaf5a4ab8fc558d57021d89587ac8c1
+EBUILD ksnakeduel-17.12.1.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-17.12.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-17.12.0.ebuild
deleted file mode 100644
index a497ade07c5b..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/ksnakeduel/ksnakeduel-17.12.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-17.12.1.ebuild
new file mode 100644
index 000000000000..7bdccd636b12
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 3d98e9d62a7c..d2d18bbaacc0 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-17.08.3.tar.xz 609840 BLAKE2B 9e751ea1074eb94a79889fd83375e811977b9ead3deb7999d1284b830a03ccd637e7bc8ff6a593a1cb648634f324bf189b52c93ac90e0b8013ca6bba8545f664 SHA512 b1603fa8bc9d33d7077191bef933dcefda996c24760bb5649e9723387ca09417f7e27881ae11ebb9c3ca9448104076d75490ee6ab2a65d32660d27f9393c6626
-DIST kspaceduel-17.12.0.tar.xz 609972 BLAKE2B dde643ecfebc50eada679f89cf718757849465a3ec3f7a5543d3f6f26a46fd024604dde65c8be12ece22d4d80988efa92a4d7db94712d8795bd889b0697115c4 SHA512 3a60230001eb55c3d11e5fe2425ac7bf0ccb93c804f5076feb80e8305808f2f29bc2952dd44041c1133a41690c0d2e4486bdc645afa298c8f7cf91453b95bf7e
+DIST kspaceduel-17.12.1.tar.xz 609932 BLAKE2B 9e0fbdf98139f02d5bf06d09b5d4d4dc97d4191e3464231fc00216d1dbe825489ecd483ad064405b886f935c27e0b67b2ea9efd496d9efa6559c5f8208b87609 SHA512 5917c8682ac4f10a8bc74633754c83d796241479667e2843040010a8bad2ad8b54b984b2f9f559356944fef2f4560455ef2fb0ee8f13fce29fe0f916fb0ce0dd
 EBUILD kspaceduel-17.08.3.ebuild 752 BLAKE2B 642ced25029426daede22570900734ca393857abe26d9c1ab3f1cd50815bb701d8c87c4d2a3d0a9cea12499baf877695e49174b4e3326400eccf65f482037254 SHA512 6f580dfa34f0873cef0bf81bfbe47cb57b08414b373fffa4a5c0a1627f77736cb5959fa794bc189a80de81eb586f786d16a53418cb38dd86ddb2384157f7a3ea
-EBUILD kspaceduel-17.12.0.ebuild 754 BLAKE2B cc9fad8c28cf7fda2671ed1454b1e77bfedab7e16f56a16262bb7a0398301ab34535a77e723757ceb26028eafe1fc0417932f1d5b493cb8834baf4e8992f6ce4 SHA512 4fa7625b808d2a3759bcb49c7925fe253c55e979c1fea95d08a2738b46c42147eeac2909c5f5513683ccf9ec64925836132b4ad1c5f4ad360957f0fd7a2fc022
+EBUILD kspaceduel-17.12.1.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-17.12.0.ebuild b/kde-apps/kspaceduel/kspaceduel-17.12.0.ebuild
deleted file mode 100644
index c69d7b0179f9..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kspaceduel/
-	https://games.kde.org/game.php?game=kspaceduel
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kspaceduel/kspaceduel-17.12.1.ebuild b/kde-apps/kspaceduel/kspaceduel-17.12.1.ebuild
new file mode 100644
index 000000000000..f04dfdae0a5e
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Space Game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kspaceduel/
+	https://games.kde.org/game.php?game=kspaceduel
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 77104b492f76..7b68ef052efa 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-17.08.3.tar.xz 215464 BLAKE2B 7885e41c3cefe9f4a18e12dac9e543c69f8839554c9effd0425b76e6093c632e3faa91e1dc019b20ce415e129a824103c493d361cf8a5ce05c14f528a80ddaaa SHA512 ae1a1c79f8fc619cdff146104ef15191b77a1a25dc2e535085cd256d5d891931903095c0e60d465c68220628f18c8c5f1f029d4502648b403119e9ce4bcdeebb
-DIST ksquares-17.12.0.tar.xz 215748 BLAKE2B 5957893467ab0ddccd8eaf589963b0d18353618f454db86863ead7bc7f48aa9194ed5a3e46cf5ab68699c52e83666e2a281cf6442dcb3a8c93ca8e1e588be92a SHA512 6447a26cecab70b7b52d8edd3d10852efd59d514d4504be9607629faf1643380e575c8393dcde9cbff4543cfdbcf0ed48bed571c0b5557399a1160a3a2cf7bff
+DIST ksquares-17.12.1.tar.xz 215692 BLAKE2B 000f86a69791e182b39b9cbb6ee65a3c640ba05df82baf6aa946bf8431dc6622f86ebeb83649f0af79ce86c40d343e132c0120d3406a3a111aba9772361fbca8 SHA512 dc22020e9916e136a30d41edb97f2fe392f6235bf6e3e713ba0fbc7ae05acac7d24d7468ee294c18b5fcd4d9ec20f67a86dac5f833976dbe05f780bbf7faa26e
 EBUILD ksquares-17.08.3.ebuild 753 BLAKE2B 1a97ad9defd1d0501f09f9615c4df84d2b70c179084799eb7a31ae288350dedc5d9a3f27f250a03fad46063495f2c3bbeb4d9e5f9c954a1ab1f136dfda15d90a SHA512 07b8c674a5dcc0987b2ab1c226c5d6da7d680fef4fd6676d17d925315a6ea9bc04d28fa72672ab9fca9b1c2c9da9b2e531715bc09bb25460b48029844ebf7fe9
-EBUILD ksquares-17.12.0.ebuild 755 BLAKE2B d5a95bc7e13b412a84d210f2c6c460199e1d5a4e4d72f6318c35bbcd8a5d30fa5f9935ecdaad5483f501cbea37cf1bba3bf977c44489595507744bb30df65c61 SHA512 40d5056e4776ad4ea5034fadb2d200deb78e5c57ba0a8b9cddbb8e05b9e02540652645c91c7133e61112b920a3ffea45016a849d39555eb8728a2e200dbb1863
+EBUILD ksquares-17.12.1.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-17.12.0.ebuild b/kde-apps/ksquares/ksquares-17.12.0.ebuild
deleted file mode 100644
index dd1e4c074acf..000000000000
--- a/kde-apps/ksquares/ksquares-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksquares/
-	https://games.kde.org/game.php?game=ksquares
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/ksquares-17.12.1.ebuild b/kde-apps/ksquares/ksquares-17.12.1.ebuild
new file mode 100644
index 000000000000..2a05f5517dc7
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# 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 clone of the game squares"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksquares/
+	https://games.kde.org/game.php?game=ksquares
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 8014f4e78ac2..40dbb7dde07a 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-17.08.3.tar.xz 1634212 BLAKE2B f736fd885e71c31d571e6cb2af8da1ffa8bdd99e969f0db2b7ec8aad1894124ae871f74774e7fc12418f29437a1d997bfe4b2f4ca884e32de7fa70f11e4cc9e8 SHA512 e948cf7ec5b51f83b3604ef7b97575543d4ee9a2fa17237954511e74ebbcf6b4a7781132a6e2c49ed70c6d7df653015140dff230275826f0fc12900f63c139ea
-DIST ksudoku-17.12.0.tar.xz 1634952 BLAKE2B e51d777fd57d09f53ab8858f8368383af65b7688373d62ff958534768aed555ede7c6bc55d34570d13d697414f554d0bab4546fd0f7246bb1201e34568f3aa0f SHA512 c7eb64964f8457d0a159984db436c9e75a1577f0dfcf888e4e4f2b121885f4fa69771be960fbb96f42ed968014f4f8e3202647410ea14a41b106ff82c4fae513
+DIST ksudoku-17.12.1.tar.xz 1634824 BLAKE2B 8be789cffe3d1226d644455fbcc0168e4e5a2620b53d84e5ba17c3743750daddbdd0911192e1745c3863f383e527090fadfbd560e1d9f197ca41c248a6ac8f62 SHA512 2a31f1d22a647d2d6375f31a6d5b95a37e575cf43b0194d7eac422511e00350a7e8af79e0589e450250593e864f02e00eb128b3c85c7d04690ebd14c0db0bb42
 EBUILD ksudoku-17.08.3.ebuild 1134 BLAKE2B f821d1bd3f38d460729280d448af594d7710973b4795a0d18314321cb7139c9607001fa9c7eecb3f6e14bd76f2fab57c0997584d6e1ecbed33dec0b194b00882 SHA512 47698a1e808602a63093e72feebcc94538f16ec1a2dcfd111d475d708120be136aa240c409840ec0574bf6b5e0fb213b8ae7fadca845917e4d029c7152439271
-EBUILD ksudoku-17.12.0.ebuild 1136 BLAKE2B 24fa41e4e7c484f0bc5b9096e7a42260c5776304124c670c1bff7026489c689c99432d3277ef4eccb9e4e012137707d28fa4a6fcd132b5838e28bc7bc4f76c55 SHA512 908063f1920a81575587c321cc41b8d47ae4371f18f2249641abba4ab3e693bc2737236df35ab924403e113db166b80c4ed2cf704893ef5aca5791128a99dbc0
+EBUILD ksudoku-17.12.1.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-17.12.0.ebuild b/kde-apps/ksudoku/ksudoku-17.12.0.ebuild
deleted file mode 100644
index c00f7abb2b1a..000000000000
--- a/kde-apps/ksudoku/ksudoku-17.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksudoku/
-	https://games.kde.org/game.php?game=ksudoku
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ksudoku/ksudoku-17.12.1.ebuild b/kde-apps/ksudoku/ksudoku-17.12.1.ebuild
new file mode 100644
index 000000000000..816d157b242d
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-17.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Logic-based symbol placement puzzle by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksudoku/
+	https://games.kde.org/game.php?game=ksudoku
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/glu
+	)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package opengl OpenGL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index d28136dc55e3..2cdeef3dbdcc 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-17.08.3.tar.xz 1782244 BLAKE2B 6872f82d321ca90e68724e64d15d712f25975339e5bacbaad1d2cf0a5c38a81561a58d3c39564b80a7f5fa7fca786168b5ca7488a12301d6f3f7f6467149b7d8 SHA512 9cbb1c9f10b219ffccd896aff4a2d50ad9828e5fb57d2371216270b2ec7778c6e24d9825d61d4c117685817d56e72712a9232b66f74661459f470d4fc00f09d7
-DIST ksystemlog-17.12.0.tar.xz 1782200 BLAKE2B bd8a784c4c147384f13ed79ed7185e4d32f3c9dc07f7f5816a02b1b7aa193f8718cff492efd4a8537aee65fd93ac1f8951e06d2bd55376d9ffa8f7b77c8fdc34 SHA512 0d797bdf55e9ccdda40411cb24a4e083e1c1cb663ce66244932f0b14d5866f3ab9bed3db41a144e23d47891fbccc9d27b45f4392d23c857f584ec2287a3297c3
+DIST ksystemlog-17.12.1.tar.xz 1782228 BLAKE2B 360869bf9be3feab9fabfd05a6b10b1ab28da3a3db75adf68e0c3cb340974efdbdc8e163264d3c930bc145109797fc5a7aac941e60f9d0ec2a3c6416dc47e388 SHA512 95ae8b8a86f2a3af784095b9231efa5b2591f2486736e4b20b5f414ff4344fc8736e6c4a3dd91a47cb7d927c2f3efeb233f8090f42e8e5fd613d85e53823cf51
 EBUILD ksystemlog-17.08.3.ebuild 1564 BLAKE2B 12812055568716b9c65890c9319eab882620dcd557cf78f5c3069d896ecc60a09a2980d00079b4656a71f7e9c8553a96b90f1ea23e6fde88205023c788369883 SHA512 95c693b13b4b263727c1b672e951d7f6ff3f7844e6d79df10bc951a10fbbd6890a2b30c45806c146354c95817f0fab95433a264d6c5949bbce16e25d8b4d56fe
-EBUILD ksystemlog-17.12.0.ebuild 1566 BLAKE2B 148700919b10c88a5876e9722534b8c05180c9d64f0a11619384c487886fb468a4d405f37f2d0f78e73f4381d5f4993687d84e35dddf8dc9390b3c9a86f10130 SHA512 62512a385aada672af9138c85c739a3d35e13be792b7253212ee0254c89136d464164d4cd7b832558215aa434a86a3e3f6d106361d478edb119f14177f30b97a
+EBUILD ksystemlog-17.12.1.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-17.12.0.ebuild b/kde-apps/ksystemlog/ksystemlog-17.12.0.ebuild
deleted file mode 100644
index 7caf52a9ff05..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-17.12.0.ebuild
+++ /dev/null
@@ -1,60 +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="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ksystemlog/ksystemlog-17.12.1.ebuild b/kde-apps/ksystemlog/ksystemlog-17.12.1.ebuild
new file mode 100644
index 000000000000..613a2eccdf4d
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-17.12.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 1d2d691d5ca0..cc1fc509e0c5 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-17.08.3.tar.xz 297176 BLAKE2B 8ebda9735717c5ebff1cd91621a1069b4111d442b240fb5c95697f722d3c7e5f1da36ccf25cad67a758797d6317a2ed45ea0544056254903d3e568acbc4df62e SHA512 68488c2d46a498c5b23b2ef8c4d8ca286c7d20923b5d61843a81d9fb534f5133166e0d9534706555d47f046ca16ba5169de0a48b81c66ed68b2018cf6b3868c0
-DIST kteatime-17.12.0.tar.xz 297240 BLAKE2B 9b2556f34f74664e5dc24dc24f7094a0a145a6d15d0422e5e3ff70189de9b1aa66256a084c41f414420d20b8a99bd6cbd7336b5945b04d11bc42550cf1d72de6 SHA512 5063957bc229825291885b946ac021e45093ab1f3ec66ad2acf2a45c293772516ab42cf685126dbba5b1cf4b1f742ca08a840c84de5e91f8f739c49ecc120d82
+DIST kteatime-17.12.1.tar.xz 297240 BLAKE2B 92408755018faf561cccb0ce389a576a831ce644ff407d4f0e5942cc286cfd6f37d96478fe21b0479084d62b2e199abece35af2ee3d2bf916a8babe4b611805f SHA512 c4976636fccb40d57907a271ee262b0805581cea7bdf572de2cb789890364b9cb54d3b906c71cc0d91024673b5fe19d1e68b4fa48939b583719a1d4034f3a74d
 EBUILD kteatime-17.08.3.ebuild 718 BLAKE2B 270421c648cfeeee7fec131a1636753cf257b66fede6566d3e4df71b5e5759425e50a65bd97e20034cb723cbcf2daba77fe8b7953f53513738a04f336bc71018 SHA512 ec666698ab5ce5cac10faa4f3e9b9afaaf65c9dc6e60ef2826579a5fb661b4bd911a5fff6044a937322cfe83ff613768449b4fcdb588291f61042c6d0db43c05
-EBUILD kteatime-17.12.0.ebuild 720 BLAKE2B 520b6b74ab65a4c8bdb27bafdd024011601ddfba6ed1ad952dd13f800cf21b518eeb2f71efe9107f06cf0f934106e5671a3e2dca422c8e810ea176dd5bed8f54 SHA512 f8373570c5eb28d02a6512938fb9628b9a54d6a505f534eba87d7f1c1ba1a690ded889a6e28a18576d13d85766a672618a95bc29d7e3387fcff7f3a5dd0f06f0
+EBUILD kteatime-17.12.1.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-17.12.0.ebuild b/kde-apps/kteatime/kteatime-17.12.0.ebuild
deleted file mode 100644
index d454ffd613ed..000000000000
--- a/kde-apps/kteatime/kteatime-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kteatime/kteatime-17.12.1.ebuild b/kde-apps/kteatime/kteatime-17.12.1.ebuild
new file mode 100644
index 000000000000..d6175c6546cc
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# 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 timer for making a fine cup of tea"
+HOMEPAGE="https://www.kde.org/applications/games/kteatime"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 158191f01170..89f4816f77a3 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-17.08.3.tar.xz 451612 BLAKE2B cd88b0c5b2dc4ea61c5d55e483b805636e3effe148fe397be489413490815704f0e34cc5cf262d049b4787b9452b1f2db2ead9061855678e11a3a20e62c12f8c SHA512 dd6c7357376d4dff6b095f2f415c1b6ac119c2600b85a22a7685876ab44dc19de940ace3d1b342ff3f18e16fa89c129fd1e5ed0e53c967005d57c617f41209dd
-DIST ktimer-17.12.0.tar.xz 452040 BLAKE2B d1dce78ce196fdbe0440b34bcb84e0717403e2c3ab457d248367fe5192c9b38bffe0c949f204462db1ecc376bb4fafbf0d491ef46d52dc3903c9672c8cd1d91d SHA512 f1d8996842ee301f578b1c86ce85ed867b459e4884eba2f466719521979086b165b0956b7e237ac5af93775c52a86bc0a01776621ebc3a20606ff5574f397a6a
+DIST ktimer-17.12.1.tar.xz 452084 BLAKE2B 70b124920c19bfaec0b49e9e178e864d0da6933cecee15a4da1b8d0a214c03086693949f10d0a6017f7c6c8b5459df24059b62fa54af8762279f4a7b275e5786 SHA512 d2ffcdbc5a5ffb96bce21a381fc522b111bf7c9d1934961e7ff87197813a6215eba8d1dcc1e7a1a0a80e81261f9540d3c0ad9825b18183e4cd476e119dc06905
 EBUILD ktimer-17.08.3.ebuild 660 BLAKE2B 2b74dccb001981192b0a207e95c90a44e4f64a08ab29e0553287fc34c27d217af4d7466c4bd5bb02721e73bfb7e5d65d60e38753ffcaa1a52835939c82d7c5c1 SHA512 f8f22b70118b757b413c496c26e785ede8fb3d3bc3bba609f8b4612c82e1ad4a7cc6089c90df26deb9e60028072292962e257724793f5c467431427d281aaafd
-EBUILD ktimer-17.12.0.ebuild 662 BLAKE2B ae40e6670abdc5ac69d9c0490c36e97e35c1dc6d337514560ac3cfea7d50ab72dbc599517ce08d8cb22b5b69ece163c11d5d0c43c837a1bcb64c32893d153df1 SHA512 338c88203d87b60b596c322759692a59a26138f31cc0ed7530d8720cbad6914e197b0d71af35d87213aa3c7d724e1f09f383416db7b1694586bae0918949349d
+EBUILD ktimer-17.12.1.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-17.12.0.ebuild b/kde-apps/ktimer/ktimer-17.12.0.ebuild
deleted file mode 100644
index d81e88766b07..000000000000
--- a/kde-apps/ktimer/ktimer-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Timer"
-HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
-https://utils.kde.org/projects/ktimer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/ktimer-17.12.1.ebuild b/kde-apps/ktimer/ktimer-17.12.1.ebuild
new file mode 100644
index 000000000000..f21e3aa1385a
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# 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 Timer"
+HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
+https://utils.kde.org/projects/ktimer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 0aaaac2c46dc..9eb72e6deb0a 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-17.08.3.tar.xz 5107488 BLAKE2B 7bbfa73bbe0ca684d03ab00394b1194bfabec58ab36045abc1b1122ba44f2c9f89d36bc18ea45ad5f810977fe1bff81ea014e90604f07d4fa7dd9c4878c2b22c SHA512 b6226262df1487a06836b0d71ad6363ab293ed78e2ab6ee6e4a58c162887cd9d6fbf475162156ac4e8af674e82a85382bc7cd3aeae4826664664e571c87bc26c
-DIST ktouch-17.12.0.tar.xz 5109988 BLAKE2B bcba579e315c641eed2be0994f79ed3ab941972fdef18af69bffe8c4b9aa91df706a61fd9890b31b5054cf9d814cf45f64bdbe31dbc74b5550b72156b4d89135 SHA512 3afb6f19b4cfbdb20a529ce0ed2f7411ccebf3a00b332b12458008503e3de5aa7fe388247f3139a48f0cd8fbc03902621eaa86c41ce427966fc3de9aa69f246f
+DIST ktouch-17.12.1.tar.xz 5107740 BLAKE2B d6a224988477c07a9b9e809158266feb4c9703506b7b3dd15eb9458b6ae5483fe9c24f9f13970ec020e3df07885cf6e70b97005249ddfa840a93fcda6c1627e8 SHA512 7153334bcd73fc721d8f2d1baecffa8681126e2d6dc0eb393b8e5424e8e4f88140f740770e1ee79531370c118047048c83dd02e56249664a3ff2804b49eb17b6
 EBUILD ktouch-17.08.3.ebuild 1111 BLAKE2B 9c6f84f76ff7f5002944f1a7d2f8d21b47679006330e301e935fe482a07b774fcaa3649032bb49a743bd30aa9a06bd8b5eca3051dff5bf2155d217fb4c27f4fa SHA512 9088d89dd8513c372e7afdee56ef1453db19ec889b261ed8bf8a54feede9242eca469d1fff0322258edd7c07360d29d160a28944f422d757d8eed43f5bd8fd0f
-EBUILD ktouch-17.12.0.ebuild 1113 BLAKE2B 21db5d42a31e45e5c9706d0f5c1bc0bf23d16b1f5fb394f162215213f5cb7ca512b1a600b4d99afef64e13ebbbd4777528f1fa73710468dd5ed88b8dfec8a8b2 SHA512 94072768ee252c3a728c8d2e34373bd1e2183eeb0b9a65e3cfce2354e926c42a75616f3a959408a66fc31a5ac072727fe36ac81fe97382834997fbc79745a150
+EBUILD ktouch-17.12.1.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-17.12.0.ebuild b/kde-apps/ktouch/ktouch-17.12.0.ebuild
deleted file mode 100644
index db2daa282779..000000000000
--- a/kde-apps/ktouch/ktouch-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kqtquickcharts)
-"
diff --git a/kde-apps/ktouch/ktouch-17.12.1.ebuild b/kde-apps/ktouch/ktouch-17.12.1.ebuild
new file mode 100644
index 000000000000..548ca5f0385e
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that helps to learn and practice touch typing"
+HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kwindowsystem)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kqtquickcharts)
+"
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 3e2335074059..dc07fdf6fe90 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-17.08.3.tar.xz 262952 BLAKE2B fe6230d7cb739c26194a2ef05493aed1bc4ed7c298b1fd143701fc564619e2b872162eb30d827e7e795ef20c15f1253b8a177e8efc6c5c144b53c12487c5cfa9 SHA512 a621cc83c7dd3827af55ab5abc486ce34af9281e194fea80489acb4b2c4060f1686433b974c56e333368b79284421acf556f28e0f4035d6fc1ca1612bc155454
-DIST ktp-accounts-kcm-17.12.0.tar.xz 262908 BLAKE2B 860a6ac4f6676b6fbee3fe0468740bd825004abc9401d8584446a528e17efd1f3f798f0a286814b84efb18e714543fba42daa03c3843a57a7c2fc12cbcf3d391 SHA512 680733b2a747405f87bb533066c80e75ccfbed9fe1fec3a1f619a3db4c7663f72c95499d8a784532078529ca6f8c6177f3521b01df922e0e959482faa3bf0297
+DIST ktp-accounts-kcm-17.12.1.tar.xz 262972 BLAKE2B 46c3061a927ef7155d9d1a03ca3b1aba6f208fae0f0d994cc1c17bd8d8bda05c10c02368debd44e584d5f59f9314f13ede49e9b1457c22029dde075203da2819 SHA512 c904d9b13be2ea38bea993bbb61837e91e534ac57262f817303a1374a92ca81d2e24e21700ba168cf747b7a4275e34bea84f94d7adf147410a4789b5bfd6a32f
 EBUILD ktp-accounts-kcm-17.08.3.ebuild 1515 BLAKE2B 0585f358eb2915960b27693800deed4b15c8df7087dd50d25bf6aa3ffd1d46aea8951dbf81561cc366aaa2e44233a81e7597b4b2352a6b9920456463f6e89ceb SHA512 0ca4909005f8882291898f43546b89d4fc81e587c538c3ed48dcdab3599bc82c3255c6b697f7d44e8cebf5d5f37d31831f0dc6338f38829917484aea02c6ceb0
-EBUILD ktp-accounts-kcm-17.12.0.ebuild 1517 BLAKE2B acd646debe60d54fbe621d3982e8e4f32be6a29a4153730500751c57e1e43ef8f878fc642a5981d9fa4403f35007974e9ffd83c1722db3dede1271d39070c5e4 SHA512 7de6955666f50c8fd344b347e16428d5b72797669b743a5a8cc7bbe1e8520508184c16710f0b23982da3740678cd5fd10e475ae21d72fb2af136a5ce187280d7
+EBUILD ktp-accounts-kcm-17.12.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-17.12.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.0.ebuild
deleted file mode 100644
index c3e1afbf75fd..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kio)
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kaccounts-providers)
-	net-im/telepathy-connection-managers
-"
-
-src_prepare() {
-	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
-	fi
-	kde5_src_prepare
-}
-
-pkg_postinst() {
-	if use experimental; then
-		ewarn "Experimental providers are enabled."
-		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
-		ewarn "Use at your own risk!"
-	fi
-}
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.1.ebuild
new file mode 100644
index 000000000000..0bd40b4ef69c
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy account management kcm"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kio)
+	net-libs/libaccounts-glib
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kaccounts-providers)
+	net-im/telepathy-connection-managers
+"
+
+src_prepare() {
+	if use experimental; then
+		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
+	fi
+	kde5_src_prepare
+}
+
+pkg_postinst() {
+	if use experimental; then
+		ewarn "Experimental providers are enabled."
+		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
+		ewarn "Use at your own risk!"
+	fi
+}
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index bb86c2fb3c1a..ed180a3cbc47 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-17.08.3.tar.xz 37152 BLAKE2B 32834432f5eafc4758c35c6534c5afa35c8cd3f4bc7fd2c2cbbd42e3ba8e05d49c9920b4bd50266e198c0c842b333011033989f3f1fa24d85bfa90d62cdaeb14 SHA512 58982429f04ecd630fa5a2dd8902b043d4c0f04ff1b8480be4a93a42718e2b826b342fe241137ce5b56752b708393a346e15e26e1a32a912787a3e2c66659e33
-DIST ktp-approver-17.12.0.tar.xz 37132 BLAKE2B 59b8a3a240f42672c7f02853941690fee29d5a13df734289f15f27dce48a26e1a86e9745c798872315d89c92524166791d31f12fee0becdb511a2a17c5ee3166 SHA512 96fefdfdbbf780275946f48651a42f13addbccebfbdde689ed60c6350d35f99be1fd417b56941f4439e9c6b455906be5d9e102a8e804145077646c8348f99ebb
+DIST ktp-approver-17.12.1.tar.xz 37116 BLAKE2B 74bcfca86e67f95178722e7a0322f0a0da18e50f869a900167e86103b3b65fa48f8679bcb0ad55f2cde237a44a898b2de25f6853e5c0d7bd9fd325d0c28e43ba SHA512 dcdbbdb2a00ac51729cccee70bc11391111c6e9e566082fa015ba5a19f55f729b6531097f2f9af700ad8d780b073dad16bd1c522b13bd73ca66340a3f1c1b870
 EBUILD ktp-approver-17.08.3.ebuild 676 BLAKE2B f62beb2ca72e940b8a2b82f18d58023dd11e0ef70d5bf880fd90c7e33048888e23f89a701c672f23bcd1e6343859fcd7cc46ff0c69124066147092f6fc971d21 SHA512 1cf9a61a44bbc57c8a641b6ba7a4222b9bf4a423fc6841be3b22591120825feb78f522f61317cedeecfd54f099908609a5c8c68bad3956a207e0068066fe0e0c
-EBUILD ktp-approver-17.12.0.ebuild 678 BLAKE2B f628322561d345d6ffdbac1e6ce5c2d2fe72954a3979ca59e42959bf9411ccecee1420379950e573e2cf33cf7045b9d156b51a229446fcfc925d188e0301e813 SHA512 eccaecdd8600ffe85c048ceac1fff969bf98c91d605d09e2815c04e965774c5b92804e5404037a479f66a4a676179786fa3a0f31058d67b9c466205bd2692747
+EBUILD ktp-approver-17.12.1.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-17.12.0.ebuild b/kde-apps/ktp-approver/ktp-approver-17.12.0.ebuild
deleted file mode 100644
index 68dec1bafc17..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
diff --git a/kde-apps/ktp-approver/ktp-approver-17.12.1.ebuild b/kde-apps/ktp-approver/ktp-approver-17.12.1.ebuild
new file mode 100644
index 000000000000..58706d972a41
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy notification handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index fd9093c535fd..8f6ddaebde57 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-17.08.3.tar.xz 46240 BLAKE2B 117674ce01f1ab58de0d3f5b1aad694de960d079049ce47067884009dd9501543c35709181cb704ce4e1f3404f44b980b5dc67c50e76b05aba3294a0b42374d2 SHA512 de7beea892f6199b6b4c48e93b4ce04449f72bd1073d4ed8b305f2c5f73e70ad23428b47533dc04d168a4ef88d03fcdd8150b37af94e8d562ecedcf4e8dec069
-DIST ktp-auth-handler-17.12.0.tar.xz 46256 BLAKE2B dcd484dee48f642d6519120a19212858bff30e1ece5bdc2c313f8cde8c22e1ceda14eb7b1d699dcf26b502f243840b38988619d4fed8a206c603bdd4d911e4c6 SHA512 634e85372f093b3a3404152b4d853ce7273c4bfe48c21659a4a139fa934c20a672321dc5d9bb472b7c43469c74dc4ebe2d24aed33003c5123066e993c99c7228
+DIST ktp-auth-handler-17.12.1.tar.xz 46268 BLAKE2B 1926e0daa45d83424c5a1ea02f00f93746322bc829bd57a5ba1a38642414e09d4ac413af174ff4502df537e0434c21ee0f72f785bdf898c328f09a064a3ab83f SHA512 0241bc6ccbd2cc6a01c459ca21a81c9f3c96b37183bc4cca199fbf1bdc11f3f0b1bf7736ae34afb762208b88f691f2a3733d9fc054835f5a631608cc19f64adb
 EBUILD ktp-auth-handler-17.08.3.ebuild 824 BLAKE2B e4b95b1b3a1d6977697649c5e3f99e435f78d491bbe83027ea832f69016a72e37c7fe7da410e23dd730357980ea1ba3f7f2b486068ace605eae5ca930aacc452 SHA512 2fc4b4d7e251e8f730ae8475d3066644740f79de0c18382540adcf4ebfdd15152d56502ab9ba706c9a5b13b592d54b94b746c77bf32e1ea8d44ae96b1a1d70dd
-EBUILD ktp-auth-handler-17.12.0.ebuild 826 BLAKE2B c33b07c7425a626d5cef0af140240156012900cecf54040c082b7223caff493b4e23334af6fa8eee49ee1ee6d3567b2fb2bbba7e17b4e29ab2daa31d3165bf2b SHA512 ad41e14004a871260265e5657d9a8b043353b4daefba20be233a5a6b52bc49b127717650fbca348b7e6e9b0ca800ecf90f355dd1dbe7bcf05a57f29a6d9d4aaf
+EBUILD ktp-auth-handler-17.12.1.ebuild 826 BLAKE2B b063084b0c2df4e79d1850228aa5dd09a26dce79dd68c9cf2dd26330e73dcf5951a4869a81af792ca066d66e3ac98380d97a7518a3fff15f966b08e0e6c301d8 SHA512 d257cac8a0ef4dbbbd1aedb0b5e8cfb87025286a745119ca7b0e04e7053b7979bb7cf3238ddd8439c111288c0891120ab23b5aea99a7fc910c1d6bae2a226590
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.0.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.0.ebuild
deleted file mode 100644
index c71cd5f23c29..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	app-crypt/qca:2[qt5]
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[ssl]
-"
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.1.ebuild
new file mode 100644
index 000000000000..e76ea82248da
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy authentication handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	app-crypt/qca:2[qt5]
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca:2[ssl]
+"
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index e21201a6520f..dc164c167624 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-17.08.3.tar.xz 96572 BLAKE2B 862c38ba997bd97dc82a6f430f22d2b871d5ed5db47931fb9f12ec9523e330121f81295f89dd1e68556593758ef5554c9650f080951ab9f2552b479825deab4d SHA512 45cf95c42959b21ead7048e72c16074a2e5ee8a012fe0d287a32741d896d4af03abcca640d875ba8a223a5cfc7f0ec1cf845cc1c87ae5acfd88fb55020a2810e
-DIST ktp-call-ui-17.12.0.tar.xz 96564 BLAKE2B 3bd5e20804832f8911c1615ea84a1b081f4c24f38f2c1db312f1557aa690eb4d22d7ff40fc11e96e7f47b60f9bf53ae28cca0adf89b4b1facb2a12aab31f2b02 SHA512 f8cb4467b536e8f6bc22d80082ab8353ea4dbe9282dc5027f0c8d3c3418acb5dfda1902b00561b009c454f47a804a5d189b38693703a4f04885670a400f71194
+DIST ktp-call-ui-17.12.1.tar.xz 96564 BLAKE2B 83680fee65a53f7ec9c8c23d3388072cac05a40b2ecc3a7b2c004897a72070e18cee3e8ef91de66b12ee71222af3888b980ca8dbe34168419161ed15be585bf3 SHA512 c1b544ca8439ec17dd2669892489ce70ec9cba0f2196b91827d45a0fd36e0a4df076efd7ab3d2f32afcf03ea84a09249bd35546a1f1fef55f41caf91ab3bb0e7
 EBUILD ktp-call-ui-17.08.3.ebuild 986 BLAKE2B f0f0a0bd2984d4bd0a863e6be36b141daa9c78c91d7f0bffa9d1301440a1976c16a575d7075b061a4043251c0b945cf7ceb6a86ef05d49b580afd5fd66cdf74f SHA512 97355b6dc1137197fab077db28531a680d2f073d2b254d82ad2671ff4cc1d9c139e5673e49d76cd9c98cffc7ec3908074a297a5433b7b758bfa81f793a553b69
-EBUILD ktp-call-ui-17.12.0.ebuild 988 BLAKE2B 104b7e3e36591cb5654902e7368ac8aaa62096d71b2b5d64249393efbab0592d109f8f4fe1827d838d423887623888f9e9eac5c3f50d8286e283848022e1a9c6 SHA512 47c76845d1a65634854ba5eea3f25cda6748037d397c7d30fe3cad3afba90385483b505141fa48d89f68f2fcf973c29d59e234a57caf6b0286f43a17f012c563
+EBUILD ktp-call-ui-17.12.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-17.12.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-17.12.0.ebuild
deleted file mode 100644
index c208b197c977..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-17.12.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 kde5
-
-DESCRIPTION="KDE Telepathy audio/video conferencing ui"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	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(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-17.12.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-17.12.1.ebuild
new file mode 100644
index 000000000000..c0ba9a38bb85
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-17.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy audio/video conferencing ui"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	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(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 54a0291de730..338e4f409579 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-17.08.3.tar.xz 441460 BLAKE2B ed3ad90bf587352a93827bb78c5ac76d8fdcf29cda0615a822a49d230d94aa60d56d65f860b61ba8d60dc577de0ba827ec8195193800178c477dadf13754a884 SHA512 69feaf0d95f3f664127a42071ef3867d4efa3f1adadfa5e30da4a907fe285866fcd765e6f747e0e3f19048c62148b640f73c4690eed5e04de4c3cffed2403ed3
-DIST ktp-common-internals-17.12.0.tar.xz 441560 BLAKE2B 68dcc19c04ea6e48d8055e5ce99ad5dbf4d6ace6526e5d69e53ff35e58b5f02ffdba9d98074f02c22cdd8e95b1308eccc53a125099ddea10d31d3611378d420b SHA512 663e6d6575d24a7e5b06f4f4397ac543219a65d8bec8b0c23b1a045a691aa97a4d64327cb1fc63e925f1941ad66814b39d08088f8a95b9d2e85497c11e3aac36
+DIST ktp-common-internals-17.12.1.tar.xz 441488 BLAKE2B 71e74d3ec7db893858ac3efe533f77edadbe823bc871be82fe1f88a061fd31439b9b2f66061ea315891313e5cb0c0a427014ce6d0ee3a9e3bc1dca299e980a75 SHA512 fd164d707256a0c07dfd584f1439bf0f0c80cd9a66d292dc9bcf7d072e5ba01b64b735c2c87b9251483e08f9e9f757fa704ede9d50bfd6ae3d74bc27bb290f4f
 EBUILD ktp-common-internals-17.08.3.ebuild 1575 BLAKE2B c107daf0efb0f06aa370a1eae8476690b9cd90f82fb6a7c38d2e2cf6aa11be7bc2f8cdc268dde0bc0c2dd3c01e80ee15af1370bb2290788860256a80a387257c SHA512 6596dcdf5cbf5f025875aa225b57e8b0d4582cafd5d30dad200ed92b9020bf0a8dabd81d043f116a4f192c369009e9f077f44180cb0e45ef3520821c813a7d84
-EBUILD ktp-common-internals-17.12.0.ebuild 1577 BLAKE2B 2411ebc94385f24838236b4049852497e2913170432c3841ca259074e806fdb9cc02b22fbaf98380cf9fdb6b1e847f2b1d5f057e888bd6be0230fc70367eb62f SHA512 c31bb89f0430d99a16d6e1196ecb7ae84ba6785d069e7110af3ac0a97d11955cfb716957b27ed614488deb02068b436bd9a743088580af887fb1f21df4b3155b
+EBUILD ktp-common-internals-17.12.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-17.12.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-17.12.0.ebuild
deleted file mode 100644
index 7f76b53c25a9..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-17.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=net-libs/telepathy-logger-qt-17.08.0:5
-	>=net-libs/telepathy-qt-0.9.5[qt5(+)]
-	otr? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/libotr-4.0.0
-	)
-	sso? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-17.12.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-17.12.1.ebuild
new file mode 100644
index 000000000000..6325d2580a18
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-17.12.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="otr +sso"
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=net-libs/telepathy-logger-qt-17.08.0:5
+	>=net-libs/telepathy-qt-0.9.5[qt5(+)]
+	otr? (
+		dev-libs/libgcrypt:0=
+		>=net-libs/libotr-4.0.0
+	)
+	sso? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+		net-libs/telepathy-accounts-signon
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtnetwork)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package sso KAccounts)
+		$(cmake-utils_use_find_package sso AccountsQt5)
+		$(cmake-utils_use_find_package otr Libgcrypt)
+		$(cmake-utils_use_find_package otr LibOTR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index f94cdb7571e9..7dab09378ff1 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-17.08.3.tar.xz 132120 BLAKE2B 9aa2022e0c03ec68bf57cb7a4bac528d31d879aef6881cfb8c962e4028ea4c1c4636b16ae3d5cdc8abd5022dc4fa1b60c8ea2ccd49137d5f45f83d6132f34ec1 SHA512 e3c4ebb45125731cb6e00387803bb060113ae39243685444c3bf9eaf87c15827e3b90c2e7c0e4e9d5ff3af26a59bed4c0321369a39a5897d711678e2f251a0ea
-DIST ktp-contact-list-17.12.0.tar.xz 132140 BLAKE2B 503c4e10acf1198c53394c75973032cc1dbe23abca5d0216c96b587a09da1235c4caafc7ad7a8c4966939a3ea2f28e2d5efc6495d79cfb44c3ee4dc600e6b9c0 SHA512 8df8f48f4009e6142158805c64c8708f8512dcf2a50fbee2ba7d46040c72c17b6e5532c15f77ccbcf51ab7d820e83a3954ca7139c9cfef75f05a8b3d5e3809c0
+DIST ktp-contact-list-17.12.1.tar.xz 132044 BLAKE2B 3cd356b44c38c226e1a53f93b9c86bc932bdc1f2824cf6e8198a6e81b1956dc06740e485d7eb1c8353cda6c6d0e2712cc2dc51008a726c7849a62f5b32ea889e SHA512 f13d89e3fa113dab4581838332a639b4e15e299f7cec01331e65e6cbd9e4fdc032eab59eb689d6ff3897d3b05d2129c134cf1d4e5dabcaaa85f95edb07d7df8b
 EBUILD ktp-contact-list-17.08.3.ebuild 1032 BLAKE2B 408fb1261f26d1a71c5638e3e20886f095314cc212c84a503c5f147bdc4f8ca172bfb8f58132c2ef5d8ddcd0c1591d7a30515f2819f8a22bcb3cfd8ca26654af SHA512 ab9012656027d1449fc8fb06c514a64eac018c692405a5e5f96e934ffa1eda197a80e0352bd8ce9154ed242da043ffc37b075cdf06ea346436f7d8b81f6d9d62
-EBUILD ktp-contact-list-17.12.0.ebuild 1034 BLAKE2B 378491aac9bee0df4690ed925eef7f0ab3293e5c3bf627f8e4e76977b641d9b359965cc111f3353aac473e72679541d5aea8e7b12bc1d848fc0b1c95b1ed6f72 SHA512 00f490e4b82dadff92b9ca45f8388d98eb1b29cf1427a72b2025aa327e1532fc321e75cb17847140628fc3b6690fca93978cd82348f9c9fceec06a7eba2fdb41
+EBUILD ktp-contact-list-17.12.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-17.12.0.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-17.12.0.ebuild
deleted file mode 100644
index 759dc3463751..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-17.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_qt_dep qtxml)
-"
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-17.12.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-17.12.1.ebuild
new file mode 100644
index 000000000000..93ce9c752242
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-17.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact list"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_qt_dep qtxml)
+"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 12fe55f3c7cb..62d323173866 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-17.08.3.tar.xz 40088 BLAKE2B 5f547b1108c7d323ad39e879a72dad6146e7dd1a6839de6b154962685f897bf844bce8760b3c0f351cd1eb07c3d5e1d9d9c857f9a6206a5636ef935d2d52e513 SHA512 e4965b95168753a8143e7221129df0e27f746c9b1933ab65b0c10428949ffb7caa82094d9fc01b93484b9028cd9d8719f50bdc253d36c0d79cd4a7581870a9e0
-DIST ktp-contact-runner-17.12.0.tar.xz 40072 BLAKE2B 7012f045844d682fee98dfdcb072d50bef77090e55adba38ac5024d404f731cb3056da2a6becafcdf83b394394b2dfb93131b243f28ce9814f155e01537e4aa7 SHA512 9143ee8d2ac188d0e3de911f3ed324c5ec8ed16ab244547a2789054b82f038aed7240c062f7fc9eb26e688becfac3e4ffc9a78f6bb194d87b4dd4ed4912dfddc
+DIST ktp-contact-runner-17.12.1.tar.xz 40096 BLAKE2B 0a1d5c453625fad40807ef5ab1e0ab7b7e3d084b2a16a5f1d31d8f1eb715d75c7308588cc046b8cfab58421f266fd0a25317eb122607cbb37fbabd8959b84ee5 SHA512 edf7f50921c09082564c2a8cb11e3f7a6bb85381cd0a5f7f06952446e92cba6a99ce7334ca225534c892d70b868274ca31c874afa1759e5f0e29d6c2ece4f6ef
 EBUILD ktp-contact-runner-17.08.3.ebuild 602 BLAKE2B b283005800f11289c60687ce73e529996f75c11c15e229f0ad3c7f1b285f600f1fa69f923f06246f2fd27a172da37f82434ed32abecd6250fb633d9ff142364b SHA512 dba1c8cc89ec69cf21f746d16e0bc88846b0537681255b3cdbac74fca0e3532c8d522a2d98a090c0852876a04020d74d54f16538e003513cfe30f23286df6169
-EBUILD ktp-contact-runner-17.12.0.ebuild 604 BLAKE2B efdb105eabc936530969d676a76d4b461dc0768a738d9e0497bde15bc27c319cdacad81e1d81824b8fadaf738bb5bc6be7ca25460035a111a6de074a367510e6 SHA512 90ff9d6de58c07d453e5e0e273634f5658488705a91fa168e865c782d1f33f043f95cdf38bee4fb2bae3e2e97602f7cf6ab11df3816da5f7bc15a1de4fc90ff3
+EBUILD ktp-contact-runner-17.12.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-17.12.0.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.0.ebuild
deleted file mode 100644
index 29f694f42015..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy krunner plugin"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.1.ebuild
new file mode 100644
index 000000000000..9aba85ad01ae
--- /dev/null
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy krunner plugin"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kservice)
+"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index b65f2b0f21a1..0ec4b213a016 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-17.08.3.tar.xz 43184 BLAKE2B 9d88c4b3ff03f4415e6c49fab58ffdaf35ecdd36a020ebe781e854a7b1b868605d3fe7156e2778fc5c45a2b9705c4353c8609490cc6f51843bf72fc6a0b95fae SHA512 743c6406a8d9d9ca0739e0a8072a6d9e6541e1702b09c53ae05b18feb8209c4b18ab4a9577537b60c0276e49d959cfda2f071ece099b087e38d9a011cc0d52e9
-DIST ktp-desktop-applets-17.12.0.tar.xz 43196 BLAKE2B ab669036fd3afd73646a1ab47b76dff3eec1583c417aebde8350c54ff93cd1c98c3a5743536571194c2ee8d28a8c321823d54f9ec70908a4bbea47a03806732c SHA512 9658ffd283f64d2ef78be923d0e1e16bfd3db05c4e511559ebaf96d21501dd5ca6e32e2992b2a75adb4584fbfe98dc40d875231a8c8887c3448675cc10372a0e
+DIST ktp-desktop-applets-17.12.1.tar.xz 43232 BLAKE2B e72b3adea31337d336d0f8ca8c6862b85d4ccc88f9157add544a09db6aa6eaad7b610f78bbfdd8f54a2c195e38d07d4b53f40c4fc9f8611bf9c40bf0179ad645 SHA512 b5c2f9fb89def06e9f053b2a306c1fd542ed7e45426656e551cdef1b49007598fb072a242f82c334890c0534d684a2e5295ac5b45a94a4696119bd58d5b9aa9f
 EBUILD ktp-desktop-applets-17.08.3.ebuild 572 BLAKE2B 21e44c9af383ae76874d8112d3153f35a30134fbcc2c4262618ce0348b2c1cdee493c27bbc8ad2fe2dc9dddc0f59ab1b82202ea30d1f35bef88cb9fa12f33a19 SHA512 e54abd9f765a25d718b5de5c49e3e518541af00e4b1f69ee022908bed98f28a5c857ae0fab7dbb719aa03fca6f211aff08239b01f048a6896fb64d2b879e5194
-EBUILD ktp-desktop-applets-17.12.0.ebuild 574 BLAKE2B cc0eb60494766e9c93870a9a4ca79cf73485d3cea7b0d55abae84e0b9e1bdf5c461361b32e7697bbacf225af9d7b2fd4bfdc99280c1be87072dd5ac273fa126b SHA512 4fbc2c80b4664c4fb9cc6f51f2fb73d73466555e5493866875a3af8558801bff02b5a7276a0c9d9d25e00fed4748ec66dcf52776b2a8e5faa8dae99e9d499fe4
+EBUILD ktp-desktop-applets-17.12.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-17.12.0.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.0.ebuild
deleted file mode 100644
index 271858120201..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ki18n)
-"
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.1.ebuild
new file mode 100644
index 000000000000..71c40a130e42
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ki18n)
+"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 34b350b4d801..2d1af3505ea0 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-17.08.3.tar.xz 46052 BLAKE2B dccc6f47a7a29499ff748d6abaf58e51eae8ab71ccb19013a0a38d5fbc48ac693124f9c77c6c073e99c40b2b753767a26c611960873fa1bc72f6eeb7ba6a4d75 SHA512 c67246b00ae0b76773e8b3b0e1a3d79b5b06dabe37941da2262c30bca256270dcca710b866975f20d950719bc319de594ab50de21abd29d3b966e629b50d8a56
-DIST ktp-filetransfer-handler-17.12.0.tar.xz 46028 BLAKE2B be7ab35da5239be1d4525c491cce0ebcaff0e7b7001751c51b912f0a7b15dd8ff5594dbce4455a4e3093d3a9bb5c942ce3bdb76e3d2924362492da41288499b9 SHA512 651fee5b6a577baebe4134c0a251641a11e41cf0a5b34c63e72a2e28c6c4e1e12fb55f5db6d9b294ab6e1d89db058ea8691af96263174a1dad7e3c055e265375
+DIST ktp-filetransfer-handler-17.12.1.tar.xz 46092 BLAKE2B 563dc057e0ea6da5f9e45db6879bbbba3ad7825c4f1f6de61bdd2220bad0b459b9e91db0e458caaa1c81d2494e38514ebbdf3447ea6f007b262bb2f400ba9ae5 SHA512 ec3e95ba78913ca60a9c29836e5e7828da016403b42612cf7bc2b2675c8c9807281ac93b4ff5fac730cddd03abaf37bd8a6668bd3539255834d892fe16fc9ba5
 EBUILD ktp-filetransfer-handler-17.08.3.ebuild 618 BLAKE2B c7808bb54f0876f2e549d5c7e05ea01c190e7e7b96bf7a3a47973a8fa62168f459a58f483d82f3f93a0bbf4d9927ef03de9825444ae0c0026cb3cc84ec483415 SHA512 793290972d3b45d8787c86a9b6875471a10dbbad1105e97d94a1bc825587e5a5b6a18037a0a6ee50f24c9737da69d2d9929bd0c6cfbb9d57c7324bc148fff0b1
-EBUILD ktp-filetransfer-handler-17.12.0.ebuild 620 BLAKE2B 840020de6109f67e8292c15067868d2e4ab7a510cdea2244a41227c33c43fc11016ed68dc288c1157d7e86912c82e2d8872d4f734ff99ae5509af161da81eea9 SHA512 624587a914b79343d9c0099644d1e2a3deb05a1a3ecdbf52253ba78fce1f92cf8ca3f3ef7796f5f6d1b5fdcc49e31aeb5f63c6320c9dabc15cbc13ee14440731
+EBUILD ktp-filetransfer-handler-17.12.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-17.12.0.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.0.ebuild
deleted file mode 100644
index aa05c2d8a6b7..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.1.ebuild
new file mode 100644
index 000000000000..a8e607bd7257
--- /dev/null
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy file transfer handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 2525d00db0fa..9d0d234b8c4b 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-17.08.3.tar.xz 81400 BLAKE2B 74fbbcf1426612f59a32843fe48511674c7a251e9ea14c3429f5cfb3d1d7026276a695f9f5c45d5636505fe7f5a8474fbe96669a9443456e110c8f1aac73ba6c SHA512 2631acca0d94b35fe6fdb44e8e7e0c54863c0edae288bb5194fcb85a323b55103ae2a4f13732a3818041fe7168e625b87def71484693dba7f82524feac56efb4
-DIST ktp-kded-module-17.12.0.tar.xz 81444 BLAKE2B ada30f678523df6e164b96e42d3cee2311a607634b7b4fdd2606113da35ea684677673705d26f226b920fd26c79571393499e76be34fe68876ed9933ac178e37 SHA512 b94b14a32ac7ac2343309a786563d89f6975fbd2a1e7049e58410eee7b6c2b78c457d4722ddc8e0ede61242f3e3b43bd5ae8739c933832ff5dd73815fa9844d9
+DIST ktp-kded-module-17.12.1.tar.xz 81404 BLAKE2B 1a9772f1bf4ce5f2e2b3dc6d0af7266941b65a3dcd89d64c0be2512cb1521386e97564ed9672cdaa30bab0a2f5bc215f6a8fbcea0cb8be74489e9db225987ab7 SHA512 6a376acad784c59194f59be76827e69fed73710388f935fe41e6f341559b04a4fe2f502e7d161aafb39eec8d2a2725d50afc57dcbe175f212954cc96883cbf06
 EBUILD ktp-kded-module-17.08.3.ebuild 977 BLAKE2B 81c29fa83f3bc19a7e482b229f9550bc6d3019fe750af0024c277fe15915aa95b3d82af842366af4e0107a3f8d30bf912759256334b77f8425edff32a7050e3b SHA512 91ba3e4eb9e9380fbe50f2cb204a3e4f278e3eec80353b2f4cb1d030547471dc867cae372e9fc9532bd15ce92372b3d97a1ad34346b813fd25f340509055d0e4
-EBUILD ktp-kded-module-17.12.0.ebuild 979 BLAKE2B 6db413975acaadb5a86cb5193b485269cfa9dda9604e37bfb159cda21bf0cc939633e6e572c2fc1455065c75e70c91be330690fe3e8e1bd679ee69c5e50c9230 SHA512 eb2483a962d5318a83e10ee5482bd65450fbe06fe7e43904570bc42b398e4f519fc9d5f235ad1ef4331948f208e41ca471986bdb50952f9558ad55f7158d138d
+EBUILD ktp-kded-module-17.12.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-17.12.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-17.12.0.ebuild
deleted file mode 100644
index 655449fb5466..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-17.12.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 kde5
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kwidgetsaddons)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep signon-kwallet-extension)
-"
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-17.12.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-17.12.1.ebuild
new file mode 100644
index 000000000000..6d59197ba41d
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-17.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kwidgetsaddons)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep signon-kwallet-extension)
+"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index e69c4cfd7430..b68e190f2aef 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-17.08.3.tar.xz 28808 BLAKE2B 3ba9dbdbd7d0fbd874818cffcdb8d9e2d5215501eecf081256c49d3a565c7317a1ed835cf23f839bfa1ef6d7adeeda3e833aa1403b359bd3e614a77746f1ca38 SHA512 bba79b9ce1e16635d4d21de5ec25223ccb63908e1a0cc1d25e9bc6808f553b4ad850ed3460481e8cc418b9a8290f056a751c8e2fc14f668dc4e3f20695d6ddfe
-DIST ktp-send-file-17.12.0.tar.xz 28800 BLAKE2B fb741165301cfdd4c93d55b091fcb400ef4ce47f9862cf0b3b3b76c91743c81a50aaf12bee5f99a1a8b4c2e748e08a34a711615235471413ee1cc411c3460c48 SHA512 bedb285b812b3e0905460eb0901e52acf9343da4a7f209438aef164c1946037604f3021a99c4042b0d5a4fd958c6f9b316103b3eea8c123af571a67992ce5d22
+DIST ktp-send-file-17.12.1.tar.xz 28796 BLAKE2B 2851012cc6e98f126dc5b2dd137544653ae44983227199b591550ee293f63768da4d41b8df01813a08734585eeb4ca5390b8a635a21b4c6353e2f2f3e8a91251 SHA512 f86edf512e338a28272e40fbb270fedf1d7ab17fa1a90fce927ee9873ab46b8ad4aeaf8557c0b9a762d8bdb060fa4d3ff8c6cc6326552fb1b2bba8d364b972f3
 EBUILD ktp-send-file-17.08.3.ebuild 825 BLAKE2B 9d71d1a6a98d2f64b80ead70ae97170b7cec1a9d9806acba174687dd22886e990b31aa9d5c3b2d475c52234b51956935ea122decd20800212977e4509dd07fa5 SHA512 81f031dbfb042cf4a5d9248c893a18945f82ab8ad62bf0593779c46a5fa28b00b2cffedf3c94a948ec5855d8473fa95fac3b60eb23fb132fc912e760249013aa
-EBUILD ktp-send-file-17.12.0.ebuild 827 BLAKE2B abe34f3139e7eaac80a5452f2d59140df3735fc4ebc86977bb032fc019531bad08929b86f80ce7917d13d7fa6118028957564ff4bf133112f64b69218236836a SHA512 81af4da53e1481fc4d3df070a172defb2ea91aa37ed48db6de8361e158cbb327a068a80d5cd65ccbae1e6c72508ca638db03cbc7e0c85ae53fad6d0aa0422549
+EBUILD ktp-send-file-17.12.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-17.12.0.ebuild b/kde-apps/ktp-send-file/ktp-send-file-17.12.0.ebuild
deleted file mode 100644
index 55a56794e92d..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-	$(add_kdeapps_dep ktp-filetransfer-handler)
-"
diff --git a/kde-apps/ktp-send-file/ktp-send-file-17.12.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-17.12.1.ebuild
new file mode 100644
index 000000000000..d297bb178cd7
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+	$(add_kdeapps_dep ktp-filetransfer-handler)
+"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 2a1c47043f14..5cf206b6db53 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-17.08.3.tar.xz 468704 BLAKE2B 651d51416f246d216c0d3e8f835ff672cd21703d2be25c54e91e2d06e98e1b05759969e94b77379d74cb7bc332009894613566980152593b1050279719c365b9 SHA512 4d5f870c2078ab3adf5aab2471ecc945535bb52754b610ce2b3edce1320f09c26554719d4566e4ce9daa36c038846359aeb07e98690ffeb87e0534c2d4c5f23d
-DIST ktp-text-ui-17.12.0.tar.xz 468840 BLAKE2B 60c1e6f0712bdef007ca48e43a8129122d9e33015e4ce69403d7f58051cd579582df51dd2b7bd3f1eef75dc22a06955ecb54eacba6a99c4ad52ae872fe6d6ce1 SHA512 30b89bf5ec10c1a99f3302cbe92081bed1b304e39b672ce91b60a71aa0746597ca2c61c0810e7ba78e5a8f9973c09de16a62ad1511b7b18654960ff2ee05845d
+DIST ktp-text-ui-17.12.1.tar.xz 468764 BLAKE2B 34b6aafe1cd34c4d18bd983a316daa23c2746ffa7608ab548d4239767ae3ae1b2efdaf90a560607c3d15d3a54c55d02013369c53978bdadd57505bd58112ec5f SHA512 a1d5a8c6d20d61cc74fc034c0a1ceda57f8d96b949f1568f61afbf9606b0a90183eee15de4249d7997f50e252b12e75125a19d9f1809097f6aa38de406a4f607
 EBUILD ktp-text-ui-17.08.3.ebuild 1487 BLAKE2B c5d88e568bc204f1b89386c805272b8355c6af9d9a5d2ea801c48b04048fdb34b58598a85223802126b2735d8539712d72b24d8958a80991c81c0d7768ad6882 SHA512 3a2d14ae27a280e1f2e9b3a5047f6c641bde31621e6d299b2a3365705d140c5fff5621a0ec7c56f4cea0b9d0ad2da2502b78e7b78e723296424aff3f1eb6fd39
-EBUILD ktp-text-ui-17.12.0.ebuild 1489 BLAKE2B b11363cb383049ce658985e5c2e0d96894a866f8385c51771019908617d40e208d4c8364fc483cb323efd36844a1d2104a39e2e459b54d2b200ded9649ff19a9 SHA512 acb592f987b84c6f8dddae45da6c07f23274ccdfa56656aecf30b56fa503eb7b320ea02d6a538ff3ae0dbcf99a03a9fffeee7da64de56b483861c1097afce3e6
+EBUILD ktp-text-ui-17.12.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-17.12.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-17.12.0.ebuild
deleted file mode 100644
index 1c1ba9ca4796..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-17.12.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep ktp-common-internals otr)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	net-libs/telepathy-qt[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-17.12.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-17.12.1.ebuild
new file mode 100644
index 000000000000..d8d737632890
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-17.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy text chat window"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep ktp-common-internals otr)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	net-libs/telepathy-qt[qt5(+)]
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 5c69a7aa8127..383009c4f002 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-17.08.3.tar.xz 32764588 BLAKE2B ee7ece540a46015209ecf3fac3f5a22596aa0e760c15661c489807a01e0cf43c7ffe6edebe39b502abea2cbc23388fd4033a7426ae2cda15dd8e336b2fb4dcbd SHA512 93faa93f9e03adab4b34287aa16b7403e2ef89a09ecacdb9bcd4170ea26074e3527c6e41ea0380b21479a764cc52185a008732a3cd29859f907bcdcc1dffc2fc
-DIST ktuberling-17.12.0.tar.xz 32800460 BLAKE2B 82c579f0f895fa633b5e518cb2875b77917fbd6918383d16103bc6bc6a84f4eea0e8fcca80a6ac78482cd0c4c1fc32c5607d9f5b80f7efeb368aad11a378c70f SHA512 a0e36d57f12f1868359fe950d6ceabb283e20a919c93c10934fe03334554b7517a3342616d47a486404ab5e888736ff3a4d5500e975067dd2cb939c4b05ee42f
+DIST ktuberling-17.12.1.tar.xz 32800868 BLAKE2B 7c4224bf0bcee78ae5908e930a0b8c1b03547c50c75dc32855011a626841c4b4295b2cdad70e05ff680ff3da0f5c3c0ce502bb6f8e70a9843f0aaef84cf0c1a3 SHA512 52557a4a5b11eece8d7bb3655334a54729b69f10708aca6d9036b27760b43a9869020efc537305f19ba216afee9db689ab72edc9949deda6dba15e1eec98024f
 EBUILD ktuberling-17.08.3.ebuild 920 BLAKE2B 419347e46978a49e746e156bb4db90407b3dc836bd4f1879c89638d75ffae5aef28e5f886d0cedf372a6ee2e8d8b477a943a0cd3093e9bf388f14b6badabec50 SHA512 591be854a16020d00f976860d65e07748f18bead7f69cb55d852598a838d8b214bfda1f1d98bfb2045d181f272ef58aad52516f558216c6f679081326aee0d1b
-EBUILD ktuberling-17.12.0.ebuild 949 BLAKE2B 72dc7a87b9d289af71cb7b9f2ac023197315c3a4989eb244ae15a170a7963851130dfc02713bdcb421acf5b07305d39e5b7a6ad6ed3db1060bb5fb1a16e94171 SHA512 2eebe5ab7e164ea182c57d7d575bbafe5918e1d5da64aaeb2cd439537f9be366418f600258e694abecaa0f5dfce9983c5c075a3eacacf286572edb0a1fbb98ed
+EBUILD ktuberling-17.12.1.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-17.12.0.ebuild b/kde-apps/ktuberling/ktuberling-17.12.0.ebuild
deleted file mode 100644
index e6ab646b07ca..000000000000
--- a/kde-apps/ktuberling/ktuberling-17.12.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
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ktuberling/
-	https://games.kde.org/game.php?game=ktuberling
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktuberling/ktuberling-17.12.1.ebuild b/kde-apps/ktuberling/ktuberling-17.12.1.ebuild
new file mode 100644
index 000000000000..6f603a18c561
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-17.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Potato game for kids by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ktuberling/
+	https://games.kde.org/game.php?game=ktuberling
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index f661fca3596f..20c7eb1e1bd5 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-17.08.3.tar.xz 1608652 BLAKE2B 3ab59b2af19bfc55679eb9713cd62a02944e0cec6da8e6382aea56f642e438f1d3db1b9d35bf28cd3f27187fbb78db0b317d4bc146f233422eb637c96651a1ba SHA512 b0b67efe41aebe5d30e7b5a85215190b3d5bcb550f7045d11bdb2032ba27039d14cbecbf8e8d9e09011dfb23557fffe79130ea3b29e1f3c5db08e295b66db6ea
-DIST kturtle-17.12.0.tar.xz 1608728 BLAKE2B 91ace1d93439723f542e585863292f5010d8d0108a78a64fddd74df30af1abd40adf4f7e6bb7de5c2bf306ac7a8ec105438058fb76c0690fd7c1b56874b85fbc SHA512 d04fe2c0bcf165dccc23b4371687708a985ae617fea10ed79e656d8a0e56ca37778536bb684b6f58ea90812cb1b48e12f2f390ddbbdb39fb42d9989fdbdca48f
+DIST kturtle-17.12.1.tar.xz 1608860 BLAKE2B 4d208d487e9ae932fa93b307787cdeb8c2946a24ad61914ede2710aab45c15dfa7087544141abef86493d1e1abc1b9b3413753d167af97a45ccdf348045298ac SHA512 a8b725ebf15eb0eceb85fe243c275bfc915bcca791c8afa769d132bf0f8e0308760c009d6bc425f6ba5953565d8643fa641f640690a728cf6414c38645b4d713
 EBUILD kturtle-17.08.3.ebuild 843 BLAKE2B 270db9fc65595a7ca2747980b757f15a46891297a483874ad8c8658c3cf889191c5ee194429d838d3b8cae1d80347eb66dcbf9e8d1fc16c43e6729bf2f8e3004 SHA512 c6cacf5d2bf2489d5fc382464679905de5cf74a5c429585316de3ee11110b762afc4d9905e893969f45b8771804be0e6c544625fb87e353b83eb4a5917f21ce1
-EBUILD kturtle-17.12.0.ebuild 845 BLAKE2B 3f0dbe9199dbbbc0164ecd876c5acd2f1d220b1cb9876acdc525a1d543bff229b8491670c95638bf7b2265521959146a18c6201e71e2e7c0833317fd1afb2cf5 SHA512 aae6b0c8bf77061f1be2072e5d8e2a8fac68062cec9d416df93804360fbf096de325b5e2bbf536b7476fa0d12d776f723b2e5aedc5c4fbd7a64ed96786f990bd
+EBUILD kturtle-17.12.1.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-17.12.0.ebuild b/kde-apps/kturtle/kturtle-17.12.0.ebuild
deleted file mode 100644
index 8ad2afa6a2e4..000000000000
--- a/kde-apps/kturtle/kturtle-17.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-17.12.1.ebuild b/kde-apps/kturtle/kturtle-17.12.1.ebuild
new file mode 100644
index 000000000000..f1c34975ae1b
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-17.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index a7e9a219595c..178b2e6de0e7 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-17.08.3.tar.xz 306544 BLAKE2B bd59fdc9cc1f78566f7f741855634b18fcfa4d0ec755352063777ae5ecd49d6f256a7a65fdd4741c9b1a3d8e58e0a120573ec80cf13e787bd3f9a0ffd38c4f9d SHA512 14120974e31aa23d83069f2be025e40835017bc884487ad04db683f80a7159c06ff713f94cc04f4d36bb22ffa968dbe28e078ada2458dd2192a682eeb4a14c23
-DIST kubrick-17.12.0.tar.xz 306732 BLAKE2B 01d5b729f871ea2eae6ac9b22d6811ba3bc0283a26429beddca7d743cd361b92d2cf777c1d5946a2c1fa7b89aa2aea3c1c0da48e4231d7e7864bde1236fae808 SHA512 18dd26f91fad466e0e0cfbc3f3097db2e80f7dfb70b6dedc1b079e202374b21620a061fe8a504444e25053171c831a750d335b806549a2cffa151742f5417dba
+DIST kubrick-17.12.1.tar.xz 306860 BLAKE2B eff73b1614c7bc48f34499ba1176b2296d0dd5c46e881e5a8096720ac2768c8a0c51a5c1d5b356f139961a440206b75a2cba7d5c4c03b6ea7d84f6771757fc45 SHA512 e9f0b7a6b281b8c36c0d57a100dfebab775bd3d5365351d69590085022d8611125932072a6193e522c60825c0e38c1c5e9c2e96a823ee6c804bc5d195049e838
 EBUILD kubrick-17.08.3.ebuild 749 BLAKE2B 562d644386ed9b7676aeeceff31ae29e9cacfc83eb9c460a19dec6f75ee86df90cdb549c6ed6f51771381c568f9b7c80bb44d1f5c804bf58b8afc100f6866a8f SHA512 bcf6eb9805cdcf2e14b4974b24af146124912d1b075a70535de0db4d474f2ad32ffc800cf5a9fc8396f78fb1298376adf5b9538b7ea20a3f88e87ac9771eb31f
-EBUILD kubrick-17.12.0.ebuild 751 BLAKE2B db9473e0685f3dc75dc322a8a48a95315267bd27a70364aa9e9ac8d37a0b61b287e1eea04fa72550ec7ac31a0b143ef72224b2a21f7609038b35692e2d8f8cfa SHA512 71e3d554a8576d13095d4bce63df7a01f8ffbbf1ab88165f01754d8a11ba5bd6c7bf3e565ab0af350e42d81e4186ff413bd896840def363a3d5460590614041f
+EBUILD kubrick-17.12.1.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-17.12.0.ebuild b/kde-apps/kubrick/kubrick-17.12.0.ebuild
deleted file mode 100644
index a470183df213..000000000000
--- a/kde-apps/kubrick/kubrick-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kubrick/kubrick-17.12.1.ebuild b/kde-apps/kubrick/kubrick-17.12.1.ebuild
new file mode 100644
index 000000000000..49fdf450e365
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	virtual/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 004844db2300..3580f50925ba 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-17.08.3.tar.xz 750136 BLAKE2B 7b4f17d4a461c20864b46f8adb10598b8a60b50ad39d458e570eada768f4ef3d821b15505f3fbdb84e4f699369f66a271229f1132d56a11433482d5c216adcc1 SHA512 60ccefe7441ee9f77b2f8a070320994e194b605f381b1981443510542c5fd55eb8c0e23c31ad5cc0e0994495a209389c844c949a4c6ebc6a91ea81011451742b
-DIST kwalletmanager-17.12.0.tar.xz 778720 BLAKE2B d5ad3d43667282e058101663099ab28b2804101a7f8a132058e0dd44bed933767c018723e823e02752b1b614e4087cb3a2a24840d611a4a3954682adf28cc6f3 SHA512 21ab2dd609e7d8d2917ccd95609777d52d717ab00c07a54070874656d0783e92ef1e0cb25afb22fe81665c3aee2523b2a86a8b2d72fc85148be65ad26b2e6cf0
+DIST kwalletmanager-17.12.1.tar.xz 778584 BLAKE2B ec8a391ca647b51f45935ba457f1097fe11d15d0ebfd0cc3dc44a603fdc5a7b897e74442bba28f9bafdbbd97d70b4f2e64c8203d180324ea494c198c6a7be3f9 SHA512 53ff49ef51e36976fa00a8661fb0259a03f33209edd22dce51ac30f5738b48fcb98d74c8501da3cd1b254f540465ce3966cc3171cf3e6ab3f66808ffa8e1423e
 EBUILD kwalletmanager-17.08.3.ebuild 1246 BLAKE2B 243a7f7acbf11884add1a0d5b6fc8341b6237713d3e34bc101e2cea4b9dc3cd6e96267e151ff7d4ce04655538d32a16e4f009007fb35f7885f674a382955eea8 SHA512 1eede68dab699195b5ee53e05a2c688f8c2571421affed8c6b57b0efd72984121b469f7810386aadf3676f2e752f4b9fac3f245d6c64e0aa374daeb06c126074
-EBUILD kwalletmanager-17.12.0.ebuild 1248 BLAKE2B 954ff8db36b39105fefc6c3ba903b6d7858c8d45383bd4993b95a39c27f170f2c9f134a8e47450865c71bd9a205d0e9f80e4f4e650665a1cf19d2fcfc9555a4d SHA512 cb334f176f165bb712ebbdd420e614c07ec476d19aa47b037bc1abd5f75c84b5b09937f698b31e8d832fd6c9dddaf483cb7358136ab12dba91b7b1427701bc01
+EBUILD kwalletmanager-17.12.1.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-17.12.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-17.12.0.ebuild
deleted file mode 100644
index b305cf0a0c0b..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-17.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Wallet management tool"
-HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
-https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kwalletmanager-15.04.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/kwalletmanager/kwalletmanager-17.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-17.12.1.ebuild
new file mode 100644
index 000000000000..c557ba43034d
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-17.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Wallet management tool"
+HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
+https://utils.kde.org/projects/kwalletmanager"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kwalletmanager-15.04.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 1b24f316f0de..3d68f8c0e820 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-17.08.3.tar.xz 4707080 BLAKE2B 97cc1c3203988fbc2207f5f9a22369804ca96c8a2c9997bc9a884f987c8ca38dfb4ff3819afca920ded788f5494a5bf4f64d2e0375de63b25b3c379dc304c7d6 SHA512 705288c599facb3ecb1f2c21bf4c8633622b2938d88d563f7358ed888fc3aaa4c54d10a4e8c4263d19f73eab0f4bff5ce8e61058bb56b10baeb93e05c90d661e
-DIST kwave-17.12.0.tar.xz 4757372 BLAKE2B 7b0416ada21a4d1bf77c86b1adfac9eeef7796c114f68e814f17ad5b15755206d09dde18275f3116cf1b4bd565a7ffd195487edf64f0b80917c974b2581a0104 SHA512 26ea6374a2686a397ab433fc98cd028d768da9e28578099d144ffbd6cb1df7f6ecfb6f371331e8ab73172dda004a2af77d68d9bd7395c334579a3fd19922601f
+DIST kwave-17.12.1.tar.xz 4757472 BLAKE2B 68013bf04efcd691474a034ab36aa53b16c59fc5192acedee3c756c453e400786be7c3888fc96221ee448a090add225e77fe83cb011f3d83e40e2b469f397712 SHA512 4e02aaef7322f0c4bc4c889d71baa4093def65df8fd084705e531ad2a91a34d4d3d1983ab25dbfbe1150523447241e5f109c7dbb3a86f55000a5972df458f161
 EBUILD kwave-17.08.3.ebuild 1987 BLAKE2B 845543ae6c1a1066a67e5172942696e1dbe5ea4302dcbf42c4f8e5d888f7963d39ba3b592f30b2a0c6de7f6400c6787631b04ada0d80a09942cfd9be99ca9804 SHA512 096f4b29a67411fa61159c91d15e8424aba0678e65cc3e5d8668f62f5bea35126aa9db6c0907cf2bb7f82a860f9ea94505faef8c0b5bfa42d7f21883bc7180fe
-EBUILD kwave-17.12.0.ebuild 1989 BLAKE2B 6a30967efebc092e0b1df012fed9cfd7fd078670a55cf18ce703b64acef97942018c63edb7a2dfa6f2f2f34d0557f2ab8444567ee01b63ebf16a8b2201beb4a7 SHA512 92474c5b2545fb0ac7efccb73927e4afb2c146cc3ea5d1c24b61bf1d7ceb4d44e88b46e65fd1f96ecbeb9a188a7576787062d2070419f75d26629f7da8786341
+EBUILD kwave-17.12.1.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
 MISC metadata.xml 749 BLAKE2B 860265ca3ab192b9f0eb386b4f8c32d400ffe0d79d9ae52fd1b03e10b6c1955406219641cab9c38cfa3c45de2a7bc2d37525ddb264599922e3359d764add4318 SHA512 ea33dd37159d916ce727354e5183f77e4435553fad594e6f0494419e41137bc29d9f1d7b1035ab88ac982ca4c56a68065783a9336f29a511f681074bf2d772a5
diff --git a/kde-apps/kwave/kwave-17.12.0.ebuild b/kde-apps/kwave/kwave-17.12.0.ebuild
deleted file mode 100644
index cc653c11f11a..000000000000
--- a/kde-apps/kwave/kwave-17.12.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
-LICENSE="
-	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
-	handbook? ( FDL-1.2 )
-	opus? ( BSD-2 )
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/audiofile:=
-	>=sci-libs/fftw-3
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	mp3? (
-		media-libs/id3lib
-		media-libs/libmad
-		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
-	)
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	opus? (
-		media-libs/libogg
-		media-libs/opus
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_kdeapps_dep poxml)
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
-"
-
-DOCS=( AUTHORS CHANGES LICENSES README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DOC=$(usex handbook)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_MP3=$(usex mp3)
-		-DWITH_OGG_VORBIS=$(usex vorbis)
-		-DWITH_OGG_OPUS=$(usex opus)
-		-DWITH_OSS=$(usex oss)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_QT_AUDIO=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwave/kwave-17.12.1.ebuild b/kde-apps/kwave/kwave-17.12.1.ebuild
new file mode 100644
index 000000000000..5327a15228ed
--- /dev/null
+++ b/kde-apps/kwave/kwave-17.12.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
+HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
+LICENSE="
+	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
+	handbook? ( FDL-1.2 )
+	opus? ( BSD-2 )
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/audiofile:=
+	>=sci-libs/fftw-3
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	mp3? (
+		media-libs/id3lib
+		media-libs/libmad
+		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
+	)
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_kdeapps_dep poxml)
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+	handbook? ( || (
+		gnome-base/librsvg
+		virtual/imagemagick-tools[png,svg]
+	) )
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_DOC=$(usex handbook)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_MP3=$(usex mp3)
+		-DWITH_OGG_VORBIS=$(usex vorbis)
+		-DWITH_OGG_OPUS=$(usex opus)
+		-DWITH_OSS=$(usex oss)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_QT_AUDIO=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index b6ca8f6e55bd..bb180ec2eb99 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-17.08.3.tar.xz 4167380 BLAKE2B 175278b4b09e815a8c33516e741d44f2dc578f9e67184de95f1aa8a3bdd1b7f4a357782985411dec9b9af7d466eeb665babd5064e279de39d4aa908966e774a7 SHA512 8738172267c6016fed00629306ee6fc152549f2e1299077c2b5d2630afaa02af5ebd9f795810bbc40a7e4785502d213d752352ddaff9eedccf79804523094c16
-DIST kwordquiz-17.12.0.tar.xz 4167292 BLAKE2B 67b3f4d5d696502b234fd30f922acf8e172f359864fb428d67940c04c0a7de47f4212feebb26fc35304e2435e98f60b587eefbe15d2855000b0544d06215dc3c SHA512 bf5c1b60db716b0ab3df46e0ba5172c1b999e3d94c5d5b4a919a561d02a82f2d4dd95ec06fb51680013da97ee72db6702124f6ba233f8ba8d1df61ea841d8f1f
+DIST kwordquiz-17.12.1.tar.xz 4168996 BLAKE2B f633dda56dac2916e5ff0eddef439acad36ebf7f12f4f8214803ba8e232949efdb1d6c04b371bb3a96f35972acec7e75ea5840a2e2c3989f8e1ddeff5e8f84fe SHA512 c96f6e39a1b3bf27b2de5a2fe469070ee40224b6461c9165508ea428cb8c6cee87201166ca5da18f866d63047921887a6485df12514a17f545c03dae38544c6b
 EBUILD kwordquiz-17.08.3.ebuild 1062 BLAKE2B e96d888870b310d769b9737386f57c39e0629ed7d12c7f73ddc2d55f408a85faa7ed8de4c847fd79de26aaf39982b64f07d09790789c1dd52197533f8e022203 SHA512 aaa2084f7d933bddc21c9439487d274ba790344fb6c44cabdf77d582389fa6e27968a1ea334ab5bf3a4b8cfddbfe47ba01aa51f6d193d4193507c094773a1fac
-EBUILD kwordquiz-17.12.0.ebuild 1064 BLAKE2B 18e63ef65478c092ce954ba6b677731b952107a45cf8fcc5af2e43b905c906423644251f9ff602846fe192950267304b3954af427948a0ebf03167d36cf9d917 SHA512 8046671d515a0d05ff217156876275d029493d994b198ac9b4ea80603e889f23d157d3b855c38398998ea9e0017ecf0705da9258288554434d38790c71d562ce
+EBUILD kwordquiz-17.12.1.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-17.12.0.ebuild b/kde-apps/kwordquiz/kwordquiz-17.12.0.ebuild
deleted file mode 100644
index 8de0699d9984..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-17.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwordquiz/kwordquiz-17.12.1.ebuild b/kde-apps/kwordquiz/kwordquiz-17.12.1.ebuild
new file mode 100644
index 000000000000..666208ff0dae
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-17.12.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"
+inherit kde5
+
+DESCRIPTION="A powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND=${DEPEND}
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 5434f979ebdd..39ce0eb2d546 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-17.08.3.tar.xz 5617380 BLAKE2B 582c128e1904fbd0cec6ff177296aca68c36749581b57b6d71fce3e251838699c5068945a6e43abc05339eca3c2ac9dd5ec53891c20e208e3634771d5a859dd0 SHA512 cf4be33ec05a5451322141beeb4b2a66ff34da9f34fbc1038d7303d707012ffc477510164a65837ea0b94733b0e2812b747109a78049b5e4d31a75887c66bd46
-DIST kate-17.12.0.tar.xz 5629740 BLAKE2B 4daaffdd71a94a413a0ffba1c67252bf74beffd435399edcd96af4bc6d32c818e4d6024345eec4bcd5eabee9120572cef3267cbd390fe7320a0a7f5151411815 SHA512 c32ae8db912fe4d8e47970a5fddaf722004b7dcdf3a9bda12082764dc0573b7634bedaf59c09bc1b9188640d4f06f122c54671fc81ae6a23c23249e3dd3760ce
+DIST kate-17.12.1.tar.xz 5630360 BLAKE2B 69f9855fbdb71c4215de58f046fcd88253d2edb7678633f07de4803aff8fc34dad975970e1f3d4800fd3f798d46ea30b0bdfef96ca11e22cacc53b0455d58fad SHA512 63644c093316f864390a67f419be047d9ae7eea8113f5a030bef047ccd2636ba4c8e2aeadcfb71cbebc675f91babef427b23bfbd96df310ff4ac5ad3e82d5e64
 EBUILD kwrite-17.08.3.ebuild 1187 BLAKE2B e7bbece5425177c186240156f593abea61766f9b0a152002822ea75b914d0ab66b37b631f9f0b563416d5d861bd386fed17526af640cbddc3d57ec9f1d415e69 SHA512 290b58fcb54858529738dbff692b8bfd03a8b3dc21c4529a39626e4ac8b7311dabe17c87a84837c4a7d29a48e7038dfd7bafc83b9ec0628933a88af1202d7cc3
-EBUILD kwrite-17.12.0.ebuild 1189 BLAKE2B e98742bc3dd3452531c64df4735c6eb5afcafd9a75e0cf14095310121ce5f75023f56238ce748e809ed509176bcdcd86b7fc2cf78b1c9e3f781d5aa483835f2c SHA512 1ee0aa91b45e9a7c835a78bd86926945318145d418decebed5c2931775eaf2c949010ff326c984333978d1c404a2961bd9bf2a37e3e644929504d4cd2744fca8
+EBUILD kwrite-17.12.1.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-17.12.0.ebuild b/kde-apps/kwrite/kwrite-17.12.0.ebuild
deleted file mode 100644
index 3cc94d66b734..000000000000
--- a/kde-apps/kwrite/kwrite-17.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kate"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwrite/kwrite-17.12.1.ebuild b/kde-apps/kwrite/kwrite-17.12.1.ebuild
new file mode 100644
index 000000000000..40a36cff18e3
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-17.12.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kate"
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="KDE simple text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	# delete colliding kate translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kate* || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index a7848a944954..d3c075597e67 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-17.08.3.tar.xz 28456 BLAKE2B 375fcaa5ed78ba446d150752e0c660fe74a3ae7441987c272eae0238d247ab6329b74c5b8db56bc27d05643162bcc4340e0622e3431849b0dc514e6d2ce47ed5 SHA512 7b22ac61d3ac581d679f07f0ba42a038fabc04a146f6e2e2833d1a17388d41bfb9a43de34ae8ab5e282f002ed7b7a1e49d202e4f85ad62a42cdbdfbd7871a152
-DIST libgravatar-17.12.0.tar.xz 30060 BLAKE2B 112368f1409e159d7886323b3ca2435a4912aa83af718cbb8dadfb6c4c1915d413889548d3890968c199072fc71e99fcd30b7b79ea1761ff2a1044f9dc43694b SHA512 30b1b821b66c5b60d36d66e6623d4093ded405f69b2f0d1448ab45bcddf7af5c402337736366360c7c845428654b4b37454193093fd71790050fd0a399eacfb6
+DIST libgravatar-17.12.1.tar.xz 30076 BLAKE2B fb285247b14d3f69e27ce00f6e52ba11a39ccfef271ad6cdcc646291bdd4a36860738cfd782756776a73cd1a963a23f61cfb1cf82f860d701df3148142823496 SHA512 44cbb9664d56bf0705490b7e912be5fa2653d8b59dfe890fba952131a5a328879fefdc9251961f1b63affbb0e1384255115b9e9506dae672fbdceb3a46b9b71f
 EBUILD libgravatar-17.08.3.ebuild 723 BLAKE2B f72f2facc899cd19e895ca2ecf76abf0806c4d76b19c8150cb820fa40e6fca432bc2eb3ce5d515465cb3d7e4cac15140923efbef3964e6f76c8d4e3501beb3d7 SHA512 702bc2a10498a2efe1347ad3fe313ece5cd5d240ae895a496c28e04f9ef2598bba2d22a1150c379b23f09a2e97a364bbf650c5f705584e5bcad4af4228e031d7
-EBUILD libgravatar-17.12.0.ebuild 725 BLAKE2B fc0b45af67fc39b539679480bbac75d3df0b90ca6afa10419afea5a4170b293f145b9b12fac77feb4482ae0c7b53c11555c47e8d54969b114b73558c7fe11f5c SHA512 0af54303f194e48103c5aa82a6932a4251dcf8c7c037d98c698d246fb332c05d5d498a389105dbbd4d418d1a0fbe420724fec6207e9a1bce0e79206deacc1c95
+EBUILD libgravatar-17.12.1.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-17.12.0.ebuild b/kde-apps/libgravatar/libgravatar-17.12.0.ebuild
deleted file mode 100644
index cf9e9b568f86..000000000000
--- a/kde-apps/libgravatar/libgravatar-17.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for gravatar integration"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-17.12.1.ebuild b/kde-apps/libgravatar/libgravatar-17.12.1.ebuild
new file mode 100644
index 000000000000..06eba7322aa8
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-17.12.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_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for gravatar integration"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 624584 - needs internet connection
+	local myctestargs=(
+		-E "(gravatar-gravatarresolvurljobtest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index d1bad3bec562..cc75ec853e4f 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-17.08.3.tar.xz 424036 BLAKE2B bf407f7a32b6ff288e6071bc9fdd2bd88c17262d167b3bc0ce8ba0322c6c415c7e6377b643dceb47fb61265699f971e93119af862e78a9a0d404c3dbee9c627f SHA512 db06ceff8bbebdf746da317ba930ce66610c44374475b6c2024b9ad2b252c6ebf5dc15c588bac7d6626394a30c004bb3d5f09c64e08ac005a27230b268d92cfe
-DIST libkcddb-17.12.0.tar.xz 424020 BLAKE2B eb2fa92d54a44b188c5e7d776a6ba26d76bf568a8f01145d8067d8a397cf9838496b6dbe2dc4f3627fdf48a26ac583a5e5f28bb7ee6f0885d7ea5a666a62ef18 SHA512 f4ab58ed7fbe82877ace3f5bc6385c9443b2652f7a90898f315c2bb677d502cdad8ec3032ddcbfde3eb11557e7aacad0d89b2193295761978b769bbe8e3f51f6
+DIST libkcddb-17.12.1.tar.xz 424012 BLAKE2B e6192ac79c4861a3cda9f2fa1e9f20714774c995d5632651f26b4fde44d3a265da8f1576d6da09f5c0a79a1f1156b45eb5b8f73ec10185871494c56c6e69eda6 SHA512 ab10854e9cb5ee4101f6dd0641f0f3cf2d5078ff17c53b035c20d7f19213f80fcbd16b2865d3fee80090ac5e70f53f760ed77e31fa6054d819cdf7b79efd3673
 EBUILD libkcddb-17.08.3.ebuild 1069 BLAKE2B 5679af8180ca1be41ae3a968306d80bbf0563d86fbfcf3718ea6b9e7d46b003d5443497e7ae647eef2f7ab05c37efe525d4ac6cbbfd2f3da9787ee8ffd382cb3 SHA512 7766c37b3d142d8a0a076b9a5efc8b854488310dfaea73c7a9ceebea7d3b5a99e94e8888921eea80a20a7c2e924458bd0d754eaa67f94f001506d1bb4f4bc9dd
-EBUILD libkcddb-17.12.0.ebuild 1071 BLAKE2B fb178a64dfe65f0626e44914836b46cb105768cd7e0ef7f19162481af9131d5ff82eaca7fd16015ade83fea12fd0bd95d60c1d7ea5b74ddc0c0ff2d56c70c043 SHA512 66ab7fd463097f8bc255fad2d943ccfb8660c1f989c747c5784be737f486e39fce0c9501bb18d6f0150d456d7245b3dfa535b4df9ccdf3af2edcfe45a26818d5
+EBUILD libkcddb-17.12.1.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-17.12.0.ebuild b/kde-apps/libkcddb/libkcddb-17.12.0.ebuild
deleted file mode 100644
index b8f3c30529e7..000000000000
--- a/kde-apps/libkcddb/libkcddb-17.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-17.12.1.ebuild b/kde-apps/libkcddb/libkcddb-17.12.1.ebuild
new file mode 100644
index 000000000000..7c3b36bcccd4
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-17.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE library for CDDB"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null
+		cmake_comment_add_subdirectory doc
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index bcacffd029d0..2e5c16b768a0 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-17.08.3.tar.xz 88624 BLAKE2B 8ebd1fce84623574826b0a45e7c583bd9aeb3258b6163d0c85f2b1b9da8137700ee72604242ff6e45d7eef62bb7a0289c2495494faee24d83222ce1e05961c6b SHA512 61e58be1ecef0672c70bb96b181af4d3d38fe00b7dda14b36138c91fbe4b98c17d9f78807777c3f61004c4575f0c3c74d322ca96b437e7f806576a6812188d27
-DIST libkcompactdisc-17.12.0.tar.xz 88652 BLAKE2B d31967c13e93817a6654ff0ec4e063052c97ab2aa121e71f0b900010d6d12c9e92421595a75e9da6cdcfe9fa4ea3c9464115e2f0c6cbd88e26d005056bc0818a SHA512 a609e74ecc178fbbd77f1ed76319f5d2c70af929719ab094d68ab1b21b5d3058b72523572e549472e18e9a8187963e444d9ae6be8224389c34deb6b97370e47f
+DIST libkcompactdisc-17.12.1.tar.xz 88588 BLAKE2B 799abd809f8ca3bf705295fee18d98b85a81f498e50fa58c75300019631e9a01f47d2b6bebb52f8efeec84767a90266301c45eb3ddfe846c08a3012c6c9a0066 SHA512 387e9fa54faf92bd6d623eb2f3c236dd512cd6b91e87595be64f48864e458fb230e10212ae783d5754bd23f8bb3ba2e8e9c3a186ec97e03342a09b02e716d5c2
 EBUILD libkcompactdisc-17.08.3.ebuild 574 BLAKE2B cf86c2ea4611d2b91998fcb506da67234559d56111846feb7ea090c2e352380eff01ba6aecb6bbeae774cf23ec08355f7c21e1d436feeaab6dbe67ca1e453f05 SHA512 b645c3ececdf850aa587d9407ec834f313de439dc6b9fd59807078ab3de23cd19433d9dfdb5d49c6d5dd5b09d79d916748127af0e1d55de97cac744eef635627
-EBUILD libkcompactdisc-17.12.0.ebuild 576 BLAKE2B 6d7ce13909517a23a8b38be2abe05859558d7887b44de59df1cb3471537cd37bd2e9ae350804045d514c8e23dc3849c236c8878cf39c0ef6c81672efbf041dc9 SHA512 b368c6305dc1ad285c80bae668ff388fd4d69067908f8b115ce1be1e319151b329b1bfcefa3f963cbc0843b5e26eca1d208e9de73d8d180ef2eb140bfd491e17
+EBUILD libkcompactdisc-17.12.1.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.12.0.ebuild
deleted file mode 100644
index 875774a8b8db..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Library for playing & ripping CDs"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa"
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	media-libs/phonon[qt5(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.12.1.ebuild
new file mode 100644
index 000000000000..3c73db683d51
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Library for playing & ripping CDs"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	media-libs/phonon[qt5(+)]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa ALSA)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index f3e34e6cb9ee..e3e97eb74824 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-17.08.3.tar.xz 42216 BLAKE2B 1c3af37ba9789979af8269a8bf5594677738095814a00a9c7ffa1d39fd1e31620ce1cfd34fb559a117bfe5a1cfb5e42bff6ccb7f281df5b897fd1e539e6b3adb SHA512 6186cdb256254314109fc4ccb7462e671f305ba792f64f29f14c2e029af9f93b4fd4e13e05c06640e17e2624347e8ba14e70b157c5d6bdfeaaf615950565116f
-DIST libkdcraw-17.12.0.tar.xz 41832 BLAKE2B aab27e3cb05b4bb8415feb3bbe70bf5fa740c16d58cbb9e7938bd4435c185d527fcad4a4aeea8a0367db3610e065a1241d5404556eac6852094ca411a67c018b SHA512 6b58671e6d28a0a48f78c192867cc683d6fb5eb0b86b0daaeefc3d3b102c468ffd4ef529ef15fbc559550a4536cbacaad4ca3c51612b5383ee9e157f7cbe584c
+DIST libkdcraw-17.12.1.tar.xz 41828 BLAKE2B 5ae14ca452a6973fdd7e21cc278d3fd964cb2001d468d5ec076537261acb6f4c67d9bdccc4d640486430799381d1553353f5bfd5f8695737b6c43fa8f52b7743 SHA512 4e3d57e10e07c47c43559773918852553cfc214cd7b051b495351fa5c85bb3a003fc5e194ad13f0ce81bf5006c195d19c05e2759f14ef4484ccc6225a2da486f
 EBUILD libkdcraw-17.08.3.ebuild 336 BLAKE2B c72ee6ffdbb082b111824f2ade92c4d9ca5639d00dcb3a9167fcc615b899e0c61718ff430558a6c6b0a556f44c0664653c2d5ba53896a275a47b219ed0e3b5c2 SHA512 38477f722c442b615c97a177f6a394839d60eb8d8ee5fef82158627d30be4518ad5c9905001043bcf02b8060fdeed5de81854be671df3134488b946b06afa81c
-EBUILD libkdcraw-17.12.0.ebuild 338 BLAKE2B 6fee47ea6468609d3441f038cdd61971bab1790084b8928ec17d7d01e25237ba26b56e1749d4a853410a356dd3716d983e9eff4ddd5e7a10474a5cb950d373aa SHA512 c1eff582119fe3b0c0b9c28dbaaf65eaafc4edc56b623a81c06d6b4d7681806c9ee1efcab3634e13c5053eb44cde75992cbb1f33e10717515ffd252e404cd482
+EBUILD libkdcraw-17.12.1.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-17.12.0.ebuild b/kde-apps/libkdcraw/libkdcraw-17.12.0.ebuild
deleted file mode 100644
index 1f3f10d020bd..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-17.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Digital camera raw image library wrapper"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	>=media-libs/libraw-0.16:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdcraw/libkdcraw-17.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-17.12.1.ebuild
new file mode 100644
index 000000000000..88aa2516004a
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-17.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Digital camera raw image library wrapper"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-libs/libraw-0.16:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index f9a8447889b7..f8bc7ba59ca4 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,7 +1,7 @@
 DIST libkdegames-17.08.3.tar.xz 5944824 BLAKE2B e1abf1c137178839447938ba4a895ee1ed9fc556e7391db64ad7374b692a86d8e38d6c2a161e39508f30e147123f841fe13cfbf945cb5c0a61f45d277ad7691b SHA512 0ef25d299b2b330112e9c7e668c3166b3d91138014ed3617d230092decdd7be2c80328e0938a3a32834395ef24ae9c653561688bde80ccbc6214a1f5423f11bc
-DIST libkdegames-17.12.0.tar.xz 5940376 BLAKE2B 2f5c50ebda0db0cbbdb2482b0f3aeb90fa9fbbc7d2f0a81aa2b03559ee480c7d2ca02f3b76d6cd5980b03e6f369e017da3ecd24b3b5f954fd894f59e27d3bfcc SHA512 e0ae982d7ee8c40a5280fd21720541eb6af9993e04993ecbe6d29498b2acc7cdcfc7d7613c3bc7d715ad6985b14b1913bcac7ba2a59dc980fc1c857d178cf684
+DIST libkdegames-17.12.1.tar.xz 5946992 BLAKE2B 3ddac2395dd6f43a4dcc918dc7e330a0926a1692b44dbf06486414c90a53a4ca55252706f1926eb6dcd94a52aee4a31249a1cb479d01f2f7e89a852de4229acb SHA512 189361a38940a4275dc643ea2bb771607a93d179b209b6524f777f17ac513ea03e5240984c01cf6e1605b3472fa99f64cba79bae183177c82bd7a9235f5ef02e
 DIST libkdegames-4.14.3.tar.xz 5827668 BLAKE2B 511d1be860710450e8af72240b60e9df0b22d5415c3bb3f961fcf4b039f3f715ece1e258c5951b19b147a63715dcc5da3c4e711aa9ca2d3975e1c15b52c8674d SHA512 43deba5ea5e4f39eae20425f76f9cb02d5215e0a596ffbdd29585c0bb3ff32f2806755ccb22b3c1c5c7fc5c7bcdb2bffd35fc211ae6e2f55aa751965b5c6d9c3
 EBUILD libkdegames-17.08.3.ebuild 1278 BLAKE2B 96d1644d174ecec0ca3b59048f756c32208edc63bf5851244e858fa0c090f9e54b4c2fdf7c9e6d9055896dea98b2b3f6496489a1a32cb93493020525cf3822c7 SHA512 70c47ae1abdcd2984d596d6e25faac962dca82756aa2fd2f59f3a28d9aeaeb1004df1791938c584a260c82c99f5d71bcccd0dc506859c55ddae84831ba4f1ca8
-EBUILD libkdegames-17.12.0.ebuild 1280 BLAKE2B 27ba9d4dec9cf626f40f83212597e1f2d4efd7086ef11a5e8abc11759dd26370b5552edf7e0dac2560add0f08bd81c4448d031944456f479cd8427226ebd6024 SHA512 818b54a209c8dd4b21a1e736f32f986411002bc3544070ec644bf39024e837dfa6c2aff18a3b6a3e2e101d6d13cfe98ac89f98718601e5722b3dbf1b1c2c69da
+EBUILD libkdegames-17.12.1.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
 EBUILD libkdegames-4.14.3-r1.ebuild 314 BLAKE2B deb4b4885abe2bc91897b0c1c651d1d446238f46d304c860c699263e2f277417db33e75aa23ec0f0369b2b49fc1f08fc6e8c4ec6ed162e64a3e43b61f268b5fb SHA512 f217595bf76404c4998418445a5e3eb3639447d11a801d37297e3122a1f16f4f8e9c7283b4c7d4b0bd8dac8897c025d70bd4c4002318aef0963d218aa8451bf9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-17.12.0.ebuild b/kde-apps/libkdegames/libkdegames-17.12.0.ebuild
deleted file mode 100644
index 20e0d4c7491f..000000000000
--- a/kde-apps/libkdegames/libkdegames-17.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtxml)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/libkdegames-17.12.1.ebuild b/kde-apps/libkdegames/libkdegames-17.12.1.ebuild
new file mode 100644
index 000000000000..a70604c955d3
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-17.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Base library common to many KDE games"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtxml)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 6724b0fc302a..a5b4e33035cf 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-17.08.3.tar.xz 339080 BLAKE2B 12d2693410fdda7de25717d12c3952c13963425fdd4f9890ae349555dd78ad1b193f2d0b3a4f5e9113eae06a9ee1e8cefd602b2ba16481908846317dc4d07f9d SHA512 ceb4ae8f2151c1973a5aed7a8510c6a872cb479e5d6cee212977d18dec0645122c0b308231b77a2c35e6366a0452d9df42e8cef0c5bfb91934432ff61383a744
-DIST libkdepim-17.12.0.tar.xz 339972 BLAKE2B 03cdff5ad779070c73c9880a374dd34ca1add857d751cddc56f1712136451b4d625c9e5dded0d21f759cf70d55d2331a39df84e411e1c34a61d0e71d84a7ee4c SHA512 c632e706478af50f05f4252d8aeb0ba6eaf98fb463dcce3d164bc4de9da1f5fbc9ae145c1d07f166cb454c28dcca53bcae4f5c8249df824b9360edd8af2e7067
+DIST libkdepim-17.12.1.tar.xz 339892 BLAKE2B dd03e14923c914fff721ea8349c4f6d2d71491e75e24031f09f21997d720999949a79b4a5a57234de836df1f7895d30cad690b670ccf02bc0e8a3f332f3bef9f SHA512 5fad3b527e11d08cc37a8381dd95bcc9464bfba83c9eae4c3e7da056947b6178bf228759b58f801c55f84e9fbf1f95913638d3f45f0f2032ea309978962b4c64
 EBUILD libkdepim-17.08.3.ebuild 1065 BLAKE2B a9af9641176eff0d026cea9d25d55ec5b979942ff0e184c424a64a19b8d1a979f5ea593cfcde41ad4ddf3f50b5e2be1a53db0a6c22a6584becba3658f1bdc3a6 SHA512 ec8b71c11c68f966238fdf01c34d7192e6c7c708dbe2d10edef267af1062d0ae4315032482a53052701768e39112d14f13322af0b74a80913562cba332ceb881
-EBUILD libkdepim-17.12.0.ebuild 1067 BLAKE2B ae397b61dc3a5d9011f42d58e7e2e59b7672b306a34bd4170930d3e52075f7fdae99808abbebd3a6f96d5bfdc87009c6d04e1ea4e721363ccd2c66d9e69ca152 SHA512 32bd06ac474e5aa1ac341836757053d95302d4eb73c69e97b1894ae5afb5c597c4fc10e00a3a9969d8d64d6e3ba90fedc43e6e3c81195a66704cfb8abdb88c21
+EBUILD libkdepim-17.12.1.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-17.12.0.ebuild b/kde-apps/libkdepim/libkdepim-17.12.0.ebuild
deleted file mode 100644
index b9d64e7cbd8a..000000000000
--- a/kde-apps/libkdepim/libkdepim-17.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkdepim/libkdepim-17.12.1.ebuild b/kde-apps/libkdepim/libkdepim-17.12.1.ebuild
new file mode 100644
index 000000000000..416b05fa49e7
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-17.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 18a532be2153..617fb155f39d 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-17.08.3.tar.xz 209788 BLAKE2B ff7b39259f7e8d3d6fc0494cf812b6a0785afb3df3e3e74ba1111eec0baf5a6e4b6a69f601c545a79744e9c5ba648af05834747eeb96afa49433060d48aef0c1 SHA512 de1726f73e1b58dee5e68a54c1e2620eceb86e9b0d41107439519b69a71e8fcc41c1030a31953c816a20334a6012a83941f728cdadd73303d285ef160c4bafd8
-DIST libkeduvocdocument-17.12.0.tar.xz 209744 BLAKE2B a3e6595926ce0d45428c6e440c2754786ec6ed73a3a7811682ab09aa07f22a8ebce6925cdc5436f646631b14242e5bbab435071b630b8d582609967006a311c6 SHA512 24573b2a241442b54566a9750408058759a5974dfc357d19a5284653cf1c45960ae833ef122b236b404e262c2ce41c91ba1510198db74e39b7aa84dba965f24c
+DIST libkeduvocdocument-17.12.1.tar.xz 209760 BLAKE2B 03f95543208c0918f04a2c2cc4173f081ec05ad5bbadd26c1396ddf9dbaeac538249b8649c1b0bb00f8cd04451377d5e4806f4d3dff05e6a589de454b1404470 SHA512 063791900716cff6c228cdc4e26bac091d3a8908cb172277028ef30a2e5ff0c52cfd042a4315e7be9664cd26abdefea8508952fd1ac07c1c556cbc5cfd8777bd
 EBUILD libkeduvocdocument-17.08.3.ebuild 599 BLAKE2B 63ca6d04bd20946f22cde11799268b28b29f4158a861e4c7b06dc58f87df7337dc2f88fe39e3f77ac861a97a55a3f027d85b84a4dbdf6ad6d3c7c2daf4735508 SHA512 79e6f1643cc9f1cd665091ebdcc69fb3478a8b63a5b4a3671fbd779d9f9dd1ef1813511b373b2c016d39a7aca895b4452320cc39430938f33c989fd2a3900215
-EBUILD libkeduvocdocument-17.12.0.ebuild 601 BLAKE2B 36c707ed09da8a5b89dcf785989637c67c7982faa4a46bfab99bb628a5703200d13f7401fa7750e70ef37fc0c342b742de05af93202c836a5833e44f846f3e03 SHA512 5f4302ce64dffa19c21e85111699f096a398868a3acb55b153f6e1e7985736d57a2f3f4c47ea70bb5037b0d28adcac2292934b1401d5efdb7d500e19edfa5394
+EBUILD libkeduvocdocument-17.12.1.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.0.ebuild
deleted file mode 100644
index 9b15e11a2aae..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
-			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
-			-i keduvocdocument/CMakeLists.txt
-	fi
-}
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.1.ebuild
new file mode 100644
index 000000000000..caf1c7213dda
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for reading/writing KVTML"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
+			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i keduvocdocument/CMakeLists.txt
+	fi
+}
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 06eba9a9bde0..0ace131d2f72 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-17.08.3.tar.xz 64716 BLAKE2B 6b34734624eb7d3b286c3bfbd633985b45796a5f89f10083e06f4d7f3c1fef5bb725b7319a84cb882a50bf1a9968880dfa46de8856276ece51604ed6739b90e2 SHA512 620dac3d0cc2151365f015acc10699183f8c9b553ebfd4610f38b84fe79adfd8a91876363ef8a62f7cc1929706e18469ce85727143ef7da011272685b5c912c6
-DIST libkexiv2-17.12.0.tar.xz 64292 BLAKE2B 91afe2a2ac2afe9e1764d3d57bd4b636819c19e31837248e30a26dbe523bb9812a55d2969512829f04eb941af96cdd497331bc477e0f1156a260653fd814d1e1 SHA512 532c3f1aa6f98075399b33c737614536776fd8334e19457150fd67adffaddfa8002d52fee016a26e06f12545babc9d661b11a160c7940e91664737dacbc241c9
+DIST libkexiv2-17.12.1.tar.xz 64312 BLAKE2B efb18c61ffee51f7669f48e59e1a6f2530126e0da30232c7ef4836305d78aabc0922678a71c94db3bc0e41cf41789dd907a2df691c8afd6b3d1ad968579befed SHA512 574fe6bc2f1e8ac32d468220679172b9dea0c85a0377d3b3cfc3e7e8327f41a9f9285b38d7c68b37ac3e91ae915c42a9733b99b1e13a20fe4690ec059eaa0b71
 EBUILD libkexiv2-17.08.3.ebuild 356 BLAKE2B 778de27c4c73d6d4072207ee40fff437bf474a6bf980b2af4c4b820aefd63faa714209b5c9210aa486c7618682608ff79daa6380aa07208fa1fb3b6e6f28c6d2 SHA512 bec7bff4c75d5df3db1210a473228d759603c823678caf5ba2d149f7def1b90fdb1c22c17ced8b40b22c55b2e968cc3babda551aeaaf082a3ba92027624757aa
-EBUILD libkexiv2-17.12.0.ebuild 358 BLAKE2B 6a71c53989ddb49615df36e5f27d8151773cacd066ed0797932af550e57788fb0fae6dba2f0b16be4714730fdc3db2ac3e9663f92b7c5542a49d385a4f03687b SHA512 281715f2b5522b35d3cb20418eae371ca1e2ab12a7a9a218bef6172c1496c3df44e72cf3c9ef45bb6491ff6a1d3988762b94141703bcd899762dedd429489ddf
+EBUILD libkexiv2-17.12.1.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-17.12.0.ebuild b/kde-apps/libkexiv2/libkexiv2-17.12.0.ebuild
deleted file mode 100644
index 1c33ea44a714..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-17.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xmp"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkexiv2/libkexiv2-17.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-17.12.1.ebuild
new file mode 100644
index 000000000000..8566db655bed
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-17.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xmp"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-gfx/exiv2-0.25:=[xmp=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 5c9e191941f3..b63166e0b6de 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-17.08.3.tar.xz 175300 BLAKE2B 80b1d6a19bd8953d4bae36f13da2b92d8f14314ec557ee61b0d1d86d0a856c0635fa2e0b96e0d8e2b2b2b5d9577d25a61b07af2a7226c3e57326171f3ad96334 SHA512 6f0c6afb39a0654d8cb5d03a43439fda3b3a1e508b579f46c8c6c7ace050b6b749e2c2673bc5fd9d8a502e91315d8f60f052c290ba31e9cd3cf9413d7ecd3906
-DIST libkgapi-17.12.0.tar.xz 175084 BLAKE2B 52f573b854a22e787805bff37608173f434109b393b546ffff1685b202964c1f955b259931c908a5494f336b4a4f1a78e585064177d993497295004a45b5ccce SHA512 7501f75d96f96169f1c3ef208cb176ce38dba0b06193b4baeba4ad4465c26f345ad3acc5c5789125fd19babbd70be8b53bbb86908c7db55d7af198e9c8a6dfd6
+DIST libkgapi-17.12.1.tar.xz 175212 BLAKE2B e3a3792df13085bc6c18b3d36f120c4a49efd171524affe3f6f8a26d07acbc2e958cd812ddd0f46df17a8dda350a59d9cbdd57a68ef0c18279a3a374a5a9ff2b SHA512 62b6e392aa79469991d4293792fb1f21316f369c5f3c7885d073a82d5e1510ec45217dd5199023337108108aa043b66c51e8b3710c3aa6df80538df76a7844e4
 EBUILD libkgapi-17.08.3.ebuild 779 BLAKE2B ada0fc1706910256912f006c7a6832709cf8d8aa5544bfba952f2bafe7edb9a80b0e99db6c542cccda0adede7a42992305f0639404383183eff2e7e721d9610f SHA512 3f6c35f56a065c7e4bf75b9bf35d3d861288a05c8603fb63f74c3341d1560f7b84257c7aad10278d1f63e94d9499f2fded4ae215e89efeb968861428fe7ca068
-EBUILD libkgapi-17.12.0.ebuild 757 BLAKE2B bc8cd69117c68df184417be1d06e2ee4052602565d9febe1e869540983af9554bb1f97c438966c53f0a2576a51903329f14ec94baa88582090dc76295152bb9a SHA512 9f1cc2c81399276e4ab194e4cb645ff516f77a780024ddcd5552a56ffb5dce5bae6ab39f755c901ccef9d2c5313f2cb597689c9692129f39d0498ad0661cbf72
+EBUILD libkgapi-17.12.1.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-17.12.0.ebuild b/kde-apps/libkgapi/libkgapi-17.12.0.ebuild
deleted file mode 100644
index ae44f4c4b359..000000000000
--- a/kde-apps/libkgapi/libkgapi-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://cgit.kde.org/libkgapi.git"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkgapi/libkgapi-17.12.1.ebuild b/kde-apps/libkgapi/libkgapi-17.12.1.ebuild
new file mode 100644
index 000000000000..9f3e37a77649
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://cgit.kde.org/libkgapi.git"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index 14774d7b99ac..fdc1c0992f2f 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-17.08.3.tar.xz 150180 BLAKE2B 9ccea1fc0a0f28446358700c62b52c6870c6ff5d8fbd53313e1b313291986ecbe70c46d0df16d34a427b8b3d09b980193f5004e7c113a84b37eb289a8bc85064 SHA512 3b9cd482272c484298a3663c04ca04f4b9b46b9b78de949aa426df338d1029500b1664a88ce184b2035d69809a697db6ae1c67894b2419f8b9030359f9d58588
-DIST libkgeomap-17.12.0.tar.xz 149596 BLAKE2B e9248b8915624ec307b3de09789ca2d7e965be9ae8bd1f035bc7fb0487bf554c6fea3ed3c1ca1bd311c1b2318e0d940e1944c2cb49410873f6ed1c7c9fa8fd4e SHA512 0f8950b379ae8656cb6f302caf71c6c32f164991b6a17fd0cf25749483471c80445dba2f2637482fde597e95e7fbff985abac46fdb919904770fdc657cd7fe20
+DIST libkgeomap-17.12.1.tar.xz 149592 BLAKE2B 2d380eb1e3b71c5c4fd8ba1aeb0ed6bc24055c97ccde76b33e53c63296a578f112a04971dc07d9c4054a3d7b91f889c92da2cb00b3d9594021a7e2beccc7631e SHA512 f93f866990ad52a13284c32669ef6053abc4ae35792df32c8bc532c67a782db65d4f3d803c20bc07733c1d61525050481cd78cfa1105355bfcfdf23d9f0602cb
 EBUILD libkgeomap-17.08.3.ebuild 774 BLAKE2B 8c4d3a7718254a8a4f771e7ea17614614cead9dc77db3a62f9d1dfc99ab375596da255ae0210f267be0ffe97d252b77566b15cb2914c94a9d61c583f1036f6c3 SHA512 857e278443d6ab71138d54267193d8b63dfb9a3bac6d6e5e2e5bde0d96800ba2a94f039e73c19b2cdfae1c2a9431d9294180722eff516a796119c575aefa06de
-EBUILD libkgeomap-17.12.0.ebuild 776 BLAKE2B 08d7ad6f25a860448fa7a3d612086e98a4d6c295025703ea1924e8d4239254295f8358fadbce097ff5166f781dc3f4250a074b886a97e414a93e8c2a99687d13 SHA512 da2e6946e8ec82ecb49b9c03a6a6dde1275399e3a7123e1eac162fba67a76c29d2af0b069308a42047e81ec24689a3461a7b09d602e40d379e5f290e0e6895c5
+EBUILD libkgeomap-17.12.1.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-17.12.0.ebuild b/kde-apps/libkgeomap/libkgeomap-17.12.0.ebuild
deleted file mode 100644
index 20c5c33027eb..000000000000
--- a/kde-apps/libkgeomap/libkgeomap-17.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep marble 'kde' '' '5=')
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkgeomap/libkgeomap-17.12.1.ebuild b/kde-apps/libkgeomap/libkgeomap-17.12.1.ebuild
new file mode 100644
index 000000000000..5bbaf24dbc0d
--- /dev/null
+++ b/kde-apps/libkgeomap/libkgeomap-17.12.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_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep marble 'kde' '' '5=')
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 4515104e37d1..e31d6f99e783 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-17.08.3.tar.xz 103752 BLAKE2B 847f09a81c1549f4bdf5b931fb76802897502c2d29b61c402e6f9b44bb991db750ec1f490d35054742db05ded890ad0e374405835fe677d85f8b9d74393abd43 SHA512 a91eb9444dd710b2ea6bf652dbacadfc1ccb4fcae3b0a04e1324b145a8a0b81fa9885e59686736a966224c032db6c06a8e95912a0e13bdb11b87c6469465f071
-DIST libkipi-17.12.0.tar.xz 103480 BLAKE2B f4164fd54442240c0f3f85633f2553b37ed0b63a09d0a5218962cd6fb306b1a975b4f152f60bdb7ed14bebd3dddf08764f0e868f31de590036be08849e7e3512 SHA512 7064365b5e3f53f195ef88a8d8aba9bb7afb2297cabb6cd011636dbfc4cdcbc4ae3075885a1e062ffe33f57730350a35760c3ff894480ac4fa4083f5ebff8a89
+DIST libkipi-17.12.1.tar.xz 103492 BLAKE2B a6693d5be58ccd83a4dade826c746ef909097a65d4eac3f1b62c9fb6a21fe085836f9b80e26cb7f874a2a0ff9d7c2638b6060da4db06aba66cd7a8c75dbb92ee SHA512 c0caff916767ceb84d58f06b6f1b237edf3fe77d1dd8f1e3a9be8002739ab76b95b7853429a235ebea38e220ef0111ce06e2b1b0c11a02ace66f658a99269ca2
 EBUILD libkipi-17.08.3.ebuild 565 BLAKE2B a490c4a53467ee8e8b85c4aa336d276474b781a4d44720fabe88d1171966b8f0d52ee63c2967cfb9749d2dd6f7dcf194b596367370ff07e5aa2651550e9c68cc SHA512 1fbc53e2c4cc4bdb81f2a9b500b06220866ffff3af9fe038c1f9bbdbe1bd2e2beaca2cdb90c4bcd63cb92a6499f5aaf0e87c359607585a7954e3a33c348d0e4a
-EBUILD libkipi-17.12.0.ebuild 567 BLAKE2B 9487993a371d02e8e190c52082f6010e88ac23ed10b69274e4b0851dd998d64bc3d770c59f26d5d49a6c7d64200b655410ae26b169426be4f9977d253c6f1ee1 SHA512 03214b853f27f22d012f3636339329da6b2bfab5aa8f56536ee2f1efc675e56ed59c0d3732d43c983bfd42295d0bb392d088bbbe32704bfa79d51a6014577e92
+EBUILD libkipi-17.12.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkipi/libkipi-17.12.0.ebuild b/kde-apps/libkipi/libkipi-17.12.0.ebuild
deleted file mode 100644
index dabed8e1982a..000000000000
--- a/kde-apps/libkipi/libkipi-17.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-LICENSE="GPL-2+"
-SLOT="5/32"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libkipi-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/libkipi/libkipi-17.12.1.ebuild b/kde-apps/libkipi/libkipi-17.12.1.ebuild
new file mode 100644
index 000000000000..a0615d81f262
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-17.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="A library for image plugins accross KDE applications"
+LICENSE="GPL-2+"
+SLOT="5/32"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libkipi-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 9f85700306a4..031f4efa755c 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-17.08.3.tar.xz 291208 BLAKE2B 21d93042ab8ac7e12a9429ea469885c6c3cb94623ceca70647129c8ab5a70b018a9fb663beb7eac02a729f6fb3f2a83a108d79047bc3ed8aae452e2ef15b32ca SHA512 1b077fa9fdb56bd762cec5dfdf21a898de2a0ef24db79c0ae7ec9caa5f6af3a1d67e218a7b25fd879ef0d22a71448b888cdf6036da0ccdb041e1647520dbe11e
-DIST libkleo-17.12.0.tar.xz 315732 BLAKE2B e0804475e14b66508e1b3e12db359a040ae8614cc9a8e56315d9037d1ca9200b7bdcd686433f3d44e41879f878c137e9b421bc07e94b2e00ddd63b77b2d29489 SHA512 f2da7d903f98a7b178a5fbc03e25a6bcd7cce819044d205d4f673bab6f73e289d76870a7357c65c8206f49bfa0792efd5a4d60ea55ab525748abc2ad82ed0f53
+DIST libkleo-17.12.1.tar.xz 315800 BLAKE2B 67778228b4f8dab74768e7f3e2537880c212a6bd8a5f2e77c031f9c0ccc012d774b16afde7f2ebb7a2a03f62f03a8ced07ae5ddfda2abb88138ec15e21c58a37 SHA512 6e1218e9bdbacbe379a82fb86803bbee02344d02fb1ca0a891e3fb9d9e8f7c3aecd8a1d94277b2e2fd12e44f403075af0a3d26f767cc69205f591b0386ef8f2c
 EBUILD libkleo-17.08.3.ebuild 736 BLAKE2B b5ecf7873521897059d6cf3cd9546dbbfb027734b25e1cb970a3fdc2a8c48060d1dc55fa885d339ef224c4f56cdb41fc58ca77bb3dd04bc94cd657855f72ad2d SHA512 7b0b83feedb065322d980a4e4e0ecd4a2c20043048a793e2de4ee7017f77b9b1998e8d04c5f23317bfef72890fbd4e621534fcc46eaf4b4511261598adb8284d
-EBUILD libkleo-17.12.0.ebuild 738 BLAKE2B 5629e2d0b5a333b655a5e904e354ddfeaa22f87396a01a9b63ad0ea005a87e5c0381668cad395a961ab1f59cbdfc8791a14029bd062bf414af6de50762cf0b6b SHA512 918f0a2947bd580cc325dd094b9c439cf826a339dfae1ddfc70dbcc16a8d52556a180cb25cd877a4196fded83214b658ecbfc2aae410b729804e61f20f92a34b
+EBUILD libkleo-17.12.1.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-17.12.0.ebuild b/kde-apps/libkleo/libkleo-17.12.0.ebuild
deleted file mode 100644
index 1de7afaee0cd..000000000000
--- a/kde-apps/libkleo/libkleo-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Library for encryption handling"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkleo/libkleo-17.12.1.ebuild b/kde-apps/libkleo/libkleo-17.12.1.ebuild
new file mode 100644
index 000000000000..c7fd42409ee4
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Library for encryption handling"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 63a168905b9d..3d659a78dff7 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-17.08.3.tar.xz 1685732 BLAKE2B 11c3f4e2a7d773b11d71b7c7247e126182dd5b5b0a9487806e205d2ed76d0086a73b567de945996bb2c06876620f152e582b455188be9935302147f90c3afaa8 SHA512 b3f91f4c8a9f431c8f080888a29ca8c5c1ee9551cf197eeb7236349e5af2570e45681d9d90fabf47448515eb1765da1b1d3e078bf2bd1f4f8383635b1ed0894d
-DIST libkmahjongg-17.12.0.tar.xz 1685820 BLAKE2B 75ef99e78c7542661e2c135a6d16237a91e501b4fc49571b1783edee2c3549af29241408281db8119b3cf94d7fa104cb6cd238e6b0482e060e04f2cdecb833ac SHA512 106670a9a00697eb78781cc176dc629e0fb4739803aaa239396afe1064e1eca4494e4ae33c6d6808aaee901f3d96b52eca856c1d080ff293c2629294c196b09f
+DIST libkmahjongg-17.12.1.tar.xz 1686180 BLAKE2B e98ef4af8fbddd94450b200bf7ac3a031d81ef371df092bc733dc6d2cea29a898c9cfda0d137a2a3fe2dad7255301d1105b446a9f8b00f30f3c51cc355f2bce6 SHA512 c3e61f0a0e816cf9a973dca75645385e0c1404b12ee3f555201d5ac68ef408506b9425d97a729ff252d22284e3b0ac2335827f21a0961d26520c6a010d23949e
 EBUILD libkmahjongg-17.08.3.ebuild 546 BLAKE2B 8b127dc50692d79fb790b8ebe6473f8fa0db04f525083078c19a0d851b54d5bb85565b5ce0c2b5b9ae5030dae81b15d52c54819e74fdc6e4a052c32e129660f1 SHA512 7d4a4a5350c2ee82e7113b1e69991cc85a09b919f860ebd32e7a2d634102223785a2b68e235c8099865c52199cb1687dcdd5dd37712a2f9e17db25f89d59351f
-EBUILD libkmahjongg-17.12.0.ebuild 548 BLAKE2B 16575dc8a40268b6146e3383628fd24ccf26bf6501926547d1e795df5770eeea40ef6a86d03e8ef64d7ad18fa2e58f726f12b9a246d42ce16f80458e04057321 SHA512 110683da161be06e3fd99af7c770b0774f5139fb50851bff8b6d5c4c66934336b56e4123712cb05f498fe17b9d00d91f5b8f6036b609a1a4c179e547f755299d
+EBUILD libkmahjongg-17.12.1.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.12.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.12.0.ebuild
deleted file mode 100644
index 09aab674dfe9..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.12.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.12.1.ebuild
new file mode 100644
index 000000000000..d8054495d76b
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index dad13d1a427a..ff7b2cabdf87 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-17.08.3.tar.xz 176728 BLAKE2B 32f19d3e449e3771b11c5016d8a5167873387e673ff3c022be14b1a097c8b89ecb6bc44c7dab0f8de768dc6d71644027e360c368b45f2204ce8885a62ee3cc5a SHA512 66c69da612f50bfbfbfa7c3067300db0f05cd52f0d5282f89c1c3a06694f5ff2aa3daf60f0c4cf40def201f6f55783acbc77c1ab74aaee30b978ba2825185af5
-DIST libkomparediff2-17.12.0.tar.xz 176820 BLAKE2B 850f28034fe68cffe5133b32eec5c1a8a8ac2a5e280aa1ca6b9235085f62195d5266eb23a921e7b39b270708e1ac608cb0dcc01de18b7ffe8f305e1d4abd7cba SHA512 7d4a7c16078a77e75533aaefe59050d52fe953805c46c3ecd20614e628ee21d7b8ffe2c9b326accfc83b726796a62c7827a92973e45ee4cabe36b59908b9de0f
+DIST libkomparediff2-17.12.1.tar.xz 176908 BLAKE2B eead532065aaeb7100c6c2b49a10a6143bd70096bb9fd4b815c3251bb9e715fda36356f612c6af00822a5dee996bd33c95a51f9561093d5d93e808836583ac89 SHA512 902299ddd99657ef2c3da64df79485b7024371e0687773ec7181f490216535f2ee268210d0135bc7434689f965e615bf0af19bad3f1a8ab5efffd01eefabe8d2
 EBUILD libkomparediff2-17.08.3.ebuild 530 BLAKE2B 2798d96ffc2340818ad06219e9f3aeda03af7d5dfddfcdb8bcff7a8d3df51f229ddfb1dfd4d16bb003104a30eab8835df01e387910a90fa5e1ec47bb993b5e13 SHA512 f898b01a28774e5bd99f70f8cfe4d2edbc6630dd7aef04787842d084ada7c8fc45b0c8cde56b7134953edeab0f221f64a5f33a117acdccd43c6ba3034de7c935
-EBUILD libkomparediff2-17.12.0.ebuild 532 BLAKE2B ace92775f840fcdd98512260313d41df9ef091c3cd07b6959329057e3c7a68761f476c37f3d352c57614e897b52ef2d44e73273943ac0fec875a9465252d2b0e SHA512 0899907873577c2e30aa474eab6c5eb21b7c434291d9b2512c59a60c309fcfbca4842fa033a1bb2bf35bc5be30165fd8907c00adaf19fc77013a411474ea2ef3
+EBUILD libkomparediff2-17.12.1.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-17.12.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-17.12.0.ebuild
deleted file mode 100644
index c9ce71eed9a7..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-17.12.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-17.12.1.ebuild
new file mode 100644
index 000000000000..78b78d3cb9ce
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE library to compare files and strings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 88eef10c1dbb..522af33bbb9d 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-17.08.3.tar.xz 137444 BLAKE2B b3b7e32f4bae04d0d032bb3d28d2b2a341b58c3b7feb59f03ee18a20dc7e22f763b692da41267ee5e625d1a7f937c0eaed689c1f9bd5f5c362e97c07a8abdc9b SHA512 313afff1ef59b5ed2b4139c398c7ceac0737d005857cc34e4cbc8f7859f593259773fd851ebaa8ef64601434d971b5b211e50e4e6d8ce8dcdd3c21a712109832
-DIST libksane-17.12.0.tar.xz 137016 BLAKE2B 3136bc2bf6583074cd43f3cadfed1a5e1a05777114a56cb81abe45bd36f8ffed044e53723aafe7618fffdf701b66c359dd0d48c259231322dbfb38fe00347798 SHA512 853362e2a416b4005935d80b9a39cc3249f56927bed0f4cb6c4981fe13270ebab096747f9d357334e7bb7c42e3cabe608b593dfb427f9bd30aa50afc47922758
+DIST libksane-17.12.1.tar.xz 137112 BLAKE2B bf95d13f4a996212259bf27aaaf2b74114a49c4698efe82146cc00d66ae443ba9d461da7cf09c7a420a219e9363d8f8c6cb3a4272b303615de1134fa7b18361a SHA512 9acbe0e5ad82d21919b4b56ba8f13092dd9edcf6450811f4461fa9eb319a9e06062937ef909febbadd3fd02752438e99fc888fa109ad17d8f67d2a0bb42cf8f0
 EBUILD libksane-17.08.3.ebuild 573 BLAKE2B 71e402cbaf80b9e4468b44128370b457b1af2694257348e025147da4e4625be0e8c6482f3cb4433e9f41e8ba9fd900939ff80e6557313d869d8f596148118013 SHA512 235c0a854aa4efe926958b9c263c986ce2a4037e39393a76d4c74460e0b7680c380bc46b7ced67ee91da545ce791db767d24d48ea8bf02ef0f557eeaba1d9ccc
-EBUILD libksane-17.12.0.ebuild 575 BLAKE2B 5ecc733f0c998a09a97c5974ad3941124502127881487206a0c39636d7e0528c082df60180714cbe3b54f91fab4b0ed1beef9a47ab970a02d98dcb6a80b7fab4 SHA512 87e4983621d5a08c811e2c85cf9d2fb1babb388be445453cd246089b0b6cb18a761797414daf606915c34eb8792f7fe7ea6a4b0add8857ca8259e8661f8b3920
+EBUILD libksane-17.12.1.ebuild 575 BLAKE2B ca5e02a7aff60ad286a079d518cc1d3e6033ea631ecd5518b617f58a315024795504eef97e8e8d162353d8b00e9d616c6faf2683104ae4fa68db2c28197c005b SHA512 e4695fe16ffb854ec2f412c03b5b99c8642737a1a6c3b2cc324936cd406d373a7207c3045304e6401b80481fc91c1ae7f83424b64ada413b359265e857652e29
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksane/libksane-17.12.0.ebuild b/kde-apps/libksane/libksane-17.12.0.ebuild
deleted file mode 100644
index 502a7b61839d..000000000000
--- a/kde-apps/libksane/libksane-17.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libksane-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/libksane/libksane-17.12.1.ebuild b/kde-apps/libksane/libksane-17.12.1.ebuild
new file mode 100644
index 000000000000..605af3a82574
--- /dev/null
+++ b/kde-apps/libksane/libksane-17.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libksane-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 4ee0306f7c94..d9c4279ce22e 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-17.08.3.tar.xz 545808 BLAKE2B 694246b2a449581dc059bef146ae8c6966fe6b2e1335b7c1c4aeacd78ba468a3a1c754094fb7a5a9028f3485c9ed681ba3ec95c05f4bc5f1277d8452137fd29b SHA512 52b671c50c3045da44223424de67965ea15c1b6683be3c21d5aecc63e867c25b4970b0a345fe069749b9747bf8eb5d6f8ba30e8724b8e2def40a2e4b80ac28d6
-DIST libksieve-17.12.0.tar.xz 547944 BLAKE2B 4d8c754eb42c0373a8c3150c8581ada1915218d7a13e02bbd661754e3d1ffe7463ad5389d4f4fa3467e838419cecca4fc270978fdd71893c328f37156201cbe4 SHA512 a2ea5f2a077f05b32dfc4f77a245a528e19c45a6a7114824689b4a0f05ed7f39e294c8e7465e3ca78671f07b09d9754b82c5e604a3c4cb9ceba00c1658186b9c
+DIST libksieve-17.12.1.tar.xz 548088 BLAKE2B de459cd9c3d47847ca14239b1fc81f29e3b04d22877271bc3e0152eff0ba87e0df5037b09c7a21a89b8b19edc035682e55b75f374eba9696e66dc90e4abdec1c SHA512 9131904ed047f78bbd1481905ecfb337435f23b07dd3bf3f9fda0ad4f755acd2152983cca70e3d0bf8b8949d7348ca4d41fa261c1a5bb934cff8d963d734a252
 EBUILD libksieve-17.08.3.ebuild 1533 BLAKE2B e7d3856bf17df772e53497078bc135fa199bdb53813a7e1156999593e74996e727069b81de54780d0795a8d386c3a2c8f1dd54f0db0b33307d9b7f0816622630 SHA512 2faecd5ebc6dbbd4b24ad88434f4dd5bdf4bff974ec0232f570e6a2e5f388d513dd5a501ee40b94b399b761ee6cc7430495162c188eb1c3724d7ea510370c057
-EBUILD libksieve-17.12.0.ebuild 1466 BLAKE2B ce126b22e415b77438230add1abd32350e40551c24e3cd07331e5d243e4c9945496f127d243d28c90d1edb244cebde81893f81b5ca6f6ebe298ad3770f0cbb21 SHA512 87d2cf84a4b5863217187e6049e779231e3b7c9d9a66a12e205294027f6f2dbaee21d7e45b5d597dec14efe16431a4943a1d1d36aa0e22a72b1bcc115b511f89
+EBUILD libksieve-17.12.1.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-17.12.0.ebuild b/kde-apps/libksieve/libksieve-17.12.0.ebuild
deleted file mode 100644
index 282ee87a3cd7..000000000000
--- a/kde-apps/libksieve/libksieve-17.12.0.ebuild
+++ /dev/null
@@ -1,60 +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="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libksieve/libksieve-17.12.1.ebuild b/kde-apps/libksieve/libksieve-17.12.1.ebuild
new file mode 100644
index 000000000000..aed045a2025a
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-17.12.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="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use_if_iuse handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index bf9835c42a89..2476514d5b75 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-17.08.3.tar.xz 300000 BLAKE2B be1a3ae28b5a77d35f8b76d4b00157dfbc90a433ad6b4fc414ef56161a540af35ea0b2b7e4018a798932d66e3053dd43eea30a700d18863b7f932e7f92c2156c SHA512 89f9fdd37716c45d49884b56c81dd6e8e3461b54a2a5d6c5c15d757fc9b070dd5c13d2c76cca546b509652426085bd9d356d4135b27f7e30cdec091b1e292b40
-DIST ktnef-17.12.0.tar.xz 299888 BLAKE2B b574108774aecd706ef383f8b9b7ea6bd36afac474b2520f74307f3b47d024577828431cad1a58b3a597514f4de855fe35dd00f01fb72645b5a9118b860b7f3d SHA512 13bcbee0884f314164838975ee5f235d6d497fe49a1994166b2c39974838f7721e1a1a9b032e861a0b20f650e6f2e3ac8c070af66e944fdd2e2b51478a48c1f0
+DIST ktnef-17.12.1.tar.xz 299936 BLAKE2B a378b049a32ec4bfc943944a7753695d1f32d4c50f28ab37f602c1929b24153b5a2194196e827d5a4fe3578a7eab9ce2cc5f560861de23e72dfda1baf9dafa2e SHA512 5cb402d0ea6ee1db7843c30555f31916f00429723c802a7c37d64a93d52e0ab626f1ae36ac1636d597911da8cbd4a4860b39b0e98d668f20bfdf55546d89463a
 EBUILD libktnef-17.08.3.ebuild 465 BLAKE2B 430eac8163868861d5397302a80a0fa288e27c360b22c58607cc5fef01ee25f430d1a352d1b8874060386efc40d58c1525994ecd8fb1a4995e1b0754e9c8a5c1 SHA512 9180b41fceb1a71c55a3e41bbf4cda63143c964bc691fc9300cbdae182b7b0fbf1a14b8e0c0fee66c55fcd639db2c2235b7c1c7b924daf6097b1af2755b22c8c
-EBUILD libktnef-17.12.0.ebuild 453 BLAKE2B 4b32a31b7f03234e8c6076c5e74d51cf910ffec272e132f0139dac9c0813457e8186c2548d876a3619c3e2f17617cc97d4ab4feaf577931211e83a2b188e7225 SHA512 ff07f11f6633f268fa8defc13a68dc150907e11948586a5559f0952efc56c691051152fb786d35d1c8b9f09299d518aedee76e9fedf2d7460ef8bb73b9dc9bf9
+EBUILD libktnef-17.12.1.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-17.12.0.ebuild b/kde-apps/libktnef/libktnef-17.12.0.ebuild
deleted file mode 100644
index 3e2f9fd7b7b2..000000000000
--- a/kde-apps/libktnef/libktnef-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-KMNAME="ktnef"
-inherit kde5
-
-DESCRIPTION="Library for handling TNEF data"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libktnef/libktnef-17.12.1.ebuild b/kde-apps/libktnef/libktnef-17.12.1.ebuild
new file mode 100644
index 000000000000..bd9497e32c2e
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+KMNAME="ktnef"
+inherit kde5
+
+DESCRIPTION="Library for handling TNEF data"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index b2b0b31590aa..b2cb0cf40306 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-17.08.3.tar.xz 2214924 BLAKE2B 4715c0fac043c1a58dafc1edb77720a7219aa83f71f899dd189a9a39a0932192ef8249ed8685ad2bdb1a9b22cdeb386c2324cfc1063aef21ff9c36f247391eda SHA512 536fcf1085e55b89c5cf3f945d458d93f953fbbcf22436cc77ecbad90c1bdc2c263ff3fb4f9b6e365ba394814f0e3ccc4dbdda74702f8cab01da11470e386d8d
-DIST lokalize-17.12.0.tar.xz 2219628 BLAKE2B 18786d132e06a8aa9180faf84da960d344212b381ac5626244970d5b5bad16bc1af754d2ce963d20d7703c431e9b14e9dceafade41b14854c5c83abe80c1a1ed SHA512 d20f3fc49d52d0141bd37ca3ce99a4991c1a605a6ce12bfc80cc8df7ffcf0e018972ecaf792cae2463691b311cc29832f768a55aacff9e527dc2ca4da475ba35
+DIST lokalize-17.12.1.tar.xz 2219776 BLAKE2B 89fb56c4f7ad55e1da41de6873776afc32a6b9925d19b984dd6c66ad9d2cccf2bb695270ac96e61f5eb80351f1d695c8f74a5a539e912841c8c252dd88ebb27e SHA512 a06648303b88331da1e5def919790eafafd3c58fdbf74583b9bfeba704f7449718e9f66cbb6783ee3dc7f68d29de40c10cf189436f138c1d6bf82c6b73fb8a79
 EBUILD lokalize-17.08.3.ebuild 1550 BLAKE2B 470c0d3b1448da22d472d0b046552dc798d8dfc0208f3182736d541d274125160cc38ff9013b78b603303fbb074f818907c520777f3db9cc2cc27637198c9915 SHA512 d41d8cd4d06e2de04f5d38d0b1d12a737d55fcca76b8195174b14783b94ac0a4f6718b2ee8e6f50a94de3f2fb01cae72b3275813e7e86bfd02ae0d079eeb5b71
-EBUILD lokalize-17.12.0.ebuild 1552 BLAKE2B dba6e0cadc1f35d75f303f99377f84e11dece92ace6e10ca97e6fea7b67e6c6241f25f031ef940d3e3a43caccfb872ca335bc6510b55c51d8c72fc8eb2dcc15b SHA512 85e28582667692823063bc1c68e713257b3e330aaf84202fb1e3a1a38d7b74e638c6c44c3dead99ca1d79602326f172a97485d3a4196b194954983054ff6a959
+EBUILD lokalize-17.12.1.ebuild 1552 BLAKE2B 5fd2fa07b79bd14d84b1eb525ad1d04dc357be540ff52a356d5cd33744e5c23bfea188ef818a3633db66fbfc531bfa6acdbbf5b3244adf7471ee1a5c0eee148e SHA512 8b9dcc64a7c528484c1dfdb6e7a5f5796b11f7795786c62036a4f5b7abb7feb808180bc3d84acfca540a1f5213e20ed8ecffe470cb606bc31f8f243bbcbf39a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-17.12.0.ebuild b/kde-apps/lokalize/lokalize-17.12.0.ebuild
deleted file mode 100644
index 27b66cc3ff9c..000000000000
--- a/kde-apps/lokalize/lokalize-17.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://www.kde.org/applications/development/lokalize
-http://l10n.kde.org/tools"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-text/hunspell-1.2.8:=
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}usr/share/${PN}"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version dev-vcs/subversion ; then
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-	fi
-}
diff --git a/kde-apps/lokalize/lokalize-17.12.1.ebuild b/kde-apps/lokalize/lokalize-17.12.1.ebuild
new file mode 100644
index 000000000000..ccedc7183012
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-17.12.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://www.kde.org/applications/development/lokalize
+http://l10n.kde.org/tools"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-text/hunspell-1.2.8:=
+"
+RDEPEND="${DEPEND}
+	dev-python/translate-toolkit[${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_install() {
+	kde5_src_install
+	python_fix_shebang "${ED}usr/share/${PN}"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version dev-vcs/subversion ; then
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+	fi
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index eccf9ab72c65..457dc5adb947 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-17.08.3.tar.xz 1215888 BLAKE2B 790bc4fe6f448d7928014d0c440e8bd87db1f896f19c0faa1b76a93723f7def6e048d06c550b4cf2aaf32274bd5e371b2b69049e2d9517cbd56efca0bd82eff9 SHA512 9e966cda37cf03b377d4ac3c5b71098169a15d1c50cc60d4954dc9aee6620898709e6fe5dd33af38ca31f02ce1ffe2ee0e4bae6551d25da55f7121d0751d9088
-DIST lskat-17.12.0.tar.xz 1216308 BLAKE2B ec12724c647c09bd660bd1c17e3e1fbb1fd445070f1ab4b72d5a97557c18f03cc0d0eb4d338ee9a17b679afe481e3a913ee8dee39fcac5079507e5f8dc20b93b SHA512 cf4d757ebf2a9d2b73c37cf0a2198b7d0729b8c5ebf96acd86cec8fb4e300b2898dd624d857e40442cda82ff9e9ca3752845da50edebbb20f8f44def8f6960ec
+DIST lskat-17.12.1.tar.xz 1216100 BLAKE2B 64e954c5256012f8639c9531ac1def3aa9a2ded99c18606453efbf9b470485cb4042f28295d169f50b5ed6c39657e1f57590e28796a27dc45b5449749c4c223e SHA512 1f0a11ee4098758717d26f88d149864d56931ad4025a674e30bc26f807c3ea40f8eea3b8b0b960ab653d6f25d42d92058944ea5f7772e6bbed1b97d11fdbcca6
 EBUILD lskat-17.08.3.ebuild 729 BLAKE2B eabe31f158e83a31ebe5e86082a1f8d5426ab9d837cab0001e2d83a3f36cf4787619989a1ccd156c7bc7ffc7a165abdd1dfcff86af3a70a771b986ae8182bfa9 SHA512 e7474b480165dfce91552c11b127f0baabbb06635252f29d5d2e043aac05eb14c0c773d44b0eb16fe9ce7d5d9714a21f0259e4f42770420f022564dc7525d56b
-EBUILD lskat-17.12.0.ebuild 731 BLAKE2B 0f270c9052ddf9932664be58c4e94267f3747de5b19d94978fdbea2ceb3ee5d5c2453181df68daac574f9c3ae8a911c207ad58f087221e61edbcddb00c20458d SHA512 c49ee4545989b0e32fb21c8a17f233af2dd4aee0f019eb8b2f268ced6cd211deb42da63385726169ed032843f111196a92aac6ac5f761a97396a61a31660f258
+EBUILD lskat-17.12.1.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-17.12.0.ebuild b/kde-apps/lskat/lskat-17.12.0.ebuild
deleted file mode 100644
index ff880b2577c4..000000000000
--- a/kde-apps/lskat/lskat-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK=true
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/lskat/
-	https://games.kde.org/game.php?game=lskat
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/lskat/lskat-17.12.1.ebuild b/kde-apps/lskat/lskat-17.12.1.ebuild
new file mode 100644
index 000000000000..ca1d75ae4777
--- /dev/null
+++ b/kde-apps/lskat/lskat-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK=true
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Skat game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/lskat/
+	https://games.kde.org/game.php?game=lskat
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 81a769976e5e..bde0af53ad43 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-17.08.3.tar.xz 657612 BLAKE2B 9816c21b706b2999d143b4a2c003188caf21df6eb5297e1b9176b7086461bde00ba30522d601793e934be1470a2c308e326273c916edde0d02dbf04075e23c52 SHA512 b6b35cb5b7342ffcae789c098bc3c8593f8139d2222f7957da4691c3419c2d0468f7d0e503545d299f54619f8ac9747b9cf674cae760f878a609c78170e7bdd9
-DIST mailcommon-17.12.0.tar.xz 685200 BLAKE2B 79d3e1a744092daa9b63e022f3e8f2148fd10ff5f58e71da928f3f1467cee4a6016e2012c48b38209d81a9b9669fdadc2d512e1457425f39db57da31a1348f4d SHA512 070e562b563c69f344e635f3969b75d14b7121b36e4603d5154e97f134444d2cfda0a88b9e5ae1cacfa37cce2cb3b78bbdc7595ded3ad9540506d323f12da221
+DIST mailcommon-17.12.1.tar.xz 685204 BLAKE2B e9fb0b78eecc76b1b1b844e8a1f43655b312bb0c644be769f59175734389bf5028c7cd82812335106f520d883d24dc1d45f9f986d6892c08dd306f495bb22c7f SHA512 7f29908d492a0c4a35cbc8010ea4989f2ec39ccc35fd47fd6f0acb4d8f0e01edb37e55b3f49c4f267495a567e76a34b5fa92911cdd1ba4193eb6d988b4de16d4
 EBUILD mailcommon-17.08.3.ebuild 1396 BLAKE2B 2e7c2788576a7e62440b10265142849b937575f4ce7a0ed0fbf6b697ab89e22fbe36e9ae48589ce28e9caa683f327d9a94b03fdc91cd32b6ec413d7c1ea9d845 SHA512 743566959269291de0e76e87b9af24163f20a543cb124e2c0386349f0419997f0d42e9fd8b01cb194d8b21060fba3ab82437c55095115d594ecb7db0c815995c
-EBUILD mailcommon-17.12.0.ebuild 1441 BLAKE2B 485aec14c0ad183e89806c223d4889f60ce6e7709596de738a9d8330247fbe8c2e0ad462ab308c31f4f2a0978e36d6fa7c00298cc5741df3c97fb3405e92d5d4 SHA512 a0e87d0acd7cc9e590a3355c3b360626152f9d265c9dc12d61ec0b8aaedacfa5ecda5592b1b93eaf0a50c760136bbdba585952d608de46f9793c4ccd83bb9829
+EBUILD mailcommon-17.12.1.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-17.12.0.ebuild b/kde-apps/mailcommon/mailcommon-17.12.0.ebuild
deleted file mode 100644
index 49c76b2f874d..000000000000
--- a/kde-apps/mailcommon/mailcommon-17.12.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common mail library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-17.12.1.ebuild b/kde-apps/mailcommon/mailcommon-17.12.1.ebuild
new file mode 100644
index 000000000000..22fe87d28fff
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-17.12.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common mail library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index a7392c9afbb1..03fa5f8faf6f 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-17.08.3.tar.xz 538272 BLAKE2B 45b08afbfaad23d404aaaf7df87fb6dc24c229344b0d5111aa66a52ab6a70ad70559fe868005154e514d0fb5758def863d377d0987adf06a9ed18eac31fa3739 SHA512 987f2745c9c2a6b14ecbae1ad52dd72ea13fb580668e30e9265ea69eee5f36b6d6b6b5a81a8f51666d1d401be61c5a2dbf0bb8e8c98dbc66ea2f8ceb28bdb1b9
-DIST mailimporter-17.12.0.tar.xz 541252 BLAKE2B b1441b64b19083c066b51cd979d4e7da4124bd049725649918551037414821e684f9f836d03ed5c59160e466dc49f42c61af7b23a0a06f5021af71596e29e475 SHA512 2f78528e213856296d849c1708b7bf0ce84fb82fd3b205b81a33260d9bf65dad1bd593d683921688ffcb067eb35a0db962b2794429134dd48554e9d67b5ac680
+DIST mailimporter-17.12.1.tar.xz 541296 BLAKE2B 9f80522e710b381c4ca6bb9bb8e651fdbe022da4be25b1b36627a13e732c850d8ec6ebd72335291f2e2cfd8ed56bbf10fbd3ca98dcc7dad23639f8b4dec4a5e4 SHA512 423e87e3235b0cf1cc5dce14bbe1da5508ab5fa79872e1582f29900955699e025003fc192f1298d0c1d60b382064488b370bd2a423bae7ecd56cc8bdeac857da
 EBUILD mailimporter-17.08.3.ebuild 652 BLAKE2B 575bb7e7bb41544b59eeaed72b27f5cc080c313e73c4f87b68ca1b2ddebaa2bd6811d527d5bd9650b8fc13480f48418a0cf88b70f63372757589bd8acc3e9f00 SHA512 d8e5c1f7c242e4dd9f492e82310a4c55a705ba1df2331b96b30b459d9b232eb8abd083ac5a6669c052a4d37cd9303529b1d15f0efc1b88f87421f1e681892227
-EBUILD mailimporter-17.12.0.ebuild 654 BLAKE2B e0a6a1f16534a8f8a0b226eea73f8c3600439de93c1778442b5f002b056c7b0c561a1ef498742f44b258d0e2fafb982234d06e5f4d4490c08ae456cf560eea6f SHA512 cd517710e935fa6dd2c1f7b4e5f2cd9cc59f5284ea5f7f496eaf8e21b3b0fb5b9bceedd55ebf75a49cc8a6e0a5e4833262191f09e971132e896296800ce34cc0
+EBUILD mailimporter-17.12.1.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-17.12.0.ebuild b/kde-apps/mailimporter/mailimporter-17.12.0.ebuild
deleted file mode 100644
index bd04b0cc3902..000000000000
--- a/kde-apps/mailimporter/mailimporter-17.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to import mail from various sources"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/mailimporter/mailimporter-17.12.1.ebuild b/kde-apps/mailimporter/mailimporter-17.12.1.ebuild
new file mode 100644
index 000000000000..948285cee867
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-17.12.1.ebuild
@@ -0,0 +1,30 @@
+# 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="Library to import mail from various sources"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 582fbeee1243..1bde4cedff4d 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-17.08.3.tar.xz 52280688 BLAKE2B 915e7358d1dcbe25cf480a6c4e602a4bbdb866cab1391469823c9e910ba8165ab408e0d159a804230ca55e7bc7e42caa890a8c01d0d2182a9dbd41b94d430ee3 SHA512 9991dc9137e63462ae7d6086063d07d6012a22c4dfa137209517010db1f71ea5c7a494600d251f63b73a54943fbcfa237f1fdc749442dadd399a5717162f5e1d
-DIST marble-17.12.0.tar.xz 52352880 BLAKE2B b95bd0949cd5170f94ba3aae3adbf7b439e14b912de107a1f4ce8fb70dbcec7e4a472262aaa237f254b3edf86a18a2d02b0eebfac0528bc78d002cba03750d6f SHA512 f899387d5e5ab72e8b76970fca19e73cdb7101c756b03f7aa8253a270f130c38eac8b4e4d145869d16cf7fc25c954be0403b4f3df2751f1a73da1bd9d2de0473
+DIST marble-17.12.1.tar.xz 52353260 BLAKE2B be00effd0ee2e278caf628fde50816ce3f3782988a834dfbbe1524973ea69ea06bc36fc4653859d673f2184e567be1d24424c5273fd127f9c9b56ab574ac5a0d SHA512 38bb2155a9f1ce7ba5b7bd47aef225c8d484a72db37dc23e0afa3730e9943dc57b47409a2fb12126ce5ab2bcb413ef08b484b520228206b7493cd37f2223feac
 EBUILD marble-17.08.3.ebuild 2246 BLAKE2B db0c96ada76ee661bd3f127188e9ea89a2a5c672f234b02eecf94da24442f1105ae7cee6aa6403566cea8add3f0d4e40e9fda89a4d4ace5b753636213b6fb0f2 SHA512 7317d5a669c65df1c9acaa2a7219ef53c6299854f7376989626f5efe48a6fea3e700173e69a24f64df946ca05069d6a538307a1548d81eaa5c85e2c408e84f11
-EBUILD marble-17.12.0.ebuild 2248 BLAKE2B 9d72cb86f1924c74ac9d78193f619f488babfe5f8712f1543a88017ca6d8f635eaec5d4ea93ea87024204f22ae723d136bf19a50a9f2deff7e67465eae692bd0 SHA512 d5d90f9125e0016ee7c95e47226bc6c124e9b32bea89c7b9d503bfe638f625abd26f64d26e6448f4be4fef3c367dcbad6245569da0dd970c72b67111bb56d749
+EBUILD marble-17.12.1.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-17.12.0.ebuild b/kde-apps/marble/marble-17.12.0.ebuild
deleted file mode 100644
index 10601eab2609..000000000000
--- a/kde-apps/marble/marble-17.12.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-RDEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	aprs? ( $(add_qt_dep qtserialport) )
-	dbus? ( $(add_qt_dep qtdbus) )
-	designer? ( $(add_qt_dep designer) )
-	geolocation? ( $(add_qt_dep qtpositioning) )
-	gps? ( sci-geosciences/gpsd )
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kcrash)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep kwallet)
-	)
-	phonon? ( media-libs/phonon[qt5(+)] )
-	shapefile? ( sci-libs/shapelib:= )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
-	aprs? ( dev-lang/perl )
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
-	if use kde; then
-		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt \
-			|| die "Failed to disable marble-qt"
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package geolocation Qt5Positioning)
-		-DBUILD_MARBLE_TESTS=$(usex test)
-		-DWITH_DESIGNER_PLUGIN=$(usex designer)
-		-DWITH_libgps=$(usex gps)
-		-DWITH_KF5=$(usex kde)
-		-DWITH_Phonon4Qt5=$(usex phonon)
-		-DWITH_libshp=$(usex shapefile)
-		$(cmake-utils_use_find_package webkit Qt5WebKit)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/marble/marble-17.12.1.ebuild b/kde-apps/marble/marble-17.12.1.ebuild
new file mode 100644
index 000000000000..428bed2765e2
--- /dev/null
+++ b/kde-apps/marble/marble-17.12.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SUBSLOT="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+RDEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	aprs? ( $(add_qt_dep qtserialport) )
+	dbus? ( $(add_qt_dep qtdbus) )
+	designer? ( $(add_qt_dep designer) )
+	geolocation? ( $(add_qt_dep qtpositioning) )
+	gps? ( sci-geosciences/gpsd )
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kcrash)
+		$(add_frameworks_dep ki18n)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep kwallet)
+	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	shapefile? ( sci-libs/shapelib:= )
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+DEPEND="${RDEPEND}
+	aprs? ( dev-lang/perl )
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+# bug 588320
+RESTRICT+=" test"
+
+src_prepare() {
+	if use kde; then
+		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
+			-i src/apps/CMakeLists.txt \
+			|| die "Failed to disable marble-qt"
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aprs Perl)
+		$(cmake-utils_use_find_package geolocation Qt5Positioning)
+		-DBUILD_MARBLE_TESTS=$(usex test)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer)
+		-DWITH_libgps=$(usex gps)
+		-DWITH_KF5=$(usex kde)
+		-DWITH_Phonon4Qt5=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		$(cmake-utils_use_find_package webkit Qt5WebKit)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		-DWITH_libwlocate=OFF
+		# bug 608890
+		-DKDE_INSTALL_CONFDIR="/etc/xdg"
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index c370d489c7a0..ad58c2a4648b 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-17.08.3.tar.xz 33032 BLAKE2B 6d4d2ece24f5581f09d2f45afebbdc961c268a1926de3c322d8073c84e59be48677377eb8c34f352f7e2deb05e1aee127bc2840faff3a5f0c17f13d61425a979 SHA512 6b5daa7800aca63cde814464b9471eb14cac76112a374258644cbfbf0cb16f5777ed27f37c4a3f22973062fe9ed65d92366e77154ec106a4a84c9d034e8d9b58
-DIST mbox-importer-17.12.0.tar.xz 32952 BLAKE2B c5ad38bf3059edbe5a889bd574c76dcf5cc0cedb939d2f34d920891563f6df00e137531d090c5af818b3f1ea89a8f1a9648c7e64d5a2255c1b49822177d9f0e5 SHA512 cda12fbe39e61aa7fa43cbdd5c49c73003574ce1cc38e071104b4202c784f232447114142e39af9c7292252587594fae894fbe51af9d2d1637541a38c2bc264d
+DIST mbox-importer-17.12.1.tar.xz 32904 BLAKE2B 4ac5c610161d0b22a7d1cd06f0294907d24b0b9d2bc841824311b991c61d6366dda8d9fb6a2b9bac436a11f016b242781105fa45d1ffaf4bc0faef75f40e4fd2 SHA512 cb1a02f67693360831af52db98fbb6f9ca4db8d46b3b0df30d919087f993ad2693dc4d0d902235dd32db8dd596d7eca023a3c08a1703a75b1ad062204cbc3e9f
 EBUILD mbox-importer-17.08.3.ebuild 825 BLAKE2B 1546fb5aad8d08474af21a3319ea0036d3a617ab087b293dcc71696c5b0e59f65a5bc9c3c4369f99d19587446109f7d8c34676951d4ad895d7af2ad10456fc32 SHA512 acf89446d56f7893587c791058e6557880035ed87bfb010fe37b596a7e06dca1fb5e1f4f9b9711c0f881d9798150499496d6452ae4096f3057b42375c2b489bf
-EBUILD mbox-importer-17.12.0.ebuild 827 BLAKE2B 8b2527bc24e1b6ec3b24e6ff12637f8e2a663991c765ec935fe66da57e4930c9d00afbd5099d50f3b117795db408dc7323119ecaf608101c6eb2063b0cc150ee SHA512 3078c51c86ecc0e49ab1c996b544a1d7a89c6e77a96817fa9b3faf38af31b331449fd7236bbb8c942e7d482dd8400ad7156bdb7f3af692e13cc4233b5f2d6d95
+EBUILD mbox-importer-17.12.1.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-17.12.0.ebuild b/kde-apps/mbox-importer/mbox-importer-17.12.0.ebuild
deleted file mode 100644
index 907f2b5ce945..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/mbox-importer/mbox-importer-17.12.1.ebuild b/kde-apps/mbox-importer/mbox-importer-17.12.1.ebuild
new file mode 100644
index 000000000000..7e0ab68ff2a9
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 1a8937de7139..ab543d639bc9 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,6 +1,6 @@
 AUX messagelib-17.08.3-richtextsetting.patch 1098 BLAKE2B 45a3cbbff333616d1de0a13042482d8bc819d5a8d0ce910739aae4265ca32847355024e84c5029372aee1ddfa2ddb2fb72c6ba5f2fe1c61526aa69d5b567a3dd SHA512 120c7c850947b777b682e56cd24b267344b0434e5dc7f053ba64b55f91f5a5d6f053c2b5d102b9ab80b30e5497256d50dcff34892aa9f4bab33d8dbad42f22ed
 DIST messagelib-17.08.3.tar.xz 10463496 BLAKE2B 612672462e77217555fd48e7038e727d8115d1f151e82720e2934f2c98ac3012abbb3e1402befa4704fbcb7234b604f93ad3d1af4fb853e3f7173758240c6f12 SHA512 572dbb06aec537e224bc87a7863cec394664969a881f98b065d13a6690e908b7d026bee61f49114bc6f75bc5d4e219cf2d1d9420b6d55f91a14e55595f78904a
-DIST messagelib-17.12.0.tar.xz 10490688 BLAKE2B d1fc979e0860f6aa2629b6196f002ce1f12f1209292d396d3f4269e74848a384e4e6001e7fee9e931130627e75581f3de220aec8c85e7d308ebb725afaac2589 SHA512 95b89ea154fc408f52f9be5ec233cb49d972511a1b5fffdc913fe99dcb2b9d4f4056ea7882e1e855d9fa8130e271a5d73573b8a671915659dd2b445945921193
+DIST messagelib-17.12.1.tar.xz 10485352 BLAKE2B 85da09eb98885bfe8e20e41b0e768882c734dae7c8d3e629bfb4654608d041fadd1abf5195cf02282e5f9e111972380d713bcbd3558c37457520a2c309eafb9e SHA512 86a7aafab63119b68231f5d62e463bf3d5e9fbb2d447f44d8a170a674f67f934b626edddfb3db75338150504180052c39db7df9464d1c88991da2256138a0bb6
 EBUILD messagelib-17.08.3-r1.ebuild 2057 BLAKE2B 9628cbb8c6ea65613e1d95621e19890144a677207cdc741a03cf9c6f854127039d063b4bd2dab194db0055886ff5ad78d74bff20e66024de7784deb588b6b9bf SHA512 25698507fbf9b6b1bee29854fcd32542e1344560df2c67426352300aafd65c12c8c546c9504d1941daa0cff581d7b88876aa71ff408173f8453a7a7cb37ad8e3
-EBUILD messagelib-17.12.0.ebuild 1939 BLAKE2B e83e2fb23a95f4769135cef1db8b3bd979e2bef85d823dd1da53ee92b403e22864ee25f8a4d022c457584dcb9a9d35892620f20f4a327e4cb51fbbcca7dda83e SHA512 737471cb6f8c050026229d2ef7f0b24dc09a0b990e8ae610ff809935b12a905ccb22ba9eded90397ed995cb2c921d462eaf945f934709b634413e0ff5191955e
+EBUILD messagelib-17.12.1.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-17.12.0.ebuild b/kde-apps/messagelib/messagelib-17.12.0.ebuild
deleted file mode 100644
index d21e502fe036..000000000000
--- a/kde-apps/messagelib/messagelib-17.12.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 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 for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-16.08.50:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-17.12.1.ebuild b/kde-apps/messagelib/messagelib-17.12.1.ebuild
new file mode 100644
index 000000000000..2c9ae95e4387
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-17.12.1.ebuild
@@ -0,0 +1,70 @@
+# 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 for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-16.08.50:5
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 260eda4038ca..25625d256002 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-17.08.3.tar.xz 27852560 BLAKE2B 1e1a0966493ccec052de9ddf4f8b5fb188495f051b74aa7d005ef91a3ee7862402b6a741f9d04c291aab64f1369aaaf00422c98aeb5d69d5b73e885de81625d2 SHA512 bea19e3e661235b5d2e944d260f3dd00cc7caab5c27887e6f6aeb785e239e2bab4dbe2aed34bd363e69462b2cd806f0dc20e54b1bbea6ca02aa9bd7ec53790c3
-DIST minuet-17.12.0.tar.xz 27853624 BLAKE2B a8b0a6d7ed5090d1f846ec2f29bcdb5f5cb49c76bd004db1e7c523d8b230a786aabc10b9100b84b9163b34eeacad2961123e8caffcd01a152df69a3ed60f5ebc SHA512 31921cec9245bb42cd9bf4ce4aede5bd18626e0f16a56f2353db1bd70cf9b21f0635cb624785ef285814025676694a99e25db67228c5ecd40bfa87e53661c55c
+DIST minuet-17.12.1.tar.xz 27858388 BLAKE2B 60cc913cc42647eaa379eb30401346445c26dd607589d6371b87bc3a8155e095613c1eeae6c25ddb04648d6a98907df021131c8eb4419d8e9a8ac468120f8b15 SHA512 dca62267c3cb87a750046dc321045b330e4dc3ba5f51e17285d1d32a8fae03c678d218283d7912aee16d5fb749cc3e8cae8d842136d7ad3c213590a35d1b0597
 EBUILD minuet-17.08.3.ebuild 586 BLAKE2B da94be4615f9b2849fa40945d21cb5380324a8ed5a133efa2cbded0dfe15e91db7c14fba8424bd62e0199fe2ddeb3a630066f6a654404010dcc8d005e4d68718 SHA512 6a4cd1a8dade432a3463feea552d049c08da3537e4efcbba25359cf99637e926a1491a164fe3f77e554a905350f1fac16ad12b5c6611ac800d3c3a90e9420eec
-EBUILD minuet-17.12.0.ebuild 588 BLAKE2B 7943f127552b4c1d8894c40d7384bb6593d51823e4bf2f0021433b6e62da7335db39621af47d3e5898dc71752c5ab529855556fd29514d55d855d731adc154f5 SHA512 0a8cdaa4b128788779dc56f187165abaf47a20ef99b2333324416d23c2161472d551e19b4bda679c0adc61be08a1ebcc6f3eae2273fbc92e1172315491df4a8e
+EBUILD minuet-17.12.1.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-17.12.0.ebuild b/kde-apps/minuet/minuet-17.12.0.ebuild
deleted file mode 100644
index f6381cdade9c..000000000000
--- a/kde-apps/minuet/minuet-17.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A KDE Software for Music Education"
-HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtquickcontrols2)
-	media-sound/fluidsynth
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-"
diff --git a/kde-apps/minuet/minuet-17.12.1.ebuild b/kde-apps/minuet/minuet-17.12.1.ebuild
new file mode 100644
index 000000000000..c0bd89a53dfc
--- /dev/null
+++ b/kde-apps/minuet/minuet-17.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A KDE Software for Music Education"
+HOMEPAGE="https://minuet.kde.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtquickcontrols2)
+	media-sound/fluidsynth
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+"
diff --git a/kde-apps/okteta/Manifest b/kde-apps/okteta/Manifest
index bd0139ca852e..ca2e8de347f8 100644
--- a/kde-apps/okteta/Manifest
+++ b/kde-apps/okteta/Manifest
@@ -1,5 +1,5 @@
 DIST okteta-17.08.3.tar.xz 962236 BLAKE2B c17022a0bc449c92a281d928e7f32b7d31fc5c2fe2325abf572a84563bf2f173bfa838cae9da99e1aef52a9271ae9fb67654c29abce8409391c4c86c88c84137 SHA512 47517531c9e780c94f81325e0ce54756e85d9da8f38372904ed43c6eeb29c824afab66159a0f1e3648553544edd597138678983b74442fce65cdeefef14190ed
-DIST okteta-17.12.0.tar.xz 962836 BLAKE2B c5569a30ac028e83de9ba15d146ece10b283b61087729d41bf2b957254bcb01d5e40f25312365adf7e2c85ac054fdcc0d58c7b0a034c3224a0a1656e9b8a3cc2 SHA512 aea27da1c79ad3a230aadcffe76611ca38aa37b277ba4e3293d525832f0f849ea4ea444181947158a240604ca9633a902887e3d5b8be9054c72e4b7c266b05e2
+DIST okteta-17.12.1.tar.xz 962940 BLAKE2B 7530a8cf4e427fc57e258e89b4c591ccf64a128d34c0b1c324153fbc2ca811f0ecd6184fc82ae4d0452ce9c6f81248ef90cd488d2e46e438f5ff5d2a31d196f3 SHA512 229ec2803a95dcca3ed207caba5b231dd37233a16a3d5e331a6b29f43f2523ad5c83fa0789c5853dbfbc83bf50d213dcccb6be7831e85eef49b4ea4e35f58ca3
 EBUILD okteta-17.08.3.ebuild 1401 BLAKE2B fe633e5a2c91fb9c9da2fca04cafcf4432883fa499f8453a253317fefffb4afcfcf4556046821ab4b4ef185bfbc3b1ecd41bb312a7cad7679ab03e32d5fc21c3 SHA512 826ac7c7b32a9a29b44c80101fc6656b1005758d66af1a42306860363c885b34201f78ae8619f0a15af672ac60cd0569cd76804135cd09176559f75b0a18e10e
-EBUILD okteta-17.12.0.ebuild 1534 BLAKE2B e7acb70b61d677d1a98d62a0e16f4d11f5ec91252fcd1ead0da26172bb7254135ec6ed7d62e6430134d16ba0216add443b07e075a3a7705bf2b80ffe6475dacc SHA512 a02090d697541aa79f2c5054f3e1b724c99435349d01a0671b42761306760b507d8044e06ca7c613720583d16cfc1aae9bfafffef2d45a4f745aa029065f8df5
+EBUILD okteta-17.12.1.ebuild 1534 BLAKE2B 0d21c34f9c76b882028a453de2536fd31a5addd54ab6f8e7b752b14943687cb1efffa7b3a4e0e9a9d633209be7fed6a59fc236ab47fdcd76b2055a9ea52cbd1e SHA512 73e7a0484b9f51c8e3d0d81b5e41e2ae63ca26f0e5c4f0ca6ad74b8df973e04562b5f6042d0bb229fe1309a8b02d1c109a27e548fff6d48ee3cb6205e4353754
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/okteta/okteta-17.12.0.ebuild b/kde-apps/okteta/okteta-17.12.0.ebuild
deleted file mode 100644
index f8228105a183..000000000000
--- a/kde-apps/okteta/okteta-17.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE hexeditor"
-HOMEPAGE="https://www.kde.org/applications/utilities/okteta
-https://utils.kde.org/projects/okteta"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt designer"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	crypt? ( app-crypt/qca:2[qt5] )
-	designer? ( $(add_qt_dep designer) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package designer Qt5Designer)
-		$(cmake-utils_use_find_package designer Qt5UiPlugin)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-apps/okteta/okteta-17.12.1.ebuild b/kde-apps/okteta/okteta-17.12.1.ebuild
new file mode 100644
index 000000000000..6c85fd84816a
--- /dev/null
+++ b/kde-apps/okteta/okteta-17.12.1.ebuild
@@ -0,0 +1,62 @@
+# 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 hexeditor"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt designer"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5] )
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake-utils_use_find_package designer Qt5Designer)
+		$(cmake-utils_use_find_package designer Qt5UiPlugin)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 5455bc38d366..c7ee6c5b50b3 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-17.08.3-cmake-3.10.patch 1615 BLAKE2B fa352ae2212f04ce20968fcc54906eb6cb96708d076c2a9e2b9ba95a8aeccbceedbf131b698d07e7a391e3e8ccbbb85422cb8937731116348f16e5163810e605 SHA512 2f06c6b54bba5241b3d5b72724363b3acc5554d314ea8bb5d77b0fd28963283cceee1c81627f6701ba2afd8e88f1239a14b05fea7271148bde55e4bc6d93adb1
 AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 DIST okular-17.08.3.tar.xz 5618588 BLAKE2B b9f36211ba2620bcd984e715c37112d92f56c0f8d1d1298d54db3092fe205ac4abef18cf64756b81ac20e91fcbfe6dc18fbe6de682cc71caf0f24be4d2b7c15e SHA512 33b8f1bbf1f4c5814b6df8bfd87a3deccc762564f312729a50956c85fc95f1ce9f057a8b43b51a368a3f0c2a4d9705dde09d1e575f7325ae32420c0106ce28b0
-DIST okular-17.12.0.tar.xz 5718956 BLAKE2B aaefd5dc57ef63a0fa968ab8b1e3970199541dedf01c8864ebb05dc5aaee62f666d2150767b423f83cadff355174440b06c2e84c5e5e016f098d38febf1438d2 SHA512 f1b53fbbbc5cbb614a5cb3410c7c8749b785d140927c34a0a52864b44635b09094a4948589b8dbe019e4f34e4a369e0e4e0c0ecd057198a0f6acdcba8e131d1b
+DIST okular-17.12.1.tar.xz 5720272 BLAKE2B 90407129339939619e8c06cf02e0dcb933d64e7e0b07f42645811fb99345575498b353179b693ba464b33321ded73b82ca05d47962a5012383d9fba5ab49b8ab SHA512 875254e9a7e7832535f832900b74628db72c60dd0e49ba171aa5e1d5baea3cdf593148d693d1fd986cbe99f2b0519ab8c1b357d98d2dde846f128d9729cef614
 EBUILD okular-17.08.3.ebuild 2545 BLAKE2B 4c5ea67e0e889c61c6fc140e7481f1f95453a6e60094653bc92fe1d33eb5a4d4a5728dbf181c7cd7392ceb3e4516b856ebccca3511f48e07ccaaa849712c3c2d SHA512 98fa1c9da0dd4e106bd8e17d1750e80df925eb3dab91120a6981f915de007cb4fa41d12faacea41a3b7de8b9bdbf40f3a493e7dcf51c8c1b57b456fb705e8147
-EBUILD okular-17.12.0.ebuild 2861 BLAKE2B bc38d3b396791ff6a42d8060e89b60d37a980aef352dfcaf08f47b0f035a8d7103f12b6b7431cbd702b6b4fc7502d2fd4fcd6549951737072c6d1143cb65f56d SHA512 8b4e9eab90942a2e71c830ccc78fcf7764d87d6e2ac782a3d260f46a49f28161400ea2264daf38e27479f6b28c98d25b9a84c6c99fce25c96b37d3b68905ec39
+EBUILD okular-17.12.1.ebuild 2861 BLAKE2B b9d0ec852e3035703626bf394e2da63ac853f0fc96b37ade2654df608f1fb68debb1be16526ffd23270a352acba54ca416c18225a8ff6be5d30298e2dcdfc9c6 SHA512 32be8f214173a7e3a4188a43fd4b2a3cfb0f4682b87f526f568a2486c006194a5aef872634630b233c9ee8d1193956e9e83af47635aa39fb34582ed0895a9f9a
 MISC metadata.xml 926 BLAKE2B e2afad30e18aa62424c2f3bfdb6b3904fe8fdacc7540b05ebe16381bb39ffaa2c93a97706bd264f0a2a2497ed1d1a7171fe971eab6642410f0555c639af32c93 SHA512 badde2fb8455146d7d0e320290900417eac11c4a07b222fcc6efd56e9291ff10a95df26169498cc5018c906c109cc78c626eac0c8e67c3f535be563abf169062
diff --git a/kde-apps/okular/okular-17.12.0.ebuild b/kde-apps/okular/okular-17.12.0.ebuild
deleted file mode 100644
index 121506447bee..000000000000
--- a/kde-apps/okular/okular-17.12.0.ebuild
+++ /dev/null
@@ -1,101 +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="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		$(add_frameworks_dep khtml)
-		dev-libs/chmlib
-	)
-	crypt? ( app-crypt/qca:2[qt5] )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		$(add_kdeapps_dep libkexiv2)
-		$(add_qt_dep qtgui 'gif,jpeg,png')
-	)
-	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( dev-libs/purpose:5 )
-	speech? ( $(add_qt_dep qtspeech) )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/okular/okular-17.12.1.ebuild b/kde-apps/okular/okular-17.12.1.ebuild
new file mode 100644
index 000000000000..09b182c5deff
--- /dev/null
+++ b/kde-apps/okular/okular-17.12.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/freetype
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	chm? (
+		$(add_frameworks_dep khtml)
+		dev-libs/chmlib
+	)
+	crypt? ( app-crypt/qca:2[qt5] )
+	djvu? ( app-text/djvu )
+	epub? ( app-text/ebook-tools )
+	image-backend? (
+		$(add_kdeapps_dep libkexiv2)
+		$(add_qt_dep qtgui 'gif,jpeg,png')
+	)
+	markdown? ( app-text/discount )
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( dev-libs/purpose:5 )
+	speech? ( $(add_qt_dep qtspeech) )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( $(add_frameworks_dep kimageformats) )
+	mobile? (
+		$(add_frameworks_dep kirigami)
+		$(add_qt_dep qtquickcontrols)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
+	use test || cmake_comment_add_subdirectory conf/autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package chm CHM)
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake-utils_use_find_package djvu DjVuLibre)
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package image-backend KF5KExiv2)
+		$(cmake-utils_use_find_package markdown Discount)
+		$(cmake-utils_use_find_package mobi QMobipocket)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package plucker JPEG)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tiff TIFF)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	local myctestargs=(
+		-E "(mainshelltest|chmgeneratortest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 756d6d394874..ed1041776b5b 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-17.08.3.tar.xz 1754620 BLAKE2B 00e5a8e1b6ae47e6ade7031e698798d1ef0c047de0d829c16006e0eed1c75d1efaf7ac97f1692b69321e5ef6f306a27a46e90cc5a642599483e6e458f1a41105 SHA512 da0c937a2a8bb57b9688744a645e504b7262dee4fb605ca7ee0f16d44f11eef182968127670cb45b5bf3148d958c24a6f548bd9882666675252a7f01f4e19fd6
-DIST palapeli-17.12.0.tar.xz 2061628 BLAKE2B c500615ff5bd8ecf05f8ce65b5d856faf915e3097a1ef094f19ace318fd66dc69e8cba8dcac798355c02a64fea023919c94c331dd173bed7f6d9a925788de239 SHA512 19b45fa11c5b400c28788200c026dbc71f282f83395c046d9b62fa74de4a4cf52f7d3981abea65fbf8ed75d6295cffd5d113f356ea30ed664e0d3511d6cedaa3
+DIST palapeli-17.12.1.tar.xz 2061700 BLAKE2B 247e133547a2d9a0cbd114997371d14b248ae8aacd349024f6d4c2e62b3594813c30d70e2d8a142bb7b5b6032469d2993c67c324956967f65b4304ace3958747 SHA512 585c413db7389da0764f25142135f065bb3a02388ef1bae5b621d5b5ad2b6f82ecc7e1705fab64621992663b9c902eaa27f63630ff5a9432d48ae453d69b0b73
 EBUILD palapeli-17.08.3.ebuild 351 BLAKE2B 2f79396ea246219ddb448443b941eca1cc29c8124b0e6ab413e827cada1f496b20c45d4b77a72387129c94c4927ce166674eea5bb70a7f2757732be561631c9a SHA512 1ffb3f9e7de14667ff7515ca2d1eb113aa88349eaf0ae24c0d93aa9233f1db155c108ed19a5535408cb7c2772c0a3df14e64048a319ba6be6bc2c7f49ca7d25f
-EBUILD palapeli-17.12.0.ebuild 937 BLAKE2B 3a5e1cee94c0d57675de4fa3de6d5a444469e767f4f9507d859633cf517dcebddfb0278d586bd43e2bf4d0ce39d1148708f4d22ff7547255b52d09e8b5a6ac49 SHA512 aae2b8a3621f299a484df4ed104ccc290f502eea0b97f3fcead35440468e38698403d9dc5fc14f1e9a756a1e671a5880bab242b9ed4b489f2d3294f063503b8f
+EBUILD palapeli-17.12.1.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-17.12.0.ebuild b/kde-apps/palapeli/palapeli-17.12.0.ebuild
deleted file mode 100644
index 7988dc1bf00d..000000000000
--- a/kde-apps/palapeli/palapeli-17.12.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
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/palapeli/palapeli-17.12.1.ebuild b/kde-apps/palapeli/palapeli-17.12.1.ebuild
new file mode 100644
index 000000000000..40ee410a23a5
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-17.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Jigsaw puzzle game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 77919273fc79..a7743291673f 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-17.08.3.tar.xz 8825020 BLAKE2B 65c540658c65249a531013e8e8a9d73d3fc0eccc89e6c3bb897ea23ead16c34aec359e7fb113616a0fa6a544bfa039fc165ec68269cc541e527f823e09f6ac02 SHA512 1a46d20cb8146002812b0485bb74089fef5a46b38b804442ad77bf903b26cd41d27bb83d6513acc94d7a77a2686533baf758bf7d276cfb65dd545e53723ca156
-DIST parley-17.12.0.tar.xz 8826940 BLAKE2B 39896f8653b92ff70bd579e48229c0dc2fec216c87b776bcc0704a59b14dc89fd6a5b9192027ce721a82d1b35f8fea4f81b3ed8fb278ad34fe1048c82a2f5b54 SHA512 0a2753c262e359fd3ff05ee0c671c911083e2f29a69072ffc91e085670ca1b5ff2d025ec70629fad13d69a36b1ad1bbcea5d7fc072da664938275b5d1ec989b7
+DIST parley-17.12.1.tar.xz 8827004 BLAKE2B 44c794ffd0df17fe4ba7176de23fd16aec61d164f75bc591da7b98f06c2f8aeaf0b96983338906bf3aab9009530190696c500e2d52d9d5518e5583b666e077eb SHA512 0f2fce5fa750ba32a6c48a6a0720d89d6401b818868e420f9c100b8ee48f5c8db28770d74144cc058dc8a38d9665c8528793f9b48b83863cacbeed7cfc13558d
 EBUILD parley-17.08.3.ebuild 1218 BLAKE2B 9fe973c99c68acafa6bb1b685809010982e1dde32d8108bccff029d97b2060516957b5789302f76a7eadbbbd103102aa583384955b95b7263e4e6505961a36ee SHA512 0b4c54f2dd237f57d5c878fca5b1b8ed137df8a39ff71427a4f3edff31047caea380bf91c068eb1b25bbba8818fc7be26798644c77fdbd2c4dd042b36cfb835e
-EBUILD parley-17.12.0.ebuild 1257 BLAKE2B f16fe66be976aa2cbbeaabdcb06adf68f4d7bcfeb92c385b53ab483ace31e0243d021d40294a4d294d33748a602170da3ea720c596c3b2680117d50905eaa889 SHA512 36fd75d702567a4e445e16c9c5b23838978a45dbe924095c44bd6ac81aa81d5760a9bcd5a15101d89876f0e03f9e7ea5bf8cd33d52fdff2da742853d1c6f5163
+EBUILD parley-17.12.1.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-17.12.0.ebuild b/kde-apps/parley/parley-17.12.0.ebuild
deleted file mode 100644
index 070e9608199d..000000000000
--- a/kde-apps/parley/parley-17.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_DOC_DIR="docs"
-inherit kde5
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://www.kde.org/applications/education/parley
-https://edu.kde.org/applications/school/parley"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtwebengine 'widgets')
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-"
diff --git a/kde-apps/parley/parley-17.12.1.ebuild b/kde-apps/parley/parley-17.12.1.ebuild
new file mode 100644
index 000000000000..d059e01c325e
--- /dev/null
+++ b/kde-apps/parley/parley-17.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_DOC_DIR="docs"
+inherit kde5
+
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+HOMEPAGE="https://www.kde.org/applications/education/parley
+https://edu.kde.org/applications/school/parley"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtwebengine 'widgets')
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+"
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 437e0ce78b63..4ff10824d00e 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-17.08.3.tar.xz 1147820 BLAKE2B d7c6146962fcb980c1edd3abaca8621ba711d024cd95a83161dd8f5e3a11f62620f3bc43630f249ac6820f19396d4f166c90fd4f0c454051a57b2d309444a3d5 SHA512 b4d163d54e0d36c017e7a5ca6c62fedbcf1c6bbf9202abdf8a6c5e1f9c40fbb0994fc41fb16c21f84970fb7fb87d059ac639a6a6b92e62443d4879cf2103870f
-DIST picmi-17.12.0.tar.xz 1147264 BLAKE2B 25a37221b6c2a5897c10dce75dc11c456af0295ed2f6fed86cb5169e00d9e6f875b56cbc720f05b3d727f7d00e56174e15c0c3654d8bc891529b7d93dd7d635c SHA512 512f7cc873a1d4785bdf34403d2a2283d90ff448bd1b05bae7fc4d39a59395fef2b10790086eff459b228d613225a72428188651df8931ec0e7698e4d177115b
+DIST picmi-17.12.1.tar.xz 1147432 BLAKE2B 2a9f7f8eb5e35f6c00cd16bc50b9436ca7008312687bb2f9f454f4e82b8098dda0e4fd85a11a78b0f3c9fb10c5d2ad37d6cc452730f480d1e30fb31d6e057e14 SHA512 8bf752f284768c2a7fdff630daf70ed6ae7157e5973e6ada4903fd867f9a1f10bd2f63f38ffe54b364b5ee5a3d642efab62586e817a3a74c7e8a7bc87bb3e705
 EBUILD picmi-17.08.3.ebuild 845 BLAKE2B a34d4f68e5335482b3898ba5f6f9c4ba82e7eb39e86f5c958edc11b6e74eacf56199e1cca8fe63612810446286b4846318703220eac9116dc286045eb1c3c2ef SHA512 17d77d3c770dcea52523d0368c4e7a560ca7f82049e0bc6a7fb0257b930d65063598f979b48b90019b813ad7d41638f293aac99e7fa26635a16722d90fde1711
-EBUILD picmi-17.12.0.ebuild 847 BLAKE2B e979a3069daf766d820218fa2eb0312639c128eee99377bcaf001c3a8100db2c9fb52317bf800d219f16cf12a0759e3854c91d5f8e40d0c8a8afe6a3f77ba86e SHA512 c3e6b7dd48b8e911d74591b810e29d20debdd0a9997ccee7683fff1f791b34aef73c40b430c8a40b6c7fecbad7e347c91487ecb9d900de61d6f8f7889a20e54b
+EBUILD picmi-17.12.1.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-17.12.0.ebuild b/kde-apps/picmi/picmi-17.12.0.ebuild
deleted file mode 100644
index c269e386d181..000000000000
--- a/kde-apps/picmi/picmi-17.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Nonogram logic game by KDE"
-HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/picmi/picmi-17.12.1.ebuild b/kde-apps/picmi/picmi-17.12.1.ebuild
new file mode 100644
index 000000000000..c25ff58b234c
--- /dev/null
+++ b/kde-apps/picmi/picmi-17.12.1.ebuild
@@ -0,0 +1,34 @@
+# 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="Nonogram logic game by KDE"
+HOMEPAGE="https://games.kde.org/game.php?game=picmi"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 10ccb53b774d..f24aaf12f5dc 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-17.08.3.tar.xz 266964 BLAKE2B cbc5bf00939e6f89a694ddc611dd1f206b41ef9c376d70a4d85a4b71a48e80cebcc58309fbd7b490323f6dd7ec9af9bcf5e3f768fcb806b0271afba232d7579d SHA512 eb6f32d98c8aaee3393030ade6686fe6944dcef92ae530de1b8f980e4d5ffc2c543361bc3a988283b85ce70bd1902bb33a1575f1d6580da8cf0dcc2c141e34e7
-DIST pim-data-exporter-17.12.0.tar.xz 267420 BLAKE2B 479a4d868bad58d5bc4a06079918c4139b1f521e597f409123f81ca8d4a6b6dc245713a1c35058e338e5d204e6e600551396990850796b66227ad986e58ce1f5 SHA512 cf227b9667e0f2cad16a802328705900aa24081cf45e44d7835f5b350abbbf8f8c73f913519b3a69c32f6273faa6761d3b0181c5f8ba3bb5095388597eb8bbe6
+DIST pim-data-exporter-17.12.1.tar.xz 267468 BLAKE2B 112887cd75ef13f0d8bb52565905dd86554bd65693b8ce98739adf051e70d097b0784e931a010d175e6d077b3d42bbfd6ce0c23f133f74482c8262275eb97ae1 SHA512 a8e819da5c50e8fe86c8f989b3ec5fd1eb45f3581c90606dd4debd13a26815d44d7628f56db8977e8797e085261e7a539ac09db203647dd1f18bd16ddf3ba3cc
 EBUILD pim-data-exporter-17.08.3.ebuild 1233 BLAKE2B 039f076f046e711d86360b5d12ceb2c893e65a6420ae3a97dc59f1dc9caf12e42ebbeac268f766c8d1af5e0c4845b89fc0bd576e16a95a02d5b9e9e9be67a6ce SHA512 edb6d6e8b7fb3e43acb28cfdd7e590bf7c38bc3000c2d7d4c5faec5816211a656ed58f9016fb92bbca010278bee97bc1942f65706f4393416430785bc17ccd21
-EBUILD pim-data-exporter-17.12.0.ebuild 1235 BLAKE2B 6c791d7333d8ab40e8d50ba7151434c61a87df69ab8c4d1a62c707c89baf8418a18cc79de5f85d523c56e05e17a24999d25a107ecd31f42eeacf8ec30bb60c48 SHA512 e07534bac4965e5112a9d8507d4dfc6e3b2fe06244acf8042d7a9cd469c09d930b475372fc2407de03bf7c86cbb3ccf0c38786ab8f1a24de4e5f7263883d9115
+EBUILD pim-data-exporter-17.12.1.ebuild 1235 BLAKE2B a3581139c6ca650da6c086d745b845a1973aa56aa8663b3569325feb2188070aad62a0f862d28450fcc30a2978ef711e52576ee69b2100d11abb2a35dd053188 SHA512 0e95b3206134934e093e6c33f3bc03b7facd86155affe5feefba6a7124be4d5ed2919ec5332edc336450b92bfaaa5b05d3fed61efa099e692f0f0e677782d810
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-17.12.0.ebuild
deleted file mode 100644
index d46f726b31fb..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-17.12.1.ebuild
new file mode 100644
index 000000000000..35bc56084186
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-17.12.1.ebuild
@@ -0,0 +1,46 @@
+# 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="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 831aa23e1178..e5b2b59dbcaa 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-17.08.3.tar.xz 444420 BLAKE2B fadd4e9b544c691f7d75e6f7c61b7d84ded866559f95f1e8353e532cbd2805515c4aa022a08c76f69e3ae0b41958cfed336e8088793d316e709f7de68abc7fc9 SHA512 521f8bc2bb23b28cf4d173ae6c4ce5222fb9b948fcc08e9982a345b18b4b56a9255739b5a7c56568f11a45bbbdbd6c92ed554ef24fe653dbe9a04df365439b5b
-DIST pim-sieve-editor-17.12.0.tar.xz 444564 BLAKE2B 6219f27d756d548fc8cbeaf11cae6f0898a534dc6c7240192af594bc06b590710f1e8adef8210db07f1f03f0d99ee9c6eb944d3642919ac8b853fb0af6f57aeb SHA512 7f8191aad9505012cbca718139227a6e382a93d82e55ef4f4bc9dfc59a427576427285c4cbf745de30c6bf0d37b5451035190e78eb4ddde705294b4f855a2573
+DIST pim-sieve-editor-17.12.1.tar.xz 444628 BLAKE2B 067bbdce84ea55ad9126fe562858697c3529cb041b6cbed47dd40b466081146aa432699ea3eeb5507964f61fecaf2a96a7f431b2d0206a60e877d613e1e0054c SHA512 423b7d8169aa4853359d21061e82e0c97bea972599928123ffbe1c8fc8da0421f49808257f52a5cd2c25f87b2353870d2c39bd0a288f2b9981320492e2c7a1ac
 EBUILD pim-sieve-editor-17.08.3.ebuild 1147 BLAKE2B 2aaca75c1a107417b56248fdf734e49eb236c8713eb2a2e3798238798672f69da53b31f08c1f28da404d8906bb8457a9f0913d3db78aecd9a66eac78e580388d SHA512 3660b50e3b112e0119bf26232031d4b5b4b5dfb8ab6312725c6bbbf6e5136897a690e2cc641dbf0316b854bc838dfd6433454ee4a3c8e9a45b8a1714ac34a87b
-EBUILD pim-sieve-editor-17.12.0.ebuild 1149 BLAKE2B 49705aaa74cb9729ea1ea6415181095dbfdef281f40bbb3ae2837c31fe47f511c26e725c19e0d19af1be0a8d2dbd6954b86e1182a5ba55e433a39bab2cde368a SHA512 1a15b0a2174e03f06c9574e18d68f7221d260cecf98cf320caab00910bc4e96d4942d0512f094cef3dfeccceacab32a8c99ddcfd1776b56eaf3d3f5619e8add1
+EBUILD pim-sieve-editor-17.12.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-17.12.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.0.ebuild
deleted file mode 100644
index 1d89d8fff5f0..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.1.ebuild
new file mode 100644
index 000000000000..844361049fc3
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.1.ebuild
@@ -0,0 +1,44 @@
+# 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="Assistant for editing IMAP Sieve filters"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index b8824a77c0ac..9804560dac73 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,6 +1,6 @@
 AUX pimcommon-17.04.3-deps.patch 2275 BLAKE2B e7fae2bb57f660c853e5e3c6e37a0ccabeea2676c16e16822d40eb9d3b3a2581c8d5bd5464ab55bcad95b4b1e5bb00313a3c6b7ad68694b2bf17cec1bec89c27 SHA512 8e123d9e5e952503120b329d7f94e7fd09dd364eb3871580cb2d8c444626daff2a538a07577b90ba40ca7ee9204344614392ea76df4c92dea1a4daf39b3ac8ec
 DIST pimcommon-17.08.3.tar.xz 275848 BLAKE2B 9b0d60f9dcc427d7e83b39bc36204406fd0b5b6abf32c24364bb2e8f7a3b3bee7442eb8ae324bcd4f150249783daa44b79b40811396558029436978793c74c5c SHA512 f5de67a51ce69332e0d61c10d2baa97cd8b5128d4f4e48b0503191b9cab283fcf32b4e205be2ce360acb3a523cdfd6ae416264b718c633ef6a1603a939c55bd1
-DIST pimcommon-17.12.0.tar.xz 289188 BLAKE2B c9eac4c341a9610a4226f2ed93b342a3743667156eb816865dc967db28412732631c46e496ebc2cb080246038a9128ef8027e7c45313dc2a67d9c33609638cea SHA512 33aeaadaf78efe88546b547c0fb62956c2fb8cfe88eb00f83dd164e4c7ca55c2cdcccdb0e933dac4399aab770f6cc2ca60e532ce6168a5f71ddf53f1541cce75
+DIST pimcommon-17.12.1.tar.xz 289220 BLAKE2B c4991d481464c726dfed6860f9a2c9939d97af2441dc73802c81801aa2bad74528d1aa56af53ff9e324fe8d6faa186f7492a3dd2763d41cff7ce9c7f5c6da552 SHA512 0eac9a905bae91a054f38aefbd012fe074ba42792f978791441aa44c3d3f380bdba8dd2e031a4583ba5bf8aa825c6696f29976ecc7c66f4201bc14e0e60280c8
 EBUILD pimcommon-17.08.3.ebuild 1413 BLAKE2B 1ded71ba7b1a4e22a9a94325f70a2fce81012113b1d3c2828edc3d7d575ff7d4673bc75913723600147579b151121ac16e6ba5c31b1d0a59cc41f336b4e6e054 SHA512 d63ca2120c97d9df881a04ab8a9360aab220808f3c639ea101657b66065f71e3af009f8a44f6beb379ade2d4ace87d1e333a605e8618930b4ba1e0d871294ecd
-EBUILD pimcommon-17.12.0.ebuild 1363 BLAKE2B 37034ba1478b169d24a235993331529719793fb6310cc1b64cd1fdf589c1833d02e0ecd7b38b3f55b98b33e211f9784bbf8ffebad0820f6f48427576c2e34afd SHA512 e3165ae8085385c9bacdfc877bffbc16cf95aeb2a3387683669423e84028ae540d4371a84eccfa6dcfb7f32ba874aa444a79ef554339b79f62e46a8567cb7f9b
+EBUILD pimcommon-17.12.1.ebuild 1363 BLAKE2B a4b92557a6a3f560f9a8c4153538ebfe90086fe47342c02395603e49e89ae744dc9c547a1dfa96a9d669d7f8c5e3ee33775c7c3181379bdae5eb6330c4208010 SHA512 473c5b63a1adaee34921da7741ff776d461f2be0560dcd165139a9836db67cc0c3043bcdf2b33061ed52c683fabeb5a50f1fdb27b1b488e19b10ab1e0373ec15
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-17.12.0.ebuild b/kde-apps/pimcommon/pimcommon-17.12.0.ebuild
deleted file mode 100644
index 87de434f8e35..000000000000
--- a/kde-apps/pimcommon/pimcommon-17.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/pimcommon/pimcommon-17.12.1.ebuild b/kde-apps/pimcommon/pimcommon-17.12.1.ebuild
new file mode 100644
index 000000000000..744cdbccf0ef
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-17.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kmime) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 7173b7c9afcf..2bc64e78df53 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-17.08.3.ebuild 936 BLAKE2B db5856ec2ebf1204d125fb4dfbd1f57845f3ce1a00bf494456a9b657aa3dc20f38b12c1d0edfebb5e9a764a0b2d91c71eb05378dd30f646f0192289767630cff SHA512 ce5a8249c85e79140cf5d6f63c6cd7debcf56e431a552f9f3a618e056924582066def0bf33c68809b23a81551825b9a939066caedebc36c63782ad9d1b648049
-EBUILD plasma-telepathy-meta-17.12.0.ebuild 938 BLAKE2B 786645565d0b8953d4cebd79c3da10704ffb4d42ed081731d16dfc33d7216bc2a2945e930450846c9890897210933c7d071d0cffa7e73292a561587c55b3ae1f SHA512 d539629e88e73375e2418b111979689d39070b7d677744cf4b059ab572e53a1c46d849a2fe148c266edc3fc16e7ba358db9f68905c65a8601fea747950520ffc
+EBUILD plasma-telepathy-meta-17.12.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-17.12.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.0.ebuild
deleted file mode 100644
index d687eeb37175..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="Plasma Telepathy client"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND="
-	$(add_kdeapps_dep ktp-accounts-kcm)
-	$(add_kdeapps_dep ktp-approver)
-	$(add_kdeapps_dep ktp-auth-handler)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_kdeapps_dep ktp-contact-list)
-	$(add_kdeapps_dep ktp-contact-runner)
-	$(add_kdeapps_dep ktp-desktop-applets)
-	$(add_kdeapps_dep ktp-filetransfer-handler)
-	$(add_kdeapps_dep ktp-kded-module)
-	$(add_kdeapps_dep ktp-send-file)
-	$(add_kdeapps_dep ktp-text-ui)
-	gstreamer? ( $(add_kdeapps_dep ktp-call-ui) )
-"
-
-pkg_postinst() {
-	elog "You can configure the accounts in Plasma System Settings"
-	elog "and then add the Instant Messaging plasma applet to access the contact list."
-}
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.1.ebuild
new file mode 100644
index 000000000000..c133533744d5
--- /dev/null
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Plasma Telepathy client"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="
+	$(add_kdeapps_dep ktp-accounts-kcm)
+	$(add_kdeapps_dep ktp-approver)
+	$(add_kdeapps_dep ktp-auth-handler)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_kdeapps_dep ktp-contact-list)
+	$(add_kdeapps_dep ktp-contact-runner)
+	$(add_kdeapps_dep ktp-desktop-applets)
+	$(add_kdeapps_dep ktp-filetransfer-handler)
+	$(add_kdeapps_dep ktp-kded-module)
+	$(add_kdeapps_dep ktp-send-file)
+	$(add_kdeapps_dep ktp-text-ui)
+	gstreamer? ( $(add_kdeapps_dep ktp-call-ui) )
+"
+
+pkg_postinst() {
+	elog "You can configure the accounts in Plasma System Settings"
+	elog "and then add the Instant Messaging plasma applet to access the contact list."
+}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 5ace482716e5..99434df72eec 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-17.08.3.tar.xz 43032 BLAKE2B cc19cab7028e2e3a5f09f45a233164688f99e72e71be55d8da2639530a9528af6a459978009ef84777ad5e844ac1f887639d454f39a9bc1a5ac95dc3d23dcc07 SHA512 da3eb9910c7d8f7febff12a00001a66e1f82035fc05bef88551abff2d0b6d7d4050155189a5fd8c99c8db259306cca55244fea58d36ce167d0bcfd06ad4c49aa
-DIST poxml-17.12.0.tar.xz 43012 BLAKE2B a587c81c583bdbddd2b3629390eb5b42260a79e32fc5f83f13e843cd210544181d1b2c22fc2a861e385c3cce514baa859c2f9b7f71bab1f48b9bc3168639ffd8 SHA512 61c77ac793120f1e94c6c46552d6b020539e39ad2a6c991ac5854e0853137d8aa18bf618cb941277bfa1ce11c8e8c389b83d5fffdabafe5469c4c70e37589494
+DIST poxml-17.12.1.tar.xz 42976 BLAKE2B f5fe951932080a8d14bbb4767ca977f530ca2ca37b4e834b08cf0443668f7b7fe2c50a389a1aa83c0cd53b1d77915efdb50437864cf20c667f4ae4c9957bcc03 SHA512 e3c1e42d82ede72222323367edc238741012b31ad96b6dfb56f1af7d21450c5866d016833592d31decce9a7b41324497bfac6e61a796590d05b9fa4f4391d679
 EBUILD poxml-17.08.3.ebuild 340 BLAKE2B 2f34faaf802d8565d79ab99bda7da65cb461528dfcb09682f4fb30cdf0c7665443f8811bd28cd413a02b969febdc50c0fb0807c4a53afe3f0b90d937f4c64431 SHA512 89a7e6fbb07f68d9d359fe1c515bccd57867ae1231a8d84a43d19a6e4d3bba7407325429751e38547d24ca22da8240e4a05fe4f48639c8f1b04014e5560c45ef
-EBUILD poxml-17.12.0.ebuild 342 BLAKE2B e580bf7e513c8c513633ead9ffab22cf487e9b79e27657b76203d9323b0436a855f7df6bd645b4b8e253f32781601a163e9107f45a5a8cbf0e65dcc3f43e4877 SHA512 e5b8d40ca9e6a19a6d100dcc0f111c85aeedf8ecccef4b1d7d3074ca60614f9fb9558e52f5ddff34ed5f2f97930f556f4f2e121c46e21b3670b089b106c1a0bf
+EBUILD poxml-17.12.1.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-17.12.0.ebuild b/kde-apps/poxml/poxml-17.12.0.ebuild
deleted file mode 100644
index b35a42b8546d..000000000000
--- a/kde-apps/poxml/poxml-17.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtxml)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/poxml/poxml-17.12.1.ebuild b/kde-apps/poxml/poxml-17.12.1.ebuild
new file mode 100644
index 000000000000..3c605a013f0f
--- /dev/null
+++ b/kde-apps/poxml/poxml-17.12.1.ebuild
@@ -0,0 +1,17 @@
+# 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 utility to translate DocBook XML files using gettext po files"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtxml)
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 685f5c1f78db..243306cac1a5 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-17.08.3.tar.xz 237084 BLAKE2B c85e6fb2e41cd2264fe33af6585363bea85bee57a8c42f85da6ed3a0b4972c8d1647dd4e4b10e42f8c0ba98ce9c7e93efbf90a938396341dac04782ca1272a2a SHA512 cb09762fc736a88c41850593b8c0d3ff1eb0f3308653a93ee1b370dd8a4b7d13de64fcea3b76f7407f430faf5d5cc2cc5a2a3c58dbd80f4c076af4a60788181c
-DIST print-manager-17.12.0.tar.xz 237284 BLAKE2B cef8e7ec16eddc1fb80f45bf7c8daca965f1b131a5cb5cc74021ff177c3e3476845cb4d108d5b3b5e43c211222d9b8724cb51e7cc4e1cfe114f242ca7199ca39 SHA512 bd7ad4c1c9efe00e760c7a084bee79f3a5be25d2eb9cfaace7f96cc379d30f4461c668669449e6aefe736698f7c1f516d6c744a76c895c6d77ea775f16402747
+DIST print-manager-17.12.1.tar.xz 237224 BLAKE2B 11b51c9d3be44ed2f29a56f9044241ea22db127eacc4bc9ee10eb93d2c8cb84b977345658de134efb55d993392609ed1185bb61d144def0aa81578e2f41f8227 SHA512 30a69341067a62e3e955dc5d4e027fa9f99029f1ff8615c4af68e9b5647b0328e50ba3f11e208b1a333ef37208113534303d87a6b299af6c7c0cceedc689b35d
 EBUILD print-manager-17.08.3.ebuild 1439 BLAKE2B f6c37b90e2af505b9d3f9b403bff960685b933245330f3505ac0d86b24091dc511cf4aeda9ab0da96a49163e7f8748c614c0ce0f8bcb5c4b8cbe073a761e78d2 SHA512 5ee6409cc9a8a45cda02eb582e94755c026e4f6b9d3a8be15785ee5780420cd5c0a564069677d3ae556c1c893b627db104c1f39ec29afed91711c94d1dc075af
-EBUILD print-manager-17.12.0.ebuild 1441 BLAKE2B 7c321d468cac46521e080be61775aee363b2863c4a6fcb3556b3f1519b95fe840d53bf37a4dff474e058aad94ab66ccd3f734a95789d6dd7813dbe9cee63cfad SHA512 0362bfd5883327c640529d2afeb9e42560ecc3c3dc82cbbcbcb016a9ae422abdf5e3b3184b7a232ac6695cd7352786e7d98b3e60e6335fd8213a3cd81b1e6066
+EBUILD print-manager-17.12.1.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-17.12.0.ebuild b/kde-apps/print-manager/print-manager-17.12.0.ebuild
deleted file mode 100644
index c978eb84ddb8..000000000000
--- a/kde-apps/print-manager/print-manager-17.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst(){
-	if ! use gtk ; then
-		ewarn
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-		ewarn
-	fi
-}
diff --git a/kde-apps/print-manager/print-manager-17.12.1.ebuild b/kde-apps/print-manager/print-manager-17.12.1.ebuild
new file mode 100644
index 000000000000..e59f9d37adbc
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-17.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Manage print jobs and printers in Plasma"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-print/cups
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	gtk? ( app-admin/system-config-printer )
+"
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 0209ec01a14e..90d300935074 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-17.08.3.tar.xz 1534300 BLAKE2B c63592008f99f3135a61504b2cccf80e8933379717279dd37f9d9a2ceadd5281abd2be39715928d4aee5142c7d7fd3a6c456a143d2ec23c40cf5142d32288d01 SHA512 56d44bd74c4906c296e2ae213e3e3c1be0b2cd48f0be8b8774d4c8e074af0becc6747cce72d3d9dc4082d877a4dc2b49f91359a72d801ecf825cd1297d9117ea
-DIST rocs-17.12.0.tar.xz 1535184 BLAKE2B 46b53092c2822d8f8ca0acdba1765370c74cb8bfe2de724c8a8e0590f17864c40939302744267ce512d12f6c87dc73f924224e5d9755090bedb18689cb93ce97 SHA512 25ad38236be86d9b4fd80d5df4fd6ee104eea3e3e55af098be75bcdb8a503036ac63fb0985cf9a7af0a602ba9cbf21edd6a1062e6471acd11ed4f788bbe2b2cf
+DIST rocs-17.12.1.tar.xz 1535504 BLAKE2B 415617e7b6b451c5185eb8c52176733ac92aec663979e93ea767c9b1f7018770af153e7c33bc1bb81af88779871204c286658ec0b4bc0635c7aacc6edece983a SHA512 e242c618cf03741c73f98235a26d7afeef64153445603176d340fe5f285e02c32ff30ac81ad0005b2735f97b69c519e2c2bc8f588f351b88202f7f9c0efef450
 EBUILD rocs-17.08.3.ebuild 1159 BLAKE2B f32e3f0509a9ebfaedbb9e2b6f82d3f80d92c4443ddf81c334d55b34c7a55d4dab0777107fb5c4b4e68ecd178c1999a8b746674620310a62c9f657ce3c03ed61 SHA512 8985087ad7b20be5353ed0e0a06ea7dc929f26f4e7c2a7ea40e4f05b245033c17385a1dd83fa9981cce249202039521477e5a9a8b7da1b491b984c706b7af15d
-EBUILD rocs-17.12.0.ebuild 1161 BLAKE2B 5feb56a95a783d58f05e81b6272fc389cccd8c1ec55d6ec77348eb15b2275106e3959970cb0d7522706732a4eeca8980e42dc64a2335cf115499d7601cbce877 SHA512 6afe20cc122b359d1617de89f1aa72f1025239d790486d79a4305f688faa43132dbc3c66b3180545fad5975af5e7867cc67dd4be88383e082b27c691b862ad7a
+EBUILD rocs-17.12.1.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-17.12.0.ebuild b/kde-apps/rocs/rocs-17.12.0.ebuild
deleted file mode 100644
index d4d7dc8d7a82..000000000000
--- a/kde-apps/rocs/rocs-17.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://www.kde.org/applications/education/rocs
-https://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.49
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/rocs/rocs-17.12.1.ebuild b/kde-apps/rocs/rocs-17.12.1.ebuild
new file mode 100644
index 000000000000..e20797a7baff
--- /dev/null
+++ b/kde-apps/rocs/rocs-17.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Interface to work with Graph Theory"
+HOMEPAGE="https://www.kde.org/applications/education/rocs
+https://edu.kde.org/applications/mathematics/rocs"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.49
+"
+
+RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 8457771cb829..eb582d02c125 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-17.08.3.tar.xz 10588 BLAKE2B 6613491a71ed33a4f08f5b40a32b58f46682b94e0c6f9f1e1423bdfe13a14c4459af588e55bd035ae7839edbe0ba91ccc04375f8599daed55096a5095e158335 SHA512 670247e5100608f136fc7cbfad63492ced712570bf314906d9b074f3c18d4b955a7ba82470d92fbdc944d956e5f008b1775d42d013800565cf2a35c7716f44df
-DIST signon-kwallet-extension-17.12.0.tar.xz 10576 BLAKE2B 6c901b91b0792510c696e4cb11700ff27bf5c70ce20bdbdb71171ad6cdc370e872a73942f99e9012dbbd3dca2b0e15ee14a997afb2fa36cba04b42e1a036d3d3 SHA512 f2cccc3e140fd6f90c8c3342159c837752de93183c2ddde615ad042b1f53a916c75e06b188bc49f660bc161731d44f3ce02c5439300ffec7cfc11e32269df712
+DIST signon-kwallet-extension-17.12.1.tar.xz 10576 BLAKE2B 24b20c5f2502d560b639a6268dd2f7fbfe22c9aa1ec2c0b414c30eff195d6991ac3535b8d630a5f2c4cab0e52a26add00a3f44c75c5d720f7662efb3a8c33600 SHA512 92fbc598f195944185a44839c5875077551f643c7bb0e6a4379c271fb46107f7f64e4b1a5627d2590fc5fe1acf51b3ae74e63cde76aa8a24ccfed9cf4c0df99e
 EBUILD signon-kwallet-extension-17.08.3.ebuild 325 BLAKE2B f7ad614390afc5dfa92b14e026e72215935eaf9d32204fe0834b5836e0a43b488941e4548a836c557bcd5ce411815716d50a82a105c092abbe0f561004a82e9a SHA512 249122488ea0fc1e59507352c30860bcf3ff613dac32938e86f4b9add363d50eae4d8f401afafcc6df20fcf5eb6340d0ef36cbed954932b402539c7f4b63290c
-EBUILD signon-kwallet-extension-17.12.0.ebuild 327 BLAKE2B 14c1885c86c2007bf86c2791a7e09699b24bca34e558e65440b0ab420a2b4deef0bda3129c94688134365af2462b0327b2935efb1c9db8bbc4ee3a06803e2881 SHA512 656b3b5d1424a0d933622d833fdd2114aae7add6ad382896cdb86275b3f0caf15989e8fb2e20f635a90ef6733aeb10abf9c9d2ca65bb35715819bd5461aca514
+EBUILD signon-kwallet-extension-17.12.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-17.12.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.0.ebuild
deleted file mode 100644
index f1337cda8af8..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-
-DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.1.ebuild
new file mode 100644
index 000000000000..ce5d29586a9f
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet extension for signond"
+HOMEPAGE="https://01.org/gsso/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+
+DEPEND="
+	$(add_frameworks_dep kwallet)
+	net-libs/signond
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index bec03ecdcfda..ea4654893711 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-17.08.3.tar.xz 667336 BLAKE2B 23af827a74263fac4b264531d903a636a0b31a0f72cb2c62f065518abb0e3f22d22a53e7600f557427a2033dd09343f36fe9f67b9f8fd21b18c06ee3ad003f89 SHA512 dc7a12bad8bf764736d4149a576f5af3119c18c19689247dd3a6cc87cfa38d92777bbe757e88b94f227fd80079c72f6e87c1b2664be80a3e4f40f8bc37dd71e0
-DIST spectacle-17.12.0.tar.xz 765976 BLAKE2B 3d346cd639472f076f9e5d55a64824dc30a012655cc5845fcedd948f239c8faa2ab7ef79fa086bd8b060bde1d77e366b05f63d9a3ee917147fd83bd16689b438 SHA512 fb3c88c800fb4475c2e2d71082e513029820ad79789d27b14387df2668237cbb20a5122dcc8e9ca185a565ebda1fbf043ff60044a5dbf598a941079dd2e0d256
+DIST spectacle-17.12.1.tar.xz 766320 BLAKE2B bf3f1a235b6885d8840762fda45962f7dfc83663e97f1eefab3fc0eb6b1c08ad6e13288e19a08e3c6e78e59f0bdd985bfcba52966072b2ab990599b97c5d3453 SHA512 41e04060481439321199b3710a71dcbe0cea3e11f26502d7e1cf0124c351710008420c6687dd4dcc78a0d78e2038326db4b15e7848fa07aadd911aac6dcb7a09
 EBUILD spectacle-17.08.3.ebuild 1321 BLAKE2B 28cb6faf9fd38256f991e2dbb5b2eb95799e4b5ac5caa1d815bb951e2ded09d208f8dae82ae8b81b0a520d91f19bf1dd883fee81e93089076b953c72d2647844 SHA512 a81189d0c86f502d424dc11e1ab59657e6ac0b6d0a24f93ec999a9dae447d5ce9a5675e7a6a9827928a4e9a3ae59fc4b87026d5718a009e3e804179c98cc57ff
-EBUILD spectacle-17.12.0.ebuild 1323 BLAKE2B 3a3f9ddffef33f27bab19341ee0fee8b45ea7fa95f9b5fa80c79a3ea10a2f335a79026855513e62d82d3f68ac6d9f0f81ddb23055feb4f2c0fa469a789ee621d SHA512 344790b1964373ec909666babc62c12eba2d18562806e317b5c947ee3ca8f697111cfe566cf0b6e6f088dca4860b42fa92679df137aa6bc6378d83916e5b4ad5
+EBUILD spectacle-17.12.1.ebuild 1323 BLAKE2B c453d665fc61de182b6aa9f4da2fa73a3cecde126aefe9d2eb443b2216c1360138f17bcf011765e059b19fa56a7fa3044092f30d14e55ef798ef81fa8f397162 SHA512 f59c6c91175c3e7f59425f6f3472c97ef0155c01c41dcce9b2aa510d5de0157e765a2b8893f9bd5cdd5228d346c8f3ea4716716625c83a1d6ef16d27a7b48513
 MISC metadata.xml 435 BLAKE2B 87fdf17969c490793aec4f5d1a53c7becdbd7f3b5cba7da9405741ce3832d5e53dbdeba0b2f8e51b0a4340f2c267a0c3268967e67af4efb404a2ea7860e1084d SHA512 c8aee95e54da221bfc66214d1bcd15f4df2b723a6a9603b400f98ee81db8ef0973e06ce69b2679a4dfecb426e1cc96c5da1fcfe6d5954aeff327d57722047d23
diff --git a/kde-apps/spectacle/spectacle-17.12.0.ebuild b/kde-apps/spectacle/spectacle-17.12.0.ebuild
deleted file mode 100644
index 5f892af2e50c..000000000000
--- a/kde-apps/spectacle/spectacle-17.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screenshot capture utility"
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE="kipi share"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	share? ( dev-libs/purpose:5 )
-"
-RDEPEND="${DEPEND}
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!kde-apps/ksnapshot
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-17.12.1.ebuild b/kde-apps/spectacle/spectacle-17.12.1.ebuild
new file mode 100644
index 000000000000..169a0c094823
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-17.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screenshot capture utility"
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="kipi share"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!kde-apps/ksnapshot
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index bb14f3231f13..daab1344a2a5 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-17.08.3.tar.xz 859888 BLAKE2B 2765d2fe006fec31eb147898b343ab6758a60a4895a36675bbf4365afe13ec9762eddef2fd15f86a102a28ca4afff2f8d785aa821dda134578099d1969f1fc79 SHA512 f97e28d9fca2aa9f039afb85218de8a38d1eb6b6b15416a269b9522dc485951a39eda75a7db668c6a589a6fe10ae7d117155955e580995d8a6839ba4cf98c1df
-DIST step-17.12.0.tar.xz 862476 BLAKE2B 14038d4cab3a1b6e305b9d31496cecddc31b1004f927604a942d1dfff435df2df822731d1b1d68156dad3173bb96c733150a5e1b0e03a71f9d047419435d3563 SHA512 322ab586183d26b51b17134f75f617dca09b1779af36b9d36fcbc0faf0e5a3bcea53a3e543ba2bd005d322302d5f4ded843bcc7181eca0867805c6b9b0e23df4
+DIST step-17.12.1.tar.xz 862548 BLAKE2B ddfc2e26ecc78ede7f28149ef7dff0a9aa3bd81026af66f2c47bfcc559f640e9dcbfbe52711a5e0cbed77e2da2e6d02e73993066c6caed0318e09b2b3de39b62 SHA512 83024225bbd84d1fa685c0d0b77f88567faa2893943db5a1f4ee1c81e1fd0d5fc658da7eb239eab64bc8cabbd89ca1dc2878637e325889d5a979cc4b9cc90eb3
 EBUILD step-17.08.3.ebuild 1578 BLAKE2B 6da5f49d27a7b57f400826c7630f1f5dcab0704043d4329fd8da49d67807e353a9b7ae52dbd799ff68563940fbe11d4eaaf0d89ce03a8fb207dd310f70c1d2c7 SHA512 bb9ace64783f78369dab6510ca4b4e4d8b9d83e7970edeca9211f9d0b1e14ddbb45d890ad81f9bf2e6522cca1609beb7cbcdcf3dde19d6150585f60decc4035b
-EBUILD step-17.12.0.ebuild 1580 BLAKE2B cf3976410e6bd9f87bee27b65d7ab85ee7c10f6e31081ddb0883fb0db125c2c33a50eb0f3370e0f7fb4a87f390430dfb042a010e0b9a19b5d121722d3ccb1fb2 SHA512 29954dc866a59ca8a1e346e109e615824bc91e97cea028b7410f522583671bfaad56c7ed0ef1c051a2a34d9d78f1ed5fe31ae5632737dc9d9c8c85d4e621d357
+EBUILD step-17.12.1.ebuild 1580 BLAKE2B 2cda00ee46c13e85e50491834c3a38b6a5f66c52f2454b8f6500039aef38ea23eec026d6c5d95d32e99f7313df2f1947bab88f9d2a3ad5e903fb1af4bcf4988a SHA512 57828f84ba5476b3b3b106b319ce9939d9dee85f82e1bac9489acf86cbbe2b9874cb1fdce41e0e0b7c3fcba1c15ce1d1701497b03d4a08a1c3e7baa218be8c9b
 MISC metadata.xml 348 BLAKE2B e238f960586796416f3a60ab5c9fab8df0d88b79c76530be5243c3b2f4dedc98c87c343aae8e950a40a9876d75622fb6da96b6c697a3ff55fb6bede25fe160a5 SHA512 58a3225b3993d3bd5db5d5cc5b0660fd42034e593e8fb4d657f8e6ed86e4db57df66b99a6edafc6aebf356542edcb7516cd6fe70cda6b7c8ce9a002455531b70
diff --git a/kde-apps/step/step-17.12.0.ebuild b/kde-apps/step/step-17.12.0.ebuild
deleted file mode 100644
index c121e41b44ed..000000000000
--- a/kde-apps/step/step-17.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://edu.kde.org/step"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gsl nls +qalculate"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-cpp/eigen-3.2:3
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/step/step-17.12.1.ebuild b/kde-apps/step/step-17.12.1.ebuild
new file mode 100644
index 000000000000..ab8570cd5703
--- /dev/null
+++ b/kde-apps/step/step-17.12.1.ebuild
@@ -0,0 +1,63 @@
+# 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="forceoptional"
+inherit kde5
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://edu.kde.org/step"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gsl nls +qalculate"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-cpp/eigen-3.2:3
+	sci-libs/cln
+	gsl? ( sci-libs/gsl:= )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Drop duplicate upstream
+	sed -e '/find_package.*Xml Test/ s/^/#/' \
+		-i stepcore/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index b0de4551606f..ec7940512122 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-17.08.3.tar.xz 19052 BLAKE2B df37006bd0f1035debfcdeb2ee6435cdf9748121af13949e18b1e279ab6730d8c7fc26b8c85589b51de39a4ec8cc8d0dfddb90be3e2e87e8a4194e160fd512b9 SHA512 6f93bb911d708f1ece02df3b74e97af17947dbc5c6964733376561e1565fefaa3b79bd4bbc4669f8e1706d23acbf5b65148c8f0c971e801ab37769c5ee001225
-DIST svgpart-17.12.0.tar.xz 20840 BLAKE2B a9dfec83f473b4bea4dafc4a7a8b9bc8297b4a0774db8e9739a9698bed6c67be131f68a4d1a4bf639caa4e3f055c57391325ef5ecf70d8d062bbaeac8100554d SHA512 8e3f8514f9c9bf457575a1af8fe383ce4028320ba27a9f614754fe013e77abbbe29cf2b29b51fb1b748dcd63040a0fe3b121bd5191e47abe008d483a61418b11
+DIST svgpart-17.12.1.tar.xz 20840 BLAKE2B 32d3f81a6997d25dd9e3938a2d70d38fceb164b717f41c3ac3481b137c532535504254cfc730090d0759beb77731a36d362d3044bfa3c461da21651fadb6f58c SHA512 740f7f340a8325f84e730a617d9c364490abbdeb583cf6649e7b9e7401d5c17f745dbace5d5a355c5339e2fb5ba47328c0ad991b37d833a405638b2a05dbe612
 EBUILD svgpart-17.08.3.ebuild 499 BLAKE2B 997469de4ce1e1b87cf7115ce56b3aaea8629da12137ac331f65ce5430fddcae2b5f0f2013ff3aa3598cacbf982a735c5c0a0127ffe97ce33e53b53fb22d5b82 SHA512 6fa19803b89f3891be344f63f7732b1dc36d6d27f7ea1fa5dadafb9160b93690880b6d4bae49bee2c4751159d5335df0ab708b68638086c829f67e4770db8775
-EBUILD svgpart-17.12.0.ebuild 501 BLAKE2B d93c11f6dbe95dcd85db779bdf4d0263d23c6c3420063891a3d64acca0dc0d52d5b75334c34d65abc3a3cb3bb3576fdf45d65620c15b3cceed54e0bdde69a8fd SHA512 c37f2c35822dd196482b4f088b82cf92e5b2db792aa16a7e553ccdc732e7ae48cdd2ddf04a22fd9960d409a1c64fb59bcac555006766076e022a71e7cf11ade6
+EBUILD svgpart-17.12.1.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-17.12.0.ebuild b/kde-apps/svgpart/svgpart-17.12.0.ebuild
deleted file mode 100644
index b338e4e0078d..000000000000
--- a/kde-apps/svgpart/svgpart-17.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Kpart for viewing SVGs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/svgpart/svgpart-17.12.1.ebuild b/kde-apps/svgpart/svgpart-17.12.1.ebuild
new file mode 100644
index 000000000000..a2929a955b58
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-17.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Kpart for viewing SVGs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 4b2827125687..0e8729298bda 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-17.08.3.tar.xz 82304 BLAKE2B 57abb646fcec3b56606643ed99a03acb221ff6612d5a80b023e14e0509904da217306f46dc218da8f4a893041bcde08266e26af093af5b354dbcbfb7b0822e02 SHA512 ded9922042294d2d9c1f5f7b07ce705075f674818b8e39a9af86dba2d74665db4c761363353d3aa007d9401bc664a9f0cf0b08026c82e585042b0bec415b0e05
-DIST sweeper-17.12.0.tar.xz 382308 BLAKE2B 2b30652fcbd29f61f2ecc946dfe9f5af6168c1efb91ffa740594f4ef2dc5634f58f057c2b734a07e4d6efb364b1e3cc84d750cce793a9e423ab81e02bc7066ae SHA512 2054d1f86852a82600d8450003b38fb6a1f8d7ab4625dddb54f90319c7c7e1b75f256f8bb1964240a67d4530018e89124cf8bec33b5aa440736527cfbadc3009
+DIST sweeper-17.12.1.tar.xz 382556 BLAKE2B 29efe55d60cd6f094ac13f0278355e8cbdf4142d3814b33000135527bf2f743c617a0f9b0f7f8ba63335c14237bd1524f329f24ffb7b82f631184d781175d4dc SHA512 d48cf00076fc3d1508e4e63df5e0dc3c353a4d361a6817653a175e74486c33d7e65b1d026224c8bbc49fee0835394c216586872d20f4b58c2213bc246d8d336e
 EBUILD sweeper-17.08.3.ebuild 336 BLAKE2B ece528250c97c07d56c4713c890e5f6fd7a51213397656462ddcd4ce3aed83cb6b9e3456894b1c14dfc7ca1baccbdb1ff4f35aa044ec603ba0ab94b32c0d4b84 SHA512 09ca159c2e05012d0e9583826396b48127d6565fdf6e332cdc9f6f9ada3a1de132b41d8289cd9394b58163f727b814b5df5606b1164d835bccef16a44684bd1d
-EBUILD sweeper-17.12.0.ebuild 882 BLAKE2B 97ccb84f465fe02ffdb3ecdf62931df1c88943206efa2b9ede70bc656ba8e176441defefc3b6587a195be2c00f43eb7ca46106d0741011ce2bec6312f02d07bf SHA512 58ce8c02f8c965f0f822826785a8d33d368834dcce23a568a70eba743d4cc16812609920a66f12628158c3a8a65a62d01846ed45580d402ce9698e21ab92edeb
+EBUILD sweeper-17.12.1.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-17.12.0.ebuild b/kde-apps/sweeper/sweeper-17.12.0.ebuild
deleted file mode 100644
index eaf3a8be5beb..000000000000
--- a/kde-apps/sweeper/sweeper-17.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
-https://utils.kde.org/projects/sweeper"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/sweeper/sweeper-17.12.1.ebuild b/kde-apps/sweeper/sweeper-17.12.1.ebuild
new file mode 100644
index 000000000000..41e32c5dd330
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-17.12.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="Privacy settings widget to clean unwanted traces on the system"
+HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
+https://utils.kde.org/projects/sweeper"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index b4bdaee99c2b..9b14892b5912 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-17.08.3.tar.xz 159968 BLAKE2B 13688fc7f72d737587fdfd6cf89b08724207c47ec1b1848f19fa4306e714f67e50ec11596fdffaaa3703b9ba834fb41fea5acecda56e73b789a0d69c09920876 SHA512 0a8b2e271d0518f44d6b93dc3304d922d67bc36104fa64fae663be8763f2b5be0a0720f7f39e2324593a1875eae1ccf384efc14ca55e10540889c43f86b75d4a
-DIST syndication-17.12.0.tar.xz 159824 BLAKE2B 5fa2a2b8360a3f62d557361e485408ff97ca61811aaf789bc2fc481ac394b563ee18523b4173f5d8063caea7ea27b7d4a965a0523d2e61982fb6a19aeda37cde SHA512 49324c2f5705a97b71b2678f2542372dc22362c7d8ebadb7d68a3a323c0fcdc66b5089a24f100a99ee8a68c59a67cf11e407a395857a3f71a539d3fc2fcce745
+DIST syndication-17.12.1.tar.xz 159844 BLAKE2B b7a78bf25614d3c1219f6c6959dd4fa1dcb6d3491539ba8520ce120d0ed84eca868696e79eada19b7f299640d4aa76fb335ecaa7ea8e45abfb75e2d5becf892a SHA512 a1cdf152d70c7e23bcd503dd50c2cba2098f70efa6a8dcc366da925ee2f604fb2a71d650ddfbcd79c9d748e89eeced9fd219e7b11a7f9db2740fd0d43af8f4ee
 EBUILD syndication-17.08.3.ebuild 392 BLAKE2B 592727aa8067c9e9fbba95ea89ee43acf4e1b7eafbe90fdcbada867660b084604713f535f519fc2a09a5194d1f51b7a25a990dffdd5dc06362a50fac0dcd1d1a SHA512 3de11552de196c507dca3c61ff47bdf38b5dffddcfee4f5d38dcf214493750e2d25bd6eafc2929fdfd49cbda22272b281a86dae21928e25449a5ef62b2131220
-EBUILD syndication-17.12.0.ebuild 394 BLAKE2B dd3e44516317a4a483c4001de5c1a2a249343fb357768798f1e636b790f1c328a69d1fd5e67bb500ee9ce505543cfbc742cca4aacbd5529a51f81bc0e24d0ca9 SHA512 88ae96831d3b175fdd7af9a69ae4c993d092c678000d192102ac740609c77b49c9f814338c86e5eba262d44f44738db5bf8cdef53b7567368acfb59ad7a48798
+EBUILD syndication-17.12.1.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/syndication/syndication-17.12.0.ebuild b/kde-apps/syndication/syndication-17.12.0.ebuild
deleted file mode 100644
index f8aebffd02a2..000000000000
--- a/kde-apps/syndication/syndication-17.12.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/syndication/syndication-17.12.1.ebuild b/kde-apps/syndication/syndication-17.12.1.ebuild
new file mode 100644
index 000000000000..3ee4afc41ebb
--- /dev/null
+++ b/kde-apps/syndication/syndication-17.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 9760b12c89da..f74b6a4cdaba 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-17.08.3.tar.xz 41488 BLAKE2B 415204552ee63ca69d656d36b30daceaa53519c72cc923eede2dc77be12008d8338198d46a3a2da15e02790c72890321878e194c597daf8194a58229647f9b2f SHA512 25c533cfbf0e515fb8167143c724e877e4ed7a2100a1c0625cd53b10969a9127ae0b1f9e1a42abd076258525737a3862e7cc11bc31401551d9cdc5473c188485
-DIST kdegraphics-thumbnailers-17.12.0.tar.xz 41496 BLAKE2B c8a459b746c8e399974ad01c59b102b6f342661901f15534667f63de1f66043c23dbe000fdf68d14b6477c51676895d87a62295a347b5234f80402015f7c35c9 SHA512 e8cef7468dbdbe64299f0c9fa41e6a8d1c67ac6540b683c7c62709d0cbbf4ab93307696de4ccbaa1df7821bca98f380e686cdd340b2bda7f2c8efc9a10c9475b
+DIST kdegraphics-thumbnailers-17.12.1.tar.xz 41492 BLAKE2B f554c025f54250e586b960ba139270480a1a5801e261659e15be9f8c38165243e2dda6f465b79b7ab336e235a39b9b6c39c20e933d7f9d6ddb62c82b8b2159fb SHA512 d5ffba0def6dad6f36b2690c353947a4d6d34d94a27faef92ae45ea762b489ed863603a6dd6923a4918d26cdde0c0a796575394a277c644dbceeb4ca58c6895a
 EBUILD thumbnailers-17.08.3.ebuild 610 BLAKE2B cce61c56fcf3b374112349e1d58685a312f8769e6d98efada349292246bd608f57a77ba76353b0c9e2b7aeea9cda55bda433461db9e19a4d42a29074d0294cee SHA512 53a5fa9467b42ef4d1ffd746dd773ecbc6c373a834090f997cfb4029a266650fc11afdc65f8969dc1901c77a7ff9ac88447f82ee3b81178f31a407cc48765353
-EBUILD thumbnailers-17.12.0.ebuild 612 BLAKE2B ece0a6067ef6a40aa3f0f834724ddaa3432f0b13b82fc3fb912cd3a7d1d1346471971e6530f60e91c328e2ccb4bb04e2b44a1308986e51aac2bd091cdb79f4c9 SHA512 7eefcb42d646ae2a423bebe7e04f3063e3300f0150ae41c40f2e22b439a30b1c280a55d3e4351ae6e010a158fdade5718ca89a4beb7172c4b973e8a0eee11c24
+EBUILD thumbnailers-17.12.1.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-17.12.0.ebuild b/kde-apps/thumbnailers/thumbnailers-17.12.0.ebuild
deleted file mode 100644
index 4bad5f5b11de..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-17.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4=false
-KMNAME="kdegraphics-thumbnailers"
-inherit kde5
-
-DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="raw"
-
-DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	raw? (
-		$(add_kdeapps_dep libkdcraw)
-		$(add_kdeapps_dep libkexiv2)
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package raw KF5KExiv2)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/thumbnailers/thumbnailers-17.12.1.ebuild b/kde-apps/thumbnailers/thumbnailers-17.12.1.ebuild
new file mode 100644
index 000000000000..ff1362dbc75b
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-17.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4=false
+KMNAME="kdegraphics-thumbnailers"
+inherit kde5
+
+DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="raw"
+
+DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	raw? (
+		$(add_kdeapps_dep libkdcraw)
+		$(add_kdeapps_dep libkexiv2)
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package raw KF5KExiv2)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 4966e2a1c44e..4a1c615b0597 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-17.08.3.tar.xz 2937664 BLAKE2B 66e814ca8d581e9024a370da0823171373bc52798328e46ac2cdad5cff7b84a10d78eecaf057caba4c254fe58be33960819cbfcd4064c35ce83eb417b85e5199 SHA512 e4574cd6134c080ff5bf49b2c6d1a7e617c2e12b8c5b969cb0dfcec884527371689606274ba5c4be3e9dd6ef2345b05b6411b05bba9c1eee3625ee5322b8c4ad
-DIST umbrello-17.12.0.tar.xz 2961792 BLAKE2B 1b916f1bcf64474fb5159eec2649e986376185065bd0dea1934ca4f117e7e4e8ce1367c479de88c711f4b893024da60964c2174dcdb31d4905505e62936d5553 SHA512 ea70062fc910a6ba837ba6b6f8f42b593edcc3d4b7b2584029d2ca40a08ccde4898e4b39a6ebca77f1a40f56342f91a7c73a9c17e8bdadf9fe6929617be47c5d
+DIST umbrello-17.12.1.tar.xz 2962712 BLAKE2B f34022f1e20022ba07c57c9198b0f023784d99a330155a13ff391e1350b87364bd17205fecd3ae2f19781edd24ebb96c0cb6a8b8e5fb3877574026b6d5ff576c SHA512 9c229f6c757876b74cd471fbc92d1faf049fe97ab1029b258e3908e6549708aaea6a3c0ef4f07d01e5e00ecaa55393756fae9dde83ca1e68d9d04179187da63f
 EBUILD umbrello-17.08.3.ebuild 1372 BLAKE2B 9d8fbfd40bd45668f6d95534cfdd91593df59c66b0686fa9469eff9013beabc3e7789ffd1191d167c4502cba10ebda21760e73a0ae03f248747b253dd081988d SHA512 90443fe7edc0806a0399b5239ba18c24d433627f38239abac1dfd0b972ddb4ab22644e40b79e02d4f8ed4135c376d1485171fc1ba7e36b5266a6e3460a6fb369
-EBUILD umbrello-17.12.0.ebuild 1374 BLAKE2B efbdd5664bc97972da989f9ff43cd24a9f8af4d8653da1f6e039c0b223b03a6c8f82b28fd289f045df6332d7f399ad30f46ee73d551b775e240e8c991fd9a5de SHA512 2484aadcaad71ee10b60db8243e5400dd11cd4c901ad1e3647d063169e27b98bcffe2c99ae348a2e8ce47a013373169268e99f3dcb536b03b0776f50c94274c6
+EBUILD umbrello-17.12.1.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-17.12.0.ebuild b/kde-apps/umbrello/umbrello-17.12.0.ebuild
deleted file mode 100644
index 2310d8a69f4d..000000000000
--- a/kde-apps/umbrello/umbrello-17.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="
-	https://www.kde.org/applications/development/umbrello
-	https://umbrello.kde.org
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdelibs4support)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/umbrello/umbrello-17.12.1.ebuild b/kde-apps/umbrello/umbrello-17.12.1.ebuild
new file mode 100644
index 000000000000..7b9d3d5c2d81
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-17.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="
+	https://www.kde.org/applications/development/umbrello
+	https://umbrello.kde.org
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdelibs4support)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KF5=ON
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index b99dc60d5c61..937bdabb98f7 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-17.08.3.tar.xz 25964 BLAKE2B c73a544bb78b5223e187748a32c95dbf4020d00f876154a3381b28da4de2fd36107ccf5d9d5569ef02ba29b12438efd30ea548ded1b361f7c9a8075b26e2d067 SHA512 4027a8a6d4507c5a3d2167aec2fbb44ff4227990d04ab42888dc6c3458971314e31961ea13e43d6bed7a584eda112591d7a940a45258d92c2491e9eff9c5d1ae
-DIST zeroconf-ioslave-17.12.0.tar.xz 38648 BLAKE2B f7c29f4a012950a71941e7e53b2e55895b0e74b2497bf4979dd3255191245a84895e70e07f9a17dc8a40865217eb8b5d554252b496fc41bb4bd56fd424a79bfa SHA512 2511c2b23f2bb5190e6780a158d05101aaf64412abf26f2ec05ec61aa66980fed4dc23240faf040470cd09fc12632f286328233c06528c0da0544184505248d6
+DIST zeroconf-ioslave-17.12.1.tar.xz 38604 BLAKE2B 86d06b1cad1f6f9a23b489656fd625fe470e0b683989181057e3dc475ceaff0cae26bef9381f55283ba2a79b656f1364502e079904b9a3d9ba949a7ca407292d SHA512 e01ba99adf278838b857378eed276a4e2f86a1b34c1f1ba50e4da62b2109ed23209c2251110cf4eeb3347c219339384da4d66e4e67c99e4fa26d22f4c7f7ff0e
 EBUILD zeroconf-ioslave-17.08.3.ebuild 260 BLAKE2B 41d12dbd8101dde5b8c08942e968db26f36470638e2c4b47a22c8b982fde24c76edc7e7b304af507bce08cf78249951f63c8ee49cc317889805c8d2e0fe225ac SHA512 026e2d5ba45c46f647835da0d8fc539fa7c1b9c8bc17384ff0b49ef75f6bee4d21da012891fc236be6576b469129c8d6270391b37b4769010b0858cab61ce129
-EBUILD zeroconf-ioslave-17.12.0.ebuild 482 BLAKE2B b05a9e72260daa11514d39d3c06afca40aad771d320a1376e66911b79fa3ba13f81064adf245565c2c08db342a74188647d42d7695671972e9e7a198c5165f35 SHA512 68019584dd800e34b97f4feab57137cfbb68e8b0aa2dfb8b8aa7c1163e5d0ff3bbe0ef15147f3de2343846d3ef031cc9c736463d51f398f0c6d710aefe9d6c08
+EBUILD zeroconf-ioslave-17.12.1.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.0.ebuild
deleted file mode 100644
index 0e55e40c3a5f..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.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
-
-inherit kde5
-
-DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.1.ebuild
new file mode 100644
index 000000000000..9b485d5e9478
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8cf8949366d1..9fbecc8b6d7b 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 02f3ea3e3226..0c6db4753782 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,4 +1,4 @@
 AUX basket-2.49a_p20170225-fixes.patch 2428 BLAKE2B 1b1ed57b33d819ac8bde1f4d26b768c69b2414a90363dcbb83ed92378124cf9c46980c3999e6cc8295114f4eb956a298e0a62b9f53e17927d9f2d3657ba32539 SHA512 52aa945f6994fce6c6204ae3893ccc7c656a1c97aeee85062328f7d9f8fdadc354abc0307865b0b2053a1d2da6c95fd1431d9c1e15f699acdd333c16dc1bd27b
 DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
-EBUILD basket-2.49a_p20170225-r1.ebuild 1902 BLAKE2B e2476253e623c07caac40c7477802049f63ad91b3af4573c6aece440fda941cd1b901f6c31a961d058f3916f11a1a1bbc3d7ea31ae76e51af369ec8410850d6f SHA512 3d0012399a25791fe9f3a0bb5d4ebd3e40d669aff4889e1fcf078f0de1401c52c9e8e87d581417c4cad52f5b60986d54dfa51b956ec4d414e427530099e4be89
+EBUILD basket-2.49a_p20170225-r1.ebuild 1879 BLAKE2B 90c8056b6f525f0082d14d673fd1550e982b56115ec67f47d7231e52803a5ab321adf0142f18c17d66c5a173a17fb870e37e1191ef3931c6448e21353550a6b0 SHA512 2f40dbb560c00393ae415d8fa07c1592517c098d043fa3d484cc563f96f11595bfec3fdf0bec927a2a2f65cf0e51ca919b66d1f12a58181550abfb49edeb549b
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
index 6effe58212f8..779c7f651e2a 100644
--- a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
+++ b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 vcs-snapshot
 
 DESCRIPTION="A DropDrawers clone. Multiple information organizer"
-HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket"
+HOMEPAGE="https://github.com/basket-notepads/basket"
 SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 62bc2b1671d3..566348402406 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,6 +1,3 @@
-AUX wacomtablet-3.0.0_beta1-ecm.patch 515 BLAKE2B b3f87b4e9dbe12d0e21d620758a10293053c18c9a52605686371b777f0ee0cf560ecb00a03b925c83ec0b24292ef6cdaf221671664084405a1e557441eb2e33b SHA512 4d261007ab8c034c43024b6224ee89b37487d1d1ea7997e78af35a4d1659900b7961a0db35dbd3627f36b7f5dc32d715559be92f4f1231527af30957ca4cb8aa
-DIST 114856-wacomtablet-3.0.0~beta1.tar.xz 655684 BLAKE2B 666d1e60c7caa763a3e884936f800c122ea0e6151dea89bd44b5d50b203444b3429dac8b0376c5129f29b3103ff2d82ae353eaae7324c422e590c5a8dee88806 SHA512 cf95cbd8f3489bf0d18acfec72ca964685060ae7c7a554b118f5086a46a1e97be67f674f1bf1db6ce15638fcdcfca5043e7438af09ced8acd9fb601c44f433fb
 DIST wacomtablet-2.9.82.tar.xz 708508 BLAKE2B f9f10354f5db42e9acc43b05d00c168bd6f5200ea7d7f7fb4c7f0f3042ab2327d78145f6388e1c607528e14c6e6bd6a33929f952943dba330e02d761634ca37c SHA512 ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904
-EBUILD wacomtablet-3.0.0_beta1.ebuild 1329 BLAKE2B eae5208b475276eda78f9050f23d338b8526c2345d19d998aca1eb92b7c6eed21b359454a73b0f9b8498b2dffbeface34b4ff96ce65615e0238bfc44644323a1 SHA512 110b6373c282417434fbd210287b9e20ba9e3d5133b56eebcdd485f560ce59ac14dcd76583f5132ce66e207fc4b2a72b486ed75820ab12101323170c03f6264d
 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/files/wacomtablet-3.0.0_beta1-ecm.patch b/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
deleted file mode 100644
index dabb90370195..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN wacomtablet-3.0.0~beta1.orig/CMakeLists.txt wacomtablet-3.0.0~beta1/CMakeLists.txt
---- wacomtablet-3.0.0~beta1.orig/CMakeLists.txt	2015-10-28 18:53:01.000000000 +0100
-+++ wacomtablet-3.0.0~beta1/CMakeLists.txt	2016-04-20 17:41:06.087315610 +0200
-@@ -66,5 +66,5 @@
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
--include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+include(ECMOptionalAddSubdirectory)
-+ecm_optional_add_subdirectory( po )
diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
deleted file mode 100644
index 68e289eca042..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#EGIT_BRANCH="releng3.0"
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=114856"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-MY_PV=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-SRC_URI="http://kde-apps.org/CONTENT/content-files/114856-${MY_P}.tar.xz"
-
-S=${WORKDIR}/${MY_P}
-
-CDEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(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/libXi
-	x11-libs/libXrandr
-	x11-libs/libxcb
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/wacomtablet:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-ecm.patch" )
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index f5cf617bab2c..3af5fa654abc 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 08488e23a13e..1aa0aed93520 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,4 +1,4 @@
 AUX font-alias-1.0.3-cvs-tags.patch 1240 BLAKE2B 6bed61707b1d6dceb6c6b89679b0714b9c02659db08efa004b2fdb8f56fa18b817fb509f5f8f8576329d35e221b489886835c86f683c913f025e87927cb932c3 SHA512 dc8beffe37539162a71d2a2635955d3e7c348406c14baf874448af8bc3a21495b27d1797e08153b40bb8e44c6af69137e7a754456e5bfa2f040f4a5c08ce99f1
 DIST font-alias-1.0.3.tar.bz2 102537 BLAKE2B a4a92e147a7c106c6feac39d7b2eaa5785bc4c086d2cf204587ed5b22b1633238b8ddfb8ef212ae84cfa0a61d018fec79cbf9c83b102c8073d3978dfa66fd007 SHA512 05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552
-EBUILD font-alias-1.0.3-r1.ebuild 596 BLAKE2B 7e85b48c36c4589c4ecb1d8c7324c9da5a636a8ecce1f75186f27fe1549ee2c807ffc498f70a544adde692a83d15cb116114856535a44a58ff39889d3a8b3f00 SHA512 287bae8ff53871f44f704b7e045543abaff2aae8020f30bcdcdeef0783f3f22e25aa29296931f18166e7c89bc8e4de7c55fb49e4da1c5425c17965e07238a1a7
+EBUILD font-alias-1.0.3-r1.ebuild 532 BLAKE2B e047d3edf0d1faa6f0efe2e0f5eb987474fe64d1d2c83b2aef469f2a12cbba0e6939441fdef6413c1b804a5e3773538a255867713704762b63288cba36f96662 SHA512 79f95eff9458c40d5080f4c3f419a7624a3dd43cc4df0baf8b536cbcb4a1f58a058dc259a80164563b85c381cc1a425940c3bdee1f550b1dfbfc12caf50dca85
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
index 43f3662642e2..bac830b2cc02 100644
--- a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
 EAPI=5
 inherit xorg-2
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a3f54ca9c816..929bfeebf67a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/panini/Manifest b/media-gfx/panini/Manifest
index 3c9a012abc68..8c48d6f222e1 100644
--- a/media-gfx/panini/Manifest
+++ b/media-gfx/panini/Manifest
@@ -1,5 +1,4 @@
-AUX panini-0.71.104-glu.patch 223 BLAKE2B 67a3cb9dbb6cbda8cd583fb9b69f3d76e53c3f2213052708b2fcb5ab34ef3208db77dc3e8343f5d0cdab1ae1ee7d98682b24bb3dfd3f9239468ddd18120a4b41 SHA512 2220e9f591f87f08dcde24e9c64d2b4160ab2bcda0ac66a79e7a2f6855c8bb63ed415e545f4fd902425d578a4778b87fcc65b22df7cb4788405bf85a9b58c03a
 AUX panini.desktop 250 BLAKE2B 2fe866c696c3056ac914242fa14fd378517dc6fce02bdb9b7e2b6716e825ce9b2efe577132e3a1e71808aa7a17de57e9caa1121143e73d4007405b1ed6d7c666 SHA512 6e4cbf1d2a318d4e593e29d78668dd6cdaa37db82dcd7ed0aaee1b6e25a381c524708b404c9bec3902cd101c46c70e0546425eeed33c41c0deb17751df0f0f40
-DIST Panini-0.71.104-src.zip 602843 BLAKE2B 93882ceebd4cbd7d5b00c4a1f6e34c10c7e5c16b30bb5d2dbd1000377bae7de2e4f73ecfe432a3a9e4b95fae79e06d14d2f08d82f3ba7621067914b3d3426fa8 SHA512 506047cbaf6928ee234ad1071b4aeefeec43dc7cfe7640db796d25c4932521ed19c8adb3983dc00e31595e4ce87c38d65f88903f1756bbae2ce0b19843680737
-EBUILD panini-0.71.104.ebuild 722 BLAKE2B 3c154d62ce87dcf3ecf9e0ac77025f49c574f65156933c514bb5356381ed408e1770d6a88549b05a4b85f5e3c1c186446ec3d64de5863032586638cbd9ff29cc SHA512 f4dd5dfed4b55d0635a959f8c887f255f4c392f354a85d604a15f9ee19fa83b067a3eba6d26b23603e46ed4fb8038c9639ddbd22db50a56eded9148a02da57de
-MISC metadata.xml 333 BLAKE2B 74a8eefa5f7c39c17623d12514c769420ef08e5fcbaeedc9b62544c2557731c7e22bcdf115969f74e84a08247641bce8d960c180d9b1cde583eade008957ed55 SHA512 1f06c9c860d067c0d3e55b95121fe2a0283758efa373623ade699eae8f8d1e6ec5900599fd2cd8e4fba4a514447e7c0c3b0448852d2e80324a62b3b84e2a6ded
+DIST panini-0.72.0.tar.gz 328528 BLAKE2B b5053147d51f308395d2c3505bc0821947cd2c32955f86071cbbdd00c750793729be723c133ec7a619ff0fce5a0d9813580954597137a4e66780390b882bca7f SHA512 b859e723832d2d57de69dcbcd09615245e11d7fce124a55f7795608a8e9337427d9d1d10867ef9eecb16bd792313f5146ae19de553603bd70dedca69ba7c2de1
+EBUILD panini-0.72.0.ebuild 935 BLAKE2B 31116ddc1112f80d223624e2f8b7e7406100b6534ef89f00d08221ada99be8ef5da641b33f06a6d046e2482d5b3af7fc64edd634ad97286a81cf2b0eb04ee876 SHA512 5609c28328e5092d24acf6bf6ba8b9f29de80edae9979b33731720842490ce0632196afb92eb4b3c9777c289378ccc2b0a3ae6e0c4eff9dea960ace9bdde7d56
+MISC metadata.xml 343 BLAKE2B 0eb728b28f25aef454e224b14b8e26ee899664d5fd45fc59e7aca53b5df155120bccafbd3627db7fe2c7cac91943134879eef0161e17fd5d21aa433105087369 SHA512 1515628627be99d296db85501b7239e87368f24d0a238a190b1d330522d9fe371801b7ee90cccf4d48e09d12b53526549b2774b2603e599075cdf5b53bfc8a55
diff --git a/media-gfx/panini/files/panini-0.71.104-glu.patch b/media-gfx/panini/files/panini-0.71.104-glu.patch
deleted file mode 100644
index e9866161ae10..000000000000
--- a/media-gfx/panini/files/panini-0.71.104-glu.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Panini-0.71.104-src/panini.pro
-+++ Panini-0.71.104-src/panini.pro
-@@ -3,6 +3,7 @@
- TARGET = Panini

- CONFIG += debug_and_release

- QT = gui core opengl

-+LIBS += -lGLU -lz

- 

- # # Directories ##

- OBJECTS_DIR = build

diff --git a/media-gfx/panini/metadata.xml b/media-gfx/panini/metadata.xml
index cba202fec3fe..5a6248de464d 100644
--- a/media-gfx/panini/metadata.xml
+++ b/media-gfx/panini/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">pvqt</remote-id>
+		<remote-id type="github">lazarus-pkgs/panini</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/panini/panini-0.71.104.ebuild b/media-gfx/panini/panini-0.71.104.ebuild
deleted file mode 100644
index a71f45456e5f..000000000000
--- a/media-gfx/panini/panini-0.71.104.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2 eutils
-
-MY_P="${P/p/P}-src"
-DESCRIPTION="OpenGL-based panoramic image viewer"
-HOMEPAGE="https://sourceforge.net/projects/pvqt/"
-SRC_URI="mirror://sourceforge/pvqt/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtopengl:4
-	virtual/glu
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glu.patch
-}
-
-src_install() {
-	newbin Panini panini
-	dodoc panini-usage.txt panini-0.71-release.txt
-	domenu "${FILESDIR}"/${PN}.desktop
-	newicon ui/panini-icon-blue.jpg ${PN}.jpg
-}
diff --git a/media-gfx/panini/panini-0.72.0.ebuild b/media-gfx/panini/panini-0.72.0.ebuild
new file mode 100644
index 000000000000..c552c99c816b
--- /dev/null
+++ b/media-gfx/panini/panini-0.72.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils xdg-utils
+
+MY_P="${P/p/P}-src"
+DESCRIPTION="OpenGL-based panoramic image viewer"
+HOMEPAGE="https://github.com/lazarus-pkgs/panini"
+SRC_URI="https://github.com/lazarus-pkgs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	virtual/glu
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+DOCS=( NEWS {BUILD,README,USAGE}.md )
+
+src_prepare() {
+	default
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	einstalldocs
+	dobin panini
+	domenu "${FILESDIR}"/${PN}.desktop
+	newicon ui/panini-icon-blue.jpg ${PN}.jpg
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 888ba5815d36..66e8e9172b21 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,3 +1,3 @@
 DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c
-EBUILD photoqt-1.5.1-r1.ebuild 1137 BLAKE2B 4efd64777f0f3b99eae53339274dc21cd417a38d1f8a80177edb62f9b53fb6773929fc8c63f340bec43fa8cf4eb5007d9e746a791fb3b5d812aad46bd78ff9e0 SHA512 715bf0ae9407a6765a6eda1a17e22804f2d8d38b88e5825278843d09a8e4186a90632d36daed10b7e1f5c671b00f9d0f54c1675f5ae8026f0ab8b3dcda135e67
+EBUILD photoqt-1.5.1-r1.ebuild 1139 BLAKE2B 896daff470d196b0be36ce30011ac6308edd1eca1633d0c9a5757f8a8920e72116169d76c5f7028b3437759cfbada31000d5f0873a4f9a06435fe8a4da08fd0f SHA512 d3e9a337162a71118b8434a90581421583c0f642b7e81c46c37d0186160aad7752d9e4543c22c65d3dcd1717243e9d414e6ffca597a397fbdfa53b2d05974c83
 MISC metadata.xml 351 BLAKE2B baf7ca2b94e8696522c8699324540f9bd29f2968f6f4d907ab50e30268e8475d57baf82486e3ee5b671c9d928fe05a64e71255059cbbe4e69a23abe21ede2a47 SHA512 6db18a60ccd3bc807f609aeb416996221a04eb103a371af840eaac6b676132a3651d311c393854d54dd87a939a15fd69ffc29aca1d1e4a60a1822454aa351b98
diff --git a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
index 257cbfbf17c6..ff02aa7771cc 100644
--- a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
+HOMEPAGE="https://photoqt.org/"
+SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-gfx/qvv/Manifest b/media-gfx/qvv/Manifest
index 13453653be63..cfc96a023eb4 100644
--- a/media-gfx/qvv/Manifest
+++ b/media-gfx/qvv/Manifest
@@ -1,3 +1,4 @@
-DIST qvv-4.02.tar.gz 1837213 BLAKE2B 7cb780fbdfe8135e3c96057f8505248eb385daaaf71690b813b7e1822732e3987a4d3cd98f2229f7957803e387046a14fd21cafd1a67b1002bed084a6709c925 SHA512 2cd82b4c1a1664e2ab2df4b9de21c6504c44baa634e370a0365257f0b5c906d3588af371e754b2a26d86527568aded40112095f55141e159f54ce8d8b663bc6c
-EBUILD qvv-4.02.ebuild 628 BLAKE2B df0f11b9852859b6034755c973906366b4496d3decaf97008c6bed79ef5195aa9cb8d123ace61190ba1b53e9600ca715c6c488ea2d6408d2baad4ccea722e2ca SHA512 c87e5e78d2ee582c8379cd948ce4d99caa8580c9ed14d5bef3a18566ad549998342c51e9ec1fe41c57a60b7e1870c446b50aafe49c0bcf874c0810dbe2cc6661
+AUX qvv-4.04-toLatin1.patch 1008 BLAKE2B bd7a9a6fb8b8051d8ea4e9a7a2c563969eeafbf8b87ae49691f669e8da2318bbad570a2fed917030cdbce644595f1f8b31c5c629291e2b04cdb10dbd20584656 SHA512 2f4f2b8265a6bb7b92fd4b993527877ff3961388088a281a68659f838d9ac57436f59a74b8fb37ec3a02b1eb7624bcb2ccb59c02a555cb91cfdbce41e45c46a9
+DIST qvv-4.04.tar.gz 4580207 BLAKE2B 0f73f455ca5f7446312043c53322668a7824fdbcadb0eff1e98698f14bfbaac7c57a1ac1e7e42164ed1071e319f90d1aa5d57cf865c31d3242bdfd954875c12a SHA512 102c51f7eb146d4ddcbfee16fcf93bc08f874268c2838c1358d314daf466639c5506adc2ba99231cb5f2f7074a980545c1640241396964012e9991b946d7839d
+EBUILD qvv-4.04.ebuild 765 BLAKE2B c7442c9c9dd728a89aee6d47c511301b780a88f238e6607cb0a08de6dd4261c1f5b7a5ca641d27d882d91d74bf30d69b70ef21e11381a05343d9442606dc6484 SHA512 cf340c63a1413618f926bc4754bf89d46bf989d355dcd39ac220b1cf015e5a7dfa0e1da79f7512a2a917e9e54e7eefc10acad04b0dc64370b827b9275bf372be
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/qvv/files/qvv-4.04-toLatin1.patch b/media-gfx/qvv/files/qvv-4.04-toLatin1.patch
new file mode 100644
index 000000000000..3db2b32ad4bc
--- /dev/null
+++ b/media-gfx/qvv/files/qvv-4.04-toLatin1.patch
@@ -0,0 +1,22 @@
+From 61b243ccc907f34115a00572e2d8f2bfa2682e6c Mon Sep 17 00:00:00 2001
+From: Vladi Belperchinov-Shabanski <cade@datamax.bg>
+Date: Thu, 26 Feb 2015 16:08:51 +0200
+Subject: [PATCH] toascii-tolatin1-fix
+
+---
+ src/qvv_main_win.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qvv_main_win.cpp b/src/qvv_main_win.cpp
+index 3516f87..0ade17c 100644
+--- a/src/qvv_main_win.cpp
++++ b/src/qvv_main_win.cpp
+@@ -783,7 +783,7 @@ int QvvMainWindow::deleteItems( int current_only )
+ 
+     //qDebug() << "DELETE YES: " << file_name << " RESBUTTON: " << QVariant( confirm->activated_button ).toString();
+ 
+-    QString path_hash = QVariant( QCryptographicHash::hash( cdir.absolutePath().toAscii(), QCryptographicHash::Sha1 ).toHex() ).toString();
++    QString path_hash = QVariant( QCryptographicHash::hash( cdir.absolutePath().toLatin1(), QCryptographicHash::Sha1 ).toHex() ).toString();
+     QString trash_file_name = trash_can + "/" + path_hash + "." + item->text( 1 );
+ 
+     int moved_ok = 0;
diff --git a/media-gfx/qvv/qvv-4.02.ebuild b/media-gfx/qvv/qvv-4.02.ebuild
deleted file mode 100644
index 59fb3f5f3b7a..000000000000
--- a/media-gfx/qvv/qvv-4.02.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils qt4-r2
-
-DESCRIPTION="QVV Image Viewer and Browser"
-HOMEPAGE="http://cade.datamax.bg/qvv/"
-SRC_URI="http://cade.datamax.bg/qvv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dobin qvv || die "dobin failed"
-	doicon images/qvv_icon_128x128.png || die "doicon failed"
-	make_desktop_entry qvv QVV qvv_icon_128x128
-	dodoc ANFSCD GPG_README HISTORY README todo.txt || die "dodoc failed"
-}
diff --git a/media-gfx/qvv/qvv-4.04.ebuild b/media-gfx/qvv/qvv-4.04.ebuild
new file mode 100644
index 000000000000..bd8c0105b3bc
--- /dev/null
+++ b/media-gfx/qvv/qvv-4.04.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="QVV Image Viewer and Browser"
+HOMEPAGE="http://cade.datamax.bg/qvv/"
+SRC_URI="https://github.com/cade-vs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ANFSCD GPG_README HISTORY README todo.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-toLatin1.patch )
+
+src_configure() {
+	eqmake5 src/${PN}.qt5.pro
+}
+
+src_install() {
+	einstalldocs
+	dobin qvv || die "dobin failed"
+	doicon images/qvv_icon_128x128.png || die "doicon failed"
+	make_desktop_entry qvv QVV qvv_icon_128x128
+}
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 81a6189e3775..86b4c7ea2bd8 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -17,5 +17,5 @@ DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a4
 DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
 EBUILD xfig-3.2.5c-r1.ebuild 3203 BLAKE2B 7525f53b1b9a9d05fee6c04c53486e5b6954122b0898c0658869432a36730a91e47c4cfe694755e27baf4fe7328f7b4380adc6b4ed08248b9c7adba884e685c7 SHA512 45971e1e43c8f54d0c1a4a57596edae08e52239dd06dd066ff6186c6da759a823b78becd86d3249e17b98f1ef0aafe8aec552669120ebae634391a8d5d3d7b35
 EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b
-EBUILD xfig-3.2.6a.ebuild 1211 BLAKE2B a4f47af09fe7611f0139b9d013834ff16ffd7dcdb2f95b82d46cb245788f9cd182072dc115cae095fb047e28060983511c6ae38026fb9a3c61287e2a422f9bd1 SHA512 262069c86ed2cecf02e6f49720683a1811133a00ad0b1e7d3b22764bcea9e0f02087dce3675368d78ca336cd235e54fea9ed7b78e4207f60029000adb313b383
+EBUILD xfig-3.2.6a.ebuild 1209 BLAKE2B 750839e5e0333f234533c784791b1b3f4917ccc219d5d0ee61ee5468fe18213498ef4615536624a417a90d7f8c45931f9ad0293e64ba99bd2280a6492f9b334a SHA512 fba531cc5a57174e7f8f69b9a5325775db1b67a442ba04ef8f17a1f3039ae2296667be53aa3ac5de4f47a237608da3bedd5ecc99735b1ceb4a041b3d0634ff4a
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
index 3ae5e4b55305..9f61211e8523 100644
--- a/media-gfx/xfig/xfig-3.2.6a.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5eb47a1dff8d..3b12d86be482 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index c5ae46cc0ea3..bf853fb272e6 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,6 +1,13 @@
 AUX libffado-2.3.0-gcc6.patch 1311 BLAKE2B 76148cf44af3130199e8709aae5f7a276a4ed93acfb06735219bc3e4b1bc0d1d37cff57cd20f216e50ec8c1109e33439ecec666a3272809e940b54d61342d027 SHA512 a700c46af0313511bba311fe95634dc0090507256a9ff60a30d10b221fe267d1190af4710b1c4747f8bfa057b0af96e6bab78f6ec4ecef08fb48425092751cd7
 AUX libffado-2.3.0-include-signal.patch 1246 BLAKE2B ac37bf4da0600c0ee518ace257b0de2aaad5a815e3cbedf51490c06ad90acdd893ee2fc40b4b318411c59515654db5276f40e5b0fbe877b5d2985a9e56b0c42e SHA512 c256a59a77160141e082fa6cf358ae0454779e15c01a9ceaf1df8ecd101afc74246654f9c088a67c5453434430bdd390ab2712c617737b2a93fa54edcf685177
 AUX libffado-2.3.0-modelname-strip.patch 2128 BLAKE2B 29c52d8d30136e0a040fe1801a15f4149affbb7de721f8614416a407952714426036f77c2b6451d7bf1f69adbe003258098d2dceda52a7f8d9da0604cdf78a26 SHA512 1ebbe47bdd4d15d6527c4a8c2dfa02861c8a8ce287e1cd44e80356b52007c6e55bc9f267436467f1600c0efbd261da227b947b3648c6a8efcedf8997356153ac
+AUX libffado-2.4.0-additional-py3-fixes.patch 3657 BLAKE2B 8bb214f90fac168c682119d8758efd67812da784770684e7ff47c1d64146da79346d61dfe5b17c0d5e23700f04605d073147a1dd335f0a1da72faf68418a5cd7 SHA512 feb6cd85ee487182b56f003ddee1fc7a1aa3aa07d6d1f3ccbd2ab3735e5d756e836062789a71248d6a16f7377d9d76645c0a17ab76a8d9178b1154cd67783be8
+AUX libffado-2.4.0-crossbar-router-fix.patch 496 BLAKE2B 7a2b88344c319eb5c1da7a4430600843e57eccc6b96d833b7dfc17ca8f63fb22ff50d959ad06c4c8d06036a96412064ce5630f4a26b53fa0b5eb2e392d8ada66 SHA512 5f31f7db57cf54c05dc00bb00f5f0a5e1771dfd2cd716d9bc56788c24313d14d26fb0ffc7865acb5b55504592929a6b271f657e25971eee37c4aa0a7cc03c382
+AUX libffado-2.4.0-py3-pyqt5-fixes.patch 9119 BLAKE2B e1b4ead17535e573bfced949652fec2418b0236b4ab3146f45f6931b0d80f5c1af86f17247e931baf07d9efd3c3726e0d9a0cc42783fd9053464073bdc233577 SHA512 26f34e318040e3fb9066424538d4ad7dd41e49e93c5f89161cd460bce862d3e2a25e0a2ffb6c28beb1f91fdd00a146f7d33930242e52e5148a7d1a0fb0e1ff28
+AUX libffado-2.4.0-pyqt5-dbus-detection.patch 1503 BLAKE2B 448eb997454a72f9d55722462dbe696d293b271002acf205c73e5fb59690ab7ae622830e09ab05def50d73d3fa1bc62076ead695a7d79335b75a00d3a4f1ce73 SHA512 29a44a73786256e8aec380e4e68df9f6de3ceb1d7bf1d4f1565585418ab4167ac2d16b85958cc1acfa60906b384445bd82866d05d3c3f3bdc517ae424d83e559
+AUX libffado-2.4.0-rme-bigendian-fix.patch 1618 BLAKE2B db8969797d9f8bdf4aac9a1e8474ad7d84428ede18788746b885ed037dcc71798a348bc86335dd72083a3937ad00170f6bbe412666f3109395642186b0fb4e2c SHA512 0ecb20c21858df87f53c0033109a4b736e1a38dc8a2b0ed00660cd3b80f74ce7b4cb87438ac5a37e11f0d4650166b3519e163f442d27a7822a24f4485626d776
 DIST libffado-2.3.0.tgz 1239253 BLAKE2B cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5 SHA512 24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
+DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
 EBUILD libffado-2.3.0.ebuild 2684 BLAKE2B 223f4ecd0acedf93aa83a1f0a47fa3f23a731313cca1ea5663b1c4fee515a594df0d04dad429e16c2240e60249b5a0aa151890e57d550462f050bd0ee0c028c6 SHA512 68469a77cf5bba5cc880c35b1d07d0bcb36f41901eebe92e8e127b4cbcd08671d393e29723743d568b5122e878b7f097e512eca6b3a05971fbd0b7b06b9617d4
+EBUILD libffado-2.4.0.ebuild 3194 BLAKE2B 57fc39ce908391aa991a5dc87d90cc9d709320c65c32eec065fb236a8cc3b5cf6b713b3e97bba0d4de1f96bf9dffb7922b8b8b33d6c31fe3608cba9a00a0b82f SHA512 54574ea4a2baa8a18d4dff29972c96cf94401af1e76afb52271358a0d353e51e4aa589bf590534eaf289998c72e3ee36983a55b77cb3b9969fe480a570c290f3
 MISC metadata.xml 625 BLAKE2B ba2bee4e1ba0c8bc9e8a4bda63c8a184fa4992683ec24bec54424049fbc1b66a8332f25eb6c7841df0198a3a973408fbfe82f0ee306d49f1809d82c12ec3b0c0 SHA512 ac725c6eabcc3cd7fa5ac9f20d936e5a1c494d2a2ed6e504bf27cc750cd328600a8dbcd0adeb27d2bd760ce2b577f9860b1041a899fbfde6b67c4b6a681658eb
diff --git a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
new file mode 100644
index 000000000000..fd5d2f44babd
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
@@ -0,0 +1,96 @@
+--- a/support/mixer-qt4/ffado/panelmanager.py	2018-01-11 12:27:20.518923209 +0900
++++ a/support/mixer-qt4/ffado/panelmanager.py	2018-01-11 12:31:03.956299962 +0900
+@@ -38,6 +38,7 @@
+ 
+ import sys
+ import time
++import importlib
+ 
+ import logging
+ log = logging.getLogger('panelmanager')
+@@ -302,20 +303,15 @@
+         #
+         # Specific (or dummy) mixer widgets get loaded in the following
+         #
++        found = False
+         if 'mixer' in dev and dev['mixer'] != None:
+             mixerapp = dev['mixer']
+-            global mixerwidget
+-            exec( """
+-try:
+-    import ffado.mixer.%s
+-    globals()["mixerwidget"] = ffado.mixer.%s.%s( w )
+-    found = True
+-except ImportError:
+-    log.debug("bypassdbus set, %s module not available: ignored")
+-    found = False
+-""" % (mixerapp.lower(), mixerapp.lower(), mixerapp, mixerapp.lower()) )
+-        else:
+-            found = False
++            try:
++                mixer_module = importlib.import_module("ffado.mixer.%s" % mixerapp.lower())
++                mixerwidget = getattr(mixer_module, mixerapp)(w)
++                found = True
++            except ImportError:
++                log.debug("bypassdbus set, %s module not available: ignored" % mixerapp.lower())
+ 
+         if not found:
+             mixerwidget = Dummy( w )
+--- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:34:10.200777889 +0900
++++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:45:13.278911705 +0900
+@@ -194,7 +194,7 @@
+         #log.debug("Got %i peaks" % len(peakvalues))
+         for peak in peakvalues:
+             #log.debug("peak = [%s,%s]" % (str(peak[0]),str(peak[1])))
+-            if peak[0] >= 0:
++            if peak[1] >= 0:
+                 self.switchers[peak[0]].peakValue(peak[1])
+ 
+     def updateMixerRouting(self):
+--- a/support/mixer-qt4/ffado/widgets/matrixmixer.py	2018-01-11 12:54:27.545361864 +0900
++++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py	2018-01-11 12:56:36.899124318 +0900
+@@ -512,7 +512,7 @@
+                     self.rowHeaders[j].lbl.setText(row_name)
+ 
+     def updateValues(self, n):
+-        nbitems = len(n)/3
++        nbitems = len(n) // 3
+         for i in range(nbitems):
+             n_0 = n[3*i]    
+             n_1 = n[3*i+1]   
+@@ -951,7 +951,7 @@
+             return self.interface.setValue(In, Out, val)            
+ 
+     def updateValues(self, n):
+-        nbitems = len(n)/3
++        nbitems = len(n) // 3
+         for j in range(nbitems):
+             n_0 = n[3*j]    
+             n_1 = n[3*j+1]   
+@@ -1406,7 +1406,7 @@
+     def matrixControlChanged(self, n):
+         # Update value needed for "per Out" view
+         #log.debug("Update per Output( %s )" % str(n))
+-        nbitems = len(n)/3
++        nbitems = len(n) // 3
+         if (self.rule == "Columns_are_inputs"):
+            n_t = n
+         else:
+@@ -1420,7 +1420,7 @@
+     def sliderControlChanged(self, n):
+         # Update value needed for matrix view
+         #log.debug("Update Matrix( %s )" % str(n))
+-        nbitems = len(n)/3
++        nbitems = len(n) // 3
+         if (((self.rule == "Columns_are_inputs") and not self.transpose) or ((self.rule != "Columns_are_inputs") and self.transpose)):
+             n_t = ()
+             for i in range(nbitems):
+@@ -1512,7 +1512,7 @@
+                 log.debug("Number of stereo output channels must be specified")
+                 return False
+             n = int(readMixerString[idx+2])
+-            if n > self.perOut.nbOut/2:
++            if n > self.perOut.nbOut // 2:
+                 log.debug("Incoherent number of stereo channels")
+                 return False
+             if n > 0:
diff --git a/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch b/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch
new file mode 100644
index 000000000000..99861abe284e
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch
@@ -0,0 +1,11 @@
+--- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:34:10.200777889 +0900
++++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:45:13.278911705 +0900
+@@ -98,7 +98,7 @@
+             self.combo.setCurrentIndex(self.combo.findText(src))
+         else:
+             self.combo.setCurrentIndex(0)
+-        self.combo.activated.connect(self.comboCurrentChanged)
++        self.combo.activated[str].connect(self.comboCurrentChanged)
+ 
+ 
+     def peakValue(self, value):
diff --git a/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch b/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch
new file mode 100644
index 000000000000..f0937559b8e9
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch
@@ -0,0 +1,197 @@
+------------------------------------------------------------------------
+r2726 | jwoithe | 2018-01-05 18:56:40 +0900 (Fri, 05 Jan 2018) | 13 lines
+
+Further Python3/PyQt5 compatibility fixes, enhance "About" dialog box.
+
+This patch was prepared by Orcan Ogetbil on Fedora and tested on that
+distribution with PyQt4-4.12.1 and PyQt5-5.9.1.  It is primarily concerned
+with additional compatibility between Python2/3 and PyQt4/5.  It has also
+been tested under python 2 with pyqt 4.11.4.  Further testing under
+different python/pyqt environments would be welcomed.
+
+An enhancement to the "About" dialog is also included which adds version
+strings and updates the copyright year range.
+
+The patch was submitted to the ffado-devel mailing list.
+
+
+Index: support/mixer-qt4/ffado/ffadowindow.py
+===================================================================
+--- a/support/mixer-qt4/ffado/ffadowindow.py	(revision 2725)
++++ b/support/mixer-qt4/ffado/ffadowindow.py	(revision 2726)
+@@ -22,6 +22,8 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
++import ctypes
++import datetime
+ import os
+ 
+ from ffado.config import *
+@@ -92,7 +94,8 @@
+             self.menuTheme[theme].setCheckable(True)
+ 
+             if (ffado_python3 and (self.style().objectName().lower() == theme.lower()) or
+-                    not(ffado_python3) and (self.style().objectName().toLower() == theme.toLower())):
++                    not(ffado_python3) and (self.style().objectName().toLower() == theme.toLower() if ffado_pyqt_version == 4 else
++                                            self.style().objectName().lower() == theme.lower())):
+                 self.menuTheme[theme].setDisabled(True)
+                 self.menuTheme[theme].setChecked(True)
+             self.menuTheme[theme].triggered.connect(self.switchTheme )
+@@ -174,9 +177,11 @@
+         QMessageBox.about( self, "About FFADO", """
+ <h1>ffado.org</h1>
+ 
++<p>{ffado_version}</p>
++
+ <p>FFADO is the new approach to have firewire audio on linux.</p>
+ 
+-<p>&copy; 2006-2014 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p>
++        <p>&copy; 2006-2018 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p>
+ 
+ <p>FFADO developers are:<ul>
+ <li>Pieter Palmers
+@@ -191,8 +196,17 @@
+ <li>Stefan Richter
+ <li>Jano Svitok
+ </ul>
+-""" )
++        """.format(ffado_version=get_ffado_version(), thisyear=datetime.datetime.now().year))
+ 
++def get_ffado_version():
++    try:
++        # call the C function ffado_get_version() to figure out the version
++        lib = ctypes.cdll.LoadLibrary('libffado.so')
++        func = ctypes.CFUNCTYPE(ctypes.c_char_p)
++        ffado_get_version = func(('ffado_get_version', lib))
++        return ffado_get_version()
++    except:
++        return "libffado"
+ 
+ def get_lock(process_name):
+     import socket
+@@ -252,6 +266,7 @@
+     logging.getLogger('global').setLevel(debug_level)
+ 
+     log = logging.getLogger('main')
++    log.debug("Using %s with Qt: %s PyQt: %s" % (get_ffado_version(), QtCore.QT_VERSION_STR, QtCore.PYQT_VERSION_STR))
+ 
+     app = QApplication(args)
+     app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) )
+Index: support/mixer-qt4/ffado/logginghandler.py
+===================================================================
+--- a/support/mixer-qt4/ffado/logginghandler.py	(revision 2725)
++++ b/support/mixer-qt4/ffado/logginghandler.py	(revision 2726)
+@@ -28,7 +28,7 @@
+ log = logging.getLogger('logginghandler')
+ 
+ class QStatusLogger( QObject, logging.Handler ):
+-    log = pyqtSignal(QString, int, name='log')
++    log = pyqtSignal(QString if ffado_pyqt_version == 4 else str, int, name='log')
+     def __init__( self, parent, statusbar, level=logging.NOTSET ):
+         QObject.__init__( self, parent )
+         logging.Handler.__init__( self, level )
+Index: support/mixer-qt4/ffado/panelmanager.py
+===================================================================
+--- a/support/mixer-qt4/ffado/panelmanager.py	(revision 2725)
++++ b/support/mixer-qt4/ffado/panelmanager.py	(revision 2726)
+@@ -378,7 +378,7 @@
+         action = self.sender()
+         # Extract the action data and store as a dbus.String type so 
+         # it is usable as a key into self.panels[].
+-        panel_key = dbus.String(action.data().toString())
++        panel_key = dbus.String(action.data().toString() if ffado_pyqt_version == 4 else action.data())
+         self.tabs.setCurrentIndex(self.tabs.indexOf(self.panels[panel_key]))
+ 
+     def displayPanels(self):
+@@ -515,6 +515,8 @@
+           saveString.append('</device>\n')
+         # file saving
+         savefilename = QFileDialog.getSaveFileName(self, 'Save File', os.getenv('HOME'))
++        if isinstance(savefilename, tuple): # newer PyQt5
++            savefilename = savefilename[0]
+         try:
+           f = open(savefilename, 'w')
+         except IOError:
+@@ -526,6 +528,8 @@
+ 
+     def readSettings(self):
+         readfilename = QFileDialog.getOpenFileName(self, 'Open File', os.getenv('HOME'))
++        if isinstance(readfilename, tuple): # newer PyQt5
++            readfilename = readfilename[0]
+         try:
+           f = open(readfilename, 'r')
+         except IOError:
+Index: support/mixer-qt4/ffado/widgets/crossbarrouter.py
+===================================================================
+--- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py	(revision 2725)
++++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py	(revision 2726)
+@@ -168,7 +168,10 @@
+         self.timer.setInterval(200)
+         self.timer.timeout.connect(self.updateLevels)
+ 
+-        self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False).toBool())
++        if ffado_pyqt_version == 4:
++            self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False).toBool())
++        else:
++            self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False) == u'true')
+ 
+     def __del__(self):
+         print( "CrossbarRouter.__del__()" )
+Index: support/mixer-qt4/ffado/widgets/matrixmixer.py
+===================================================================
+--- a/support/mixer-qt4/ffado/widgets/matrixmixer.py	(revision 2725)
++++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py	(revision 2726)
+@@ -200,7 +200,7 @@
+ 
+     def mousePressEvent(self, ev):
+         if ev.buttons() & Qt.LeftButton:
+-            self.pos = ev.posF()
++            self.pos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos()
+             self.tmpvalue = self.value()
+             ev.accept()
+             #log.debug("MixerNode.mousePressEvent() %s" % str(self.pos))
+@@ -207,7 +207,7 @@
+ 
+     def mouseMoveEvent(self, ev):
+         if hasattr(self, "tmpvalue") and self.pos is not QtCore.QPointF(0, 0):
+-            newpos = ev.posF()
++            newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos()
+             change = newpos.y() - self.pos.y()
+             #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change)))
+             self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) )
+@@ -215,7 +215,7 @@
+ 
+     def mouseReleaseEvent(self, ev):
+         if hasattr(self, "tmpvalue") and self.pos is not QtCore.QPointF(0, 0):
+-            newpos = ev.posF()
++            newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos()
+             change = newpos.y() - self.pos.y()
+             #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change)))
+             self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) )
+@@ -257,19 +257,19 @@
+         if v == 0:
+             symb_inf = u"\u221E"
+             text = "-" + symb_inf + " dB"
+-        if ffado_python3:
++        if ffado_python3 or ffado_pyqt_version == 5:
+             # Python3 uses native python UTF strings rather than QString.
+             # This therefore appears to be the correct way to display this
+             # UTF8 string, but testing may prove otherwise.
+             p.drawText(rect, Qt.AlignCenter, text)
+         else:
+-            p.drawText(rect, Qt.AlignCenter, QtCore.QString.fromUtf8(text))
++            p.drawText(rect, Qt.AlignCenter, QString.fromUtf8(text))
+         if (self.inv_action!=None and self.inv_action.isChecked()):
+-            if ffado_python3:
++            if ffado_python3 or ffado_pyqt_version == 5:
+                 # Refer to the comment about about Python UTF8 strings.
+                 p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, " ϕ")
+             else:
+-                p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, QtCore.QString.fromUtf8(" ϕ"))
++                p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, QString.fromUtf8(" ϕ"))
+ 
+     def internalValueChanged(self, value):
+         #log.debug("MixerNode.internalValueChanged( %i )" % value)
+
+------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch b/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch
new file mode 100644
index 000000000000..9064a59a6bcc
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch
@@ -0,0 +1,30 @@
+------------------------------------------------------------------------
+r2725 | jwoithe | 2018-01-05 18:40:19 +0900 (Fri, 05 Jan 2018) | 11 lines
+
+SCons: fix detection of dbus on PyQt5 systems.
+
+The detection of the dbus python modules was qualified on the presence of
+pyuic4.  On systems with only PyQt5 this would obviously fail.  Patch from
+Orcan Ogetbil via the ffado-devel mailing list.
+
+r2724 inadvertently included a change to SConstruct to import sys.  This is
+needed since sys.stdout is referenced in some situations (in particular, if
+jack is not installed in the build environment).  This patch was also from
+Orcan Ogetbil, via the ffado-devel mailing list.
+
+
+Index: SConstruct
+===================================================================
+--- a/SConstruct	(revision 2724)
++++ b/SConstruct	(revision 2725)
+@@ -396,7 +396,7 @@
+ 
+ # PyQT checks
+ if env['BUILD_MIXER'] != 'false':
+-    have_dbus = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ))
++    have_dbus = ((conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) or (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' )))
+     have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' ))
+     have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' ))
+     if ((have_pyqt4 or have_pyqt5) and have_dbus):
+
+------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch b/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch
new file mode 100644
index 000000000000..8e0158a03c5d
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch
@@ -0,0 +1,50 @@
+------------------------------------------------------------------------
+r2724 | jwoithe | 2018-01-05 18:33:39 +0900 (Fri, 05 Jan 2018) | 8 lines
+
+RME: ensure byte swap macros are available for all components.
+
+The byte swap macros (ByteSwap32() in particular) are required on big-endian
+architectures for more than just the rme_avdevice module.  Including these
+in the RME device header file is a reasonable way to fix this.
+
+Patch from Orcan Ogetbil via the ffado-devel mailing list.
+
+
+Index: SConstruct
+===================================================================
+--- a/SConstruct	(revision 2723)
++++ b/SConstruct	(revision 2724)
+@@ -29,6 +29,7 @@
+ from subprocess import Popen, PIPE
+ import os
+ import re
++import sys
+ from string import Template
+ import imp
+ import distutils.sysconfig
+Index: src/rme/rme_avdevice.cpp
+===================================================================
+--- a/src/rme/rme_avdevice.cpp	(revision 2723)
++++ b/src/rme/rme_avdevice.cpp	(revision 2724)
+@@ -42,7 +42,6 @@
+ #include <stdint.h>
+ #include <assert.h>
+ #include <unistd.h>
+-#include "libutil/ByteSwap.h"
+ 
+ #include <iostream>
+ #include <sstream>
+Index: src/rme/rme_avdevice.h
+===================================================================
+--- a/src/rme/rme_avdevice.h	(revision 2723)
++++ b/src/rme/rme_avdevice.h	(revision 2724)
+@@ -31,6 +31,7 @@
+ #include "libavc/avc_definitions.h"
+ 
+ #include "libutil/Configuration.h"
++#include "libutil/ByteSwap.h"
+ 
+ #include "fireface_def.h"
+ #include "libstreaming/rme/RmeReceiveStreamProcessor.h"
+
+------------------------------------------------------------------------
diff --git a/media-libs/libffado/libffado-2.4.0.ebuild b/media-libs/libffado/libffado-2.4.0.ebuild
new file mode 100644
index 000000000000..10e673c6113d
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.0.ebuild
@@ -0,0 +1,119 @@
+# 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 desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
+
+DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
+HOMEPAGE="http://www.ffado.org"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
+else
+	SRC_URI="http://www.ffado.org/files/${P}.tgz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="debug qt5 test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
+	dev-libs/dbus-c++
+	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libiec61883[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	qt5? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
+		x11-misc/xdg-utils
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!<media-sound/jack-audio-connection-kit-0.122.0:0
+	!<media-sound/jack-audio-connection-kit-1.9.9:2"
+
+PATCHES=(
+	"${FILESDIR}/${P}-rme-bigendian-fix.patch"
+	"${FILESDIR}/${P}-pyqt5-dbus-detection.patch"
+	"${FILESDIR}/${P}-py3-pyqt5-fixes.patch"
+	"${FILESDIR}/${P}-additional-py3-fixes.patch"
+	"${FILESDIR}/${P}-crossbar-router-fix.patch"
+)
+
+myescons() {
+	local myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		UDEVDIR="$(get_udevdir)/rules.d"
+		CUSTOM_ENV=true
+		DETECT_USERSPACE_ENV=false
+		DEBUG=$(usex debug)
+		PYPKGDIR="$(python_get_sitedir)"
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=false
+		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
+		# lower versions.
+		ENABLE_SETBUFFERSIZE_API_VER=force
+	)
+	if multilib_is_native_abi; then
+		myesconsargs+=(
+			BUILD_MIXER=$(usex qt5 true false)
+			BUILD_TESTS=$(usex test-programs)
+		)
+	else
+		myesconsargs+=(
+			BUILD_MIXER=false
+			BUILD_TESTS=false
+		)
+	fi
+	escons "${myesconsargs[@]}" "${@}"
+}
+
+src_prepare() {
+	default
+
+	# Python3 fixes
+	sed -i -e 's/\t/        /g' support/mixer-qt4/ffado/mixer/phase88control.py || die
+	sed -i -e 's/\t/        /g' support/mixer-qt4/ffado/mixer/audiofire.py || die
+	sed -i -e 's/\bprint \(.*\)$/print(\1)/g' -e '/import commands/d' support/tools/ffado-diag-static || die
+
+	# Always use Qt5
+	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC CXX
+	myescons
+}
+
+multilib_src_install() {
+	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	python_fix_shebang "${D}"
+	python_optimize "${D}"
+
+	if use qt5; then
+		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+	fi
+}
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index a5911762d927..d9b56a87a450 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,5 +1,5 @@
-AUX libxspf-1.2.0-gcc44.patch 512 BLAKE2B f688d85fb8bddecfa1864827e210bc5762724221c353a315fc3b5f2819ee9b2699f96e05cc8e335823b71f27a0df268e4db3431f5f6d96aad8f4f8bda576d59b SHA512 968a5e53d91ddc724d321d7598f3cbe7c6e28a343a96ad27cac92ec9603eead6e4452e2965c780bf530db211e62def810bdefd1edd4e7785fd5f646d01af78d6
-AUX libxspf-1.2.0-gcc47.patch 263 BLAKE2B 05cf6ebd828c31cca516146b2ab53cedc9094a875aceb7feb78a092b0a85c2b19d63799c6f24c8e59ead967e37b25a59f83f99f4089af8319e00bb5e831cb6ed SHA512 893f3cf22aa2ede98efb53f8aef553fd7418254f9aa92f7f2126eb5c2f2b66bae94fe43049b59642793ced74168369e32a04ae21719b8e041b5d9ecc0626e6ad
+AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
+AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
 DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
-EBUILD libxspf-1.2.0.ebuild 1011 BLAKE2B a5947bf7e0963d656ea17ac724dcfd033102924e3d0922a548d390357900e43ee5704d24bf5ccd18755fa6611e402ab23a8b7994266f04658e9488f9242bdee4 SHA512 95b48eb0281cec4be7ea2622ca4e0e6f209f440677006bb295d615f74404a11c39e714e9da2e17a125ca0b58490c61814fbf7c3e404a237f6fe43fc0d86fe454
+EBUILD libxspf-1.2.0.ebuild 1017 BLAKE2B ca6c00513f893d9f8befb3f1e558e76b6a24481672eabfc7affeba8cad7f8b5688088fcb53576d6bc3b0e8875683e9eda337ba7bf9280cb6b85042cf271d4715 SHA512 a4027b33b273a361fdb55687ccc6d48f5dd08df04757d9f8e48b9ad9e346c7b042a2e2cb6116472a98427be3820ec9c51b0dcdb588a81e16eafa4c26d4c35c14
 MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
index fa16b589df30..668e8af1be16 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/261604
 
---- test/OfficialSuite.cpp
-+++ test/OfficialSuite.cpp
+--- a/test/OfficialSuite.cpp
++++ b/test/OfficialSuite.cpp
 @@ -21,6 +21,7 @@
   * Sebastian Pipping, sping@xiph.org
   */
@@ -10,8 +10,8 @@ http://bugs.gentoo.org/261604
  #include "OfficialSuite.h"
  #include <xspf/XspfReaderCallback.h>
  using namespace Xspf;
---- test/ProjectOpus/ProjectOpusSuite.cpp
-+++ test/ProjectOpus/ProjectOpusSuite.cpp
+--- a/test/ProjectOpus/ProjectOpusSuite.cpp
++++ b/test/ProjectOpus/ProjectOpusSuite.cpp
 @@ -21,6 +21,7 @@
   * Sebastian Pipping, sping@xiph.org
   */
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
index b408416e7ef7..76c0dca755f8 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/421745
 
---- examples/read/read.cpp
-+++ examples/read/read.cpp
+--- a/examples/read/read.cpp
++++ b/examples/read/read.cpp
 @@ -43,6 +43,7 @@
  #include <cstdio>
  #include <cstdlib> // MAX_PATH
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
index a7c71fb4d12b..fa7f0ecfa6f8 100644
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=6
+
+inherit xdg-utils
 
 DESCRIPTION="Playlist handling library"
 HOMEPAGE="http://libspiff.sourceforge.net/"
@@ -11,38 +12,39 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc static-libs test"
+IUSE="static-libs test"
 
-RDEPEND=">=dev-libs/expat-2
+RDEPEND="
+	>=dev-libs/expat-2
 	>=dev-libs/uriparser-0.7.5"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.8
-		media-gfx/graphviz
-		dev-qt/qthelp:4
-		)
 	test? ( >=dev-util/cpptest-1.1 )"
 
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+	default
+	xdg_environment_reset
+
+	# do not install missing files
+	sed -e 's/gif,//' -i doc/Makefile* \
+		-i bindings/c/doc/Makefile* || die "sed failed"
 }
 
 src_configure() {
-	export XDG_CONFIG_HOME="${T}" #398881#c2
-
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-doc \
 		$(use_enable static-libs static) \
-		$(use_enable test) \
-		$(use_enable doc)
+		$(use_enable test)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 1b2d6b4d4a40..5db35316f830 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,4 @@
 AUX osl-1.8.12-cmake-fixes.patch 14704 BLAKE2B dd7d37ae117c338aa72893a26e59f3046c89d5ddc57c7dfc90225d1e49f5bd4346869db7621e2ec0b7c082650d54987a4f6c1196a169828fa17388ad7a3a32e3 SHA512 14059eb68c520e90ed3217b0480929efa4b1ccfa6860649ca86285856d8f5efd07a563ad01dc8bb46dd42d277708b27a9a9f8833f60960502162df0fc1ee243c
 DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
-EBUILD osl-1.8.12.ebuild 1791 BLAKE2B bf0aec35ff9f0b9007795cfd45f5b75aada87a3ca1a98b3cba6f7f457d42ce884c542e7814da1ffdfa31ed381879ccb9c39b42ec4a50ca6adb0725b1db6aca80 SHA512 bb70c8957567653bf9ae2f8ea7beaba631c55e94695a6e60e21f5b30520c2bc437ad966e9c596981a5ca4be6d89e378a14cb65ff2e52154a14827922bdcb3d80
+EBUILD osl-1.8.12.ebuild 1785 BLAKE2B 3e9f514b592c1efc8393ccb49f3972aac28e7ed739e1eadf5b37f3fa78eb73d9eb0ad53090aed2e12038eebbdfd2378f8382c7a5c170e74e4a12683a36ca52ca SHA512 d3ca22e3a8ef7332cb4e9f62c078c4a1a5a77c91a635d183e0a0196d18d0be2e22ca263612b7c6e6f4a45a7eeb74df33657128089143111c408860a2329e26b7
 MISC metadata.xml 872 BLAKE2B 62a7dd02eb26c8784a8ac14469132120ad9e5f99985ceabae37c479e3097867c219e1508080c0f5659f4e9cc9d7964fb1b809fb539f9643b168e66349d7ae0e2 SHA512 549fddfb5428c2ca52bb8470d10ee48ceaa3495c4e55934f6a8a5864886f2e63ae43fbe6f716439897ac3a6bbbb0c9a8770f8243bb7a8bbf953dce030c37df73
diff --git a/media-libs/osl/osl-1.8.12.ebuild b/media-libs/osl/osl-1.8.12.ebuild
index 6bbe3b7c837d..7e3015859962 100644
--- a/media-libs/osl/osl-1.8.12.ebuild
+++ b/media-libs/osl/osl-1.8.12.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=media-libs/openexr-2.2.0
 
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.62
-	sys-devel/llvm[clang]
+	sys-devel/clang
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index a3416b0424ec..eb6385a103db 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest
deleted file mode 100644
index f4a6f0355e95..000000000000
--- a/media-radio/wspr/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX wspr-2.00-PIL.patch 455 BLAKE2B 711b651556771516ab8cb992162157917bbca26888686826618a6456ad15d04a700c6d91f8e029c8be355f2b00219b21de53ec438fae464d34bae25f0335cb33 SHA512 c54315b6febac2669d0b9327434d718201f7da9ee8fd9e67fc64d74849d4c2453a646328248c5d3791f309005a8b0b221a825f9d4e518a9c59fbd84a9743fd2b
-AUX wspr-2.00-libdir.patch 1675 BLAKE2B 3153f7c6a6e881fdbf3e8fb25ada0cfd8fced0d597089fac057b072cdbda50d1d612f8d0804372a917f8ba5c56ea65d711aca20f392a45592df7429d2a4ab073 SHA512 40912019b0c4605e7fc1ebacd5775927d474cd32cddc5a752df9a21067b78ce629d2cf7095d4aab05f9eeb40fd41e039617be6c803d8f49e8de2b2148770be49
-AUX wspr-2.00-script.patch 666 BLAKE2B c04cadb0ae11146b7d69e9914ed011ac151f212244db433302f6f1c4919e18f4641b3c7e9e950eff4b622a0a832872863c773c07670c5e1c34f0e43a0ba81bea SHA512 6108a94f0acf2fea143817926d570dc103f66d342803295cacd2ff6b6615a2b51ee6d53cc313730daabd4742864468cc99c202efb7d907b5c1f3a556620e8bb9
-AUX wspr-2.00-verbose.patch 457 BLAKE2B b82cb3f33707899fb35101066f2f1b92513264ed2757b095b74a2c3ea78798fac7e9e9a71770d680bee9984cecb974a69e1402a2cafd67414f18afd87f9fa372 SHA512 35d6aa9876bc9de80ab0f9a05616fbe694b6bc51b969bc55cdf5ab961185c41b492232601cf61e592c8cfcf9470b23451219a5953fcb03fe7ff1fbb3d3f17a79
-AUX wspr-3.01-PIL.patch 431 BLAKE2B 741d7295bf480b8a796d6b9676766ca460cf25cf50df28e0ea2f4bb22e49581799d8d0b6d0156774c966e56fca9de21c1bea4dd26695ae25a8cc8c73a000dd29 SHA512 021ed43cc45b840f3f9a2401ad27dd6a6322301b584a0ea618f59e38935e27cdcca99277fd85e3cb8fbb0f8126b64c097bff28547b024e51754a5720cefb0382
-AUX wspr-3.01-numpy.patch 691 BLAKE2B 0ab84d5eab862a4f40d989126b4348154629bd98c9beb4a3592ddde5332385b7f882d363d8550bf1291fada81ad0f9e854eb891699df23104d9e3c427f69dc82 SHA512 2e5912a65b87e1770d8f041d4d170a0ce3a86650659fbffc9d2e6fa34893008627ae966cf2cba95574de4e454a23d5b366ae6df456bfbba6aa4b19147d016021
-AUX wspr-3.01-script.patch 531 BLAKE2B c9da64e84548b4087b4ad2424179213ba95d2de1d6a771b74cec40bc2002661b857869b0690ce05b49ec7df04809c5010908f4afb71f28c12a8ed1aacd222c9b SHA512 e3a8acb038694847cde91adbe1f040f9f5fdbb969dca999fde423f8f7aead09a3a906aed1ec81825395960f60e0fbf210f9cf8182a49effc75747ffa3727dd7c
-AUX wspr-3.01-verbose.patch 467 BLAKE2B 0c8e3a297d180bc23d046fa7847ccf637d1eda4c62354b689246b0c04d890031c5f109f7a095ce4218aa72355141d7d2bba2c441197de656f6e0a5bea8fbdd29 SHA512 83ffabc81539e18a0dac143811ee93bd79ba3803d1a0287c77cf80d9236d6e7dcfbaaa0af0ce0186ee7fb63a2e6e2395cbeea780d7975f9c8cf36a0acb41b2ec
-DIST wspr-2.00.r1714.tgz 2096056 BLAKE2B 09416a47ad9c1e9fd94216aff0eeb409cfbd9242c4d6331800ac50a13c952135ac48fc4ee427a32d8b1752aed4c03d7a310dc4bbf361074a8a970fc2124264ca SHA512 221ca3c4ac433d5fb292830e183ef4ce44a9b0b31c8c1446faf30c1c2d6fe88cb471434c01126450843af49249e33bf6eccf1cbf839e6c5a09a3206c64a01d78
-DIST wspr-3.01.r2792.tgz 2145037 BLAKE2B bb87c4d95cd7266647714b4ff9def1bcf3f4fcd00d737e7d7fbbd9851fd861a59ab796465a32d5c54388fc6a7510fc17fbeeb979c926ea5fc365bac653e90711 SHA512 0aad8bf518b217fcf14fd0fd5ec0f8f3833c2768eff9eec20dee213dfd057dc283d81290a042f464c729e03502d3b8e1c2b22d5d1c2932eccc13b4ef1eaf0698
-EBUILD wspr-2.00-r2.ebuild 2062 BLAKE2B 9e01477ca9819827a7019d9b86042f80a8d0b45903e03f7dffe6cdf8dc9024ba2963f4ffe6d1dbe1f6c68b8cd45336b419fe17f7ea8cf23290e0770a2ef9a62d SHA512 08aafe319d596b4c3dc3b8a04553604b1502e6a7f441d85a882314256646702a42d8e8e5d0ed8b5ea90b23dd8ee8b59fe1afd9f8e3d08c74f9afd44e59b483b8
-EBUILD wspr-3.01-r1.ebuild 2228 BLAKE2B f61e4dca68729370ed0f4fb21579f3f112b740cb5b079f4aa27f8a9a6a1338584945f0d597f6254ba755c84c263063f6825fdf4557f738df2457fc4fc4e5530f SHA512 8ffe1712a987d4e3bda3838e69c5890644aec7f1ee5ac77ddf7ef39f91acb2cee89786533bc5350313d869df2193a8840d43b7d45ad45dd65d0b49ef7a187207
-EBUILD wspr-3.01.ebuild 2157 BLAKE2B 437768a209a4f34f6cc45f1e58c17afa71bd20f4338391983c44b48c990c518bb7a2d1c1bfdb46a3db4cc3a19d125ff130e56f4a762d967c3b66c1079425751a SHA512 fb63a6bfd8d5df232b8315a2cbe66d6a765f7ec6deb005ea307c26deae454c4c6cadd8b875bdb574d3b91b8179a3dab21f018d058a3c56ad8337e6ac0a7ff2e3
-MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/media-radio/wspr/files/wspr-2.00-PIL.patch b/media-radio/wspr/files/wspr-2.00-PIL.patch
deleted file mode 100644
index 69bb853396ac..000000000000
--- a/media-radio/wspr/files/wspr-2.00-PIL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- wspr.py.orig	2013-06-02 18:25:02.000000000 +0200
-+++ wspr.py	2013-06-02 18:25:51.000000000 +0200
-@@ -15,7 +15,9 @@
-     from Numeric import zeros
- import array
- import dircache
--import Image, ImageTk, ImageDraw
-+from PIL import Image
-+from PIL import ImageTk
-+from PIL import ImageDraw
- from WsprMod.palettes import colormapblue, colormapgray0, colormapHot, \
-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
- from types import *
diff --git a/media-radio/wspr/files/wspr-2.00-libdir.patch b/media-radio/wspr/files/wspr-2.00-libdir.patch
deleted file mode 100644
index e33d7b90871f..000000000000
--- a/media-radio/wspr/files/wspr-2.00-libdir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# Upstream confused LIBDIRS with LDFLAGS in Makefile. f2py wants only
-# LIBDIRS as parameter and takes LDFLAGS only from environment.
---- Makefile.in.orig	2013-01-31 13:17:23.000000000 +0000
-+++ Makefile.in	2013-01-31 13:19:19.000000000 +0000
-@@ -3,7 +3,7 @@
- INSTALL=	install
- CC ?= @CC@
- FFLAGS	= @FFLAGS@
--LDFLAGS	= @LDFLAGS@
-+LIBDIRS	= @LIBDIRS@
- LIBS	= @LIBS@ -lfftw3f
- CPPFLAGS = @CPPFLAGS@
- CFLAGS	= @CFLAGS@
-@@ -39,7 +39,7 @@
- FCV=@FCV@
- FC_LIB_PATH	+= @FC_LIB_PATH@
- 
--LDFLAGS	+= -L${FC_LIB_PATH}
-+LIBDIRS	+= -L${FC_LIB_PATH}
- 
- PYTHON	?= @PYTHON@
- RM	?= @RM@
-@@ -78,7 +78,7 @@
- 	--f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
- 	--fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
- 	--opt="-fbounds-check ${FFLAGS}" \
--	${CPPFLAGS} ${LDFLAGS} ${LIBS} \
-+	${CPPFLAGS} ${LIBDIRS} ${LIBS} \
- 	only: $(F2PYONLY) : \
- 	$(SRCS2F90) $(SRCS2F77) $(SRCS2C)
- 	${MKDIR} -p build/lib/WsprMod
-# drop hardcoded libdir path,
-# switch LDFLAGS naming to LIBDIRS (see above comment).
---- configure.ac.orig	2013-01-31 13:19:01.000000000 +0000
-+++ configure.ac	2013-01-31 13:19:19.000000000 +0000
-@@ -22,7 +22,7 @@
- 
- dnl Lets guess at some likely places for extra libs/includes XXX -db
- CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
--LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
-+LIBDIRS="-L/usr/local/lib ${LIBDIRS}"
- LIBS=" -lpthread ${LIBS}"
- FFLAGS_GFORTRAN="${FFLAGS} -fno-range-check -ffixed-line-length-none\
- 			-Wall -fbounds-check -fno-second-underscore -fPIC"
-@@ -160,7 +160,7 @@
- dnl 
- AC_SUBST(PREFIX, "${prefix}")
- AC_SUBST(CPPFLAGS, "${CPPFLAGS}")
--AC_SUBST(LDFLAGS, "${LDFLAGS}")
-+AC_SUBST(LIBDIRS, "${LIBDIRS}")
- AC_SUBST(LIBS, "${LIBS}")
- AC_SUBST(CFLAGS)
- AC_SUBST(FFLAGS)
diff --git a/media-radio/wspr/files/wspr-2.00-script.patch b/media-radio/wspr/files/wspr-2.00-script.patch
deleted file mode 100644
index e75c11782786..000000000000
--- a/media-radio/wspr/files/wspr-2.00-script.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# make python code into a script
-# and fix shell script
---- wspr.py.orig	2013-02-01 13:24:30.000000000 +0000
-+++ wspr.py	2013-02-01 13:23:30.000000000 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- #------------------------------------------------------------------- WSPR
- # $Date: 2013/02/07 14:35:21 $ $Revision: 1.1 $
- #
---- wspr.orig	2013-02-02 08:10:17.000000000 +0000
-+++ wspr	2013-02-02 08:10:56.000000000 +0000
-@@ -1,12 +1,7 @@
- #!/bin/sh
--if [ -e /usr/local/bin/python ] ; then
--	LOCALBASE=/usr/local/
--else
--	LOCALBASE=/usr/
--fi
- if [ ! -e ~/.wspr ] ; then
- 	mkdir ~/.wspr
- 	mkdir ~/.wspr/save
- fi
- cd ~/.wspr
--python ${LOCALBASE}/bin/wspr.py
-+/usr/bin/wspr.py
diff --git a/media-radio/wspr/files/wspr-2.00-verbose.patch b/media-radio/wspr/files/wspr-2.00-verbose.patch
deleted file mode 100644
index 9036e0d868a4..000000000000
--- a/media-radio/wspr/files/wspr-2.00-verbose.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# make f2py verbose
---- Makefile.in.orig	2013-02-07 12:22:41.000000000 +0000
-+++ Makefile.in	2013-02-07 12:23:11.000000000 +0000
-@@ -74,7 +74,7 @@
- OBJS2C  = ${SRCS2C:.c=.o}
- 
- WsprMod/w.so:	${OBJS2C} $(SRCS2F90) $(SRCS2F77) acom1.f90
--	${F2PY} -c --quiet --noopt --debug -m w \
-+	${F2PY} -c --noopt --debug -m w \
- 	--f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
- 	--fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
- 	--opt="-fbounds-check ${FFLAGS}" \
diff --git a/media-radio/wspr/files/wspr-3.01-PIL.patch b/media-radio/wspr/files/wspr-3.01-PIL.patch
deleted file mode 100644
index ce4689195147..000000000000
--- a/media-radio/wspr/files/wspr-3.01-PIL.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wspr.py.orig	2014-06-23 21:25:51.000000000 +0200
-+++ wspr.py	2014-06-23 21:26:03.000000000 +0200
-@@ -35,7 +35,7 @@
-     from Numeric import zeros

- import array

- import dircache

--import Image, ImageTk, ImageDraw

-+from PIL import Image, ImageTk, ImageDraw

- from WsprMod.palettes import colormapblue, colormapgray0, colormapHot, \

-      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette

- from types import *

diff --git a/media-radio/wspr/files/wspr-3.01-numpy.patch b/media-radio/wspr/files/wspr-3.01-numpy.patch
deleted file mode 100644
index 2c9174dff58a..000000000000
--- a/media-radio/wspr/files/wspr-3.01-numpy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Numpy-1.9 dropped oldnumeric and numarray
---- WsprMod/specjt.py.orig	2015-05-18 15:49:37.000000000 +0200
-+++ WsprMod/specjt.py	2015-05-18 15:49:48.000000000 +0200
-@@ -12,7 +12,7 @@
- import w
- 
- try:
--    from numpy.oldnumeric import zeros, multiarray
-+    from numpy import zeros, multiarray
- except:
-     from Numeric import zeros, multiarray
- import Image, ImageTk, ImageDraw
---- wspr.py.orig	2015-05-18 15:47:13.000000000 +0200
-+++ wspr.py	2015-05-18 15:47:38.000000000 +0200
-@@ -31,7 +31,7 @@
- from WsprMod import palettes

- from math import log10

- try:

--    from numpy.oldnumeric import zeros

-+    from numpy import zeros

- except: 

-     from Numeric import zeros

- import array

diff --git a/media-radio/wspr/files/wspr-3.01-script.patch b/media-radio/wspr/files/wspr-3.01-script.patch
deleted file mode 100644
index f64a11b68a64..000000000000
--- a/media-radio/wspr/files/wspr-3.01-script.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- wspr.py.orig	2014-06-24 19:13:55.000000000 +0200
-+++ wspr.py	2014-06-24 19:14:43.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- #-------------------------------------------------------------------- WSPR

- # $Date: 2014/06/26 09:15:53 $ $Revision: 1.1 $

- #

---- wspr.orig	2014-06-24 18:57:00.000000000 +0200
-+++ wspr	2014-06-24 19:09:50.000000000 +0200
-@@ -1,2 +1,7 @@
--LD_LIBRARY_PATH=./lib 
--python -O wspr.py
-+#!/bin/sh
-+if [ ! -e ~/.wspr ] ; then
-+	mkdir ~/.wspr
-+	mkdir ~/.wspr/save
-+fi
-+cd ~/.wspr
-+/usr/bin/wspr.py
diff --git a/media-radio/wspr/files/wspr-3.01-verbose.patch b/media-radio/wspr/files/wspr-3.01-verbose.patch
deleted file mode 100644
index b697cfe444dd..000000000000
--- a/media-radio/wspr/files/wspr-3.01-verbose.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# make f2py verbose
---- Makefile.in.orig	2014-06-23 21:14:51.000000000 +0200
-+++ Makefile.in	2014-06-23 21:15:11.000000000 +0200
-@@ -95,7 +95,7 @@
- OBJS2C  = ${SRCS2C:.c=.o}
- 
- WsprMod/w.so:	${OBJS2C} $(SRCS2C) $(SRCS2F90) $(SRCS2F77) acom1.f90
--	${F2PY} -c --quiet --noopt --debug -m w \
-+	${F2PY} -c --noopt --debug -m w \
- 	--f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
- 	--fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
- 	--opt="-fbounds-check ${FFLAGS}" \
diff --git a/media-radio/wspr/metadata.xml b/media-radio/wspr/metadata.xml
deleted file mode 100644
index d187eed5ac80..000000000000
--- a/media-radio/wspr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>tomjbe@gentoo.org</email>
-    <name>Thomas Beierlein</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-radio/wspr/wspr-2.00-r2.ebuild b/media-radio/wspr/wspr-2.00-r2.ebuild
deleted file mode 100644
index 471e7570411f..000000000000
--- a/media-radio/wspr/wspr-2.00-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit autotools fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-MY_P=${P}.r1714
-
-DESCRIPTION="Weak Signal Propagation Reporter"
-HOMEPAGE="http://www.physics.princeton.edu/pulsar/K1JT/wspr.html"
-SRC_URI="http://www.physics.princeton.edu/pulsar/K1JT/${MY_P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pillow[tk,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0
-	media-libs/hamlib
-	media-libs/portaudio
-	media-libs/libsamplerate"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( BUGS WSPR_Announcement.TXT WSPR_Instructions.TXT WSPR_Quick_Start.TXT )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-get_fcomp() {
-	case $(tc-getFC) in
-	*gfortran* )	FCOMP="gfortran" ;;
-	* ) 			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-python_prepare_all() {
-	tc-export FC
-	get_fcomp
-	export FC="${FCOMP}"
-
-	local PATCHES=(
-		"${FILESDIR}"/${P}-libdir.patch
-		"${FILESDIR}"/${P}-verbose.patch
-		"${FILESDIR}"/${P}-script.patch
-		"${FILESDIR}"/${P}-PIL.patch
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e "s#/usr/local/lib#/usr/$(get_libdir)#" configure.ac || die
-	sed -i -e '/makedirs/d' setup.py || die
-	eautoreconf
-}
-
-# Note: very hacky build system.
-# autoconf which doesn't really need Python
-# then custom Makefile which compiles the Python module with f2py
-# and finally hacked setup.py which relies on w.so created by make
-
-src_configure() {
-	# configure the build of the fortran module
-	econf --with-portaudio-lib-dir=/usr/$(get_libdir)
-
-	# then fork the sources
-	python_copy_sources
-	DISTUTILS_IN_SOURCE_BUILD=1
-}
-
-python_compile() {
-	# -shared is neded by f2py but cannot be set earlier as configure does
-	# not like it
-	local LDFLAGS=${LDFLAGS}
-	append-ldflags -shared
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dobin wspr
-	insinto /usr/share/${PN}
-	doins hamlib_rig_numbers
-}
diff --git a/media-radio/wspr/wspr-3.01-r1.ebuild b/media-radio/wspr/wspr-3.01-r1.ebuild
deleted file mode 100644
index 3990f2bef69e..000000000000
--- a/media-radio/wspr/wspr-3.01-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit autotools fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-MY_P=${P}.r2792
-
-DESCRIPTION="Weak Signal Propagation Reporter"
-HOMEPAGE="http://www.physics.princeton.edu/pulsar/K1JT/wspr.html"
-SRC_URI="https://dev.gentoo.org/~tomjbe/distfiles/${MY_P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pillow[tk,${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0
-	media-libs/hamlib
-	media-libs/portaudio
-	media-libs/libsamplerate"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( BUGS WSPR_Announcement.TXT WSPR0_Instructions.TXT WSPR_Quick_Start.TXT )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-get_fcomp() {
-	case $(tc-getFC) in
-	*gfortran* )	FCOMP="gfortran" ;;
-	* ) 			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-python_prepare_all() {
-	tc-export FC
-	get_fcomp
-	export FC="${FCOMP}"
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-2.00-libdir.patch
-		"${FILESDIR}"/${P}-verbose.patch
-		"${FILESDIR}"/${PN}-3.01-script.patch
-		"${FILESDIR}"/${P}-PIL.patch
-		# adapt to numpy-1.9 - bug #544504
-		"${FILESDIR}"/${P}-numpy.patch
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e "s/LDFLAGS} ${LIBS}/LDFLAGS} -fPIC ${LIBS}/" Makefile.in || die
-	sed -i -e "s#/usr/local/lib#/usr/$(get_libdir)#" configure.ac || die
-	sed -i -e '/makedirs/d' setup.py || die
-	eautoreconf
-}
-
-# Note: very hacky build system.
-# autoconf which doesn't really need Python
-# then custom Makefile which compiles the Python module with f2py
-# and finally hacked setup.py which relies on w.so created by make
-
-src_configure() {
-	# configure the build of the fortran module
-	econf --with-portaudio-lib-dir=/usr/$(get_libdir)
-
-	# then fork the sources
-	python_copy_sources
-	DISTUTILS_IN_SOURCE_BUILD=1
-}
-
-python_compile() {
-	# -shared is neded by f2py but cannot be set earlier as configure does
-	# not like it
-	local LDFLAGS=${LDFLAGS}
-	append-ldflags -shared
-	emake -j1
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dobin wspr
-	insinto /usr/share/${PN}
-	doins hamlib_rig_numbers
-}
diff --git a/media-radio/wspr/wspr-3.01.ebuild b/media-radio/wspr/wspr-3.01.ebuild
deleted file mode 100644
index a9f4a1520ca0..000000000000
--- a/media-radio/wspr/wspr-3.01.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit autotools fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-MY_P=${P}.r2792
-
-DESCRIPTION="Weak Signal Propagation Reporter"
-HOMEPAGE="http://www.physics.princeton.edu/pulsar/K1JT/wspr.html"
-SRC_URI="https://dev.gentoo.org/~tomjbe/distfiles/${MY_P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pillow[tk,${PYTHON_USEDEP}]
-	<dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0
-	media-libs/hamlib
-	media-libs/portaudio
-	media-libs/libsamplerate"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( BUGS WSPR_Announcement.TXT WSPR0_Instructions.TXT WSPR_Quick_Start.TXT )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-get_fcomp() {
-	case $(tc-getFC) in
-	*gfortran* )	FCOMP="gfortran" ;;
-	* ) 			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-python_prepare_all() {
-	tc-export FC
-	get_fcomp
-	export FC="${FCOMP}"
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-2.00-libdir.patch
-		"${FILESDIR}"/${P}-verbose.patch
-		"${FILESDIR}"/${PN}-3.01-script.patch
-		"${FILESDIR}"/${P}-PIL.patch
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e "s/LDFLAGS} ${LIBS}/LDFLAGS} -fPIC ${LIBS}/" Makefile.in || die
-	sed -i -e "s#/usr/local/lib#/usr/$(get_libdir)#" configure.ac || die
-	sed -i -e '/makedirs/d' setup.py || die
-	eautoreconf
-}
-
-# Note: very hacky build system.
-# autoconf which doesn't really need Python
-# then custom Makefile which compiles the Python module with f2py
-# and finally hacked setup.py which relies on w.so created by make
-
-src_configure() {
-	# configure the build of the fortran module
-	econf --with-portaudio-lib-dir=/usr/$(get_libdir)
-
-	# then fork the sources
-	python_copy_sources
-	DISTUTILS_IN_SOURCE_BUILD=1
-}
-
-python_compile() {
-	# -shared is neded by f2py but cannot be set earlier as configure does
-	# not like it
-	local LDFLAGS=${LDFLAGS}
-	append-ldflags -shared
-	emake -j1
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dobin wspr
-	insinto /usr/share/${PN}
-	doins hamlib_rig_numbers
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index adcb658e3876..270cac081c41 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 0cbded3c808b..fbb85a0f63c5 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,11 +1,3 @@
-AUX 0.5.0-doc_automagicness.patch 743 BLAKE2B fbfa2c6a32473691e4b7095a08854ba73700874e27281efc48cdf19c212ebbe5abac47583a4ac0456ad542fa872030d007f33fec9b57a8ba83b31c64507279f8 SHA512 171913c74f329d468caafba723db7f6c531330013c20b3613e0320bc9336e639fa103e2010334f66d9b950721104aaf9bdc6cb2e4ed66162bab4bcbc3880d975
-AUX 0.5.0-gcc6-narrowing.patch 1196 BLAKE2B 5ec4bd73c3e071c6b22d379e6806943a34ef36f2b5bfc826823c7bb5874eb7e7b15acc82919c50117c5d01ba4e562739ad222655bba4e0fe8a555bd99d0f1b96 SHA512 f4eaa98b0b85f0d28ce273b03ed0fd3948f95e05918223a51b0f53c3a3e73d4d2e01b3aca6f6166a6e7b7712e36eaa1ce4d5d94811e36fa1292eacd4a770e342
-AUX 0.5.0-underlinking.patch 368 BLAKE2B 14aab9b42a6ce7da4918a635dd2ee5f3f9e1b4a4d5f2a6345b169c09b870d8c72e2e62d3bc0c2c4fd4e9db2013dfbd682009f5496cddf941c0f0fa103cc14b9d SHA512 1f015f2bac64ce84c075383c6c0997e761dcd3618d970f2c3f7dbd918a91511ac0db81ca6cb08647df019acdde3f330d04f492661f444c811af705f55249a450
-AUX drumstick-1.0.2-gcc6.patch 1900 BLAKE2B 97843e8f0c0e159eec056c49db67d8ff26c6d42740b4915fc6b0792eb6ecfb7448a22411b618fd920445ebb4aa7e6cae714961ab63b0c423eb2cf901e8c82042 SHA512 d8969aabee72d701bd69bed74ad1067537152b5a7ca0014b6fb56f7e0bdc29180d898aad61885ea85aa6b050f1026887a85f18f95eb2a05afbc3e0bfcf6bc0b1
-DIST drumstick-0.5.0.tar.bz2 200914 BLAKE2B 9eff33ae033227b7d92e0eed05755426d81b573517917fb64d7311a2cd0bbd162a463cfaa9783fbc118078f1b9733f8c90033aafb1e542b4599ce284f11db4e9 SHA512 12078dbeae7166da210ccbbaee9d55b4c9e233fd317de72c20482466cd29987c976290efecd29cc28a5be6ed7e3b9fe95ddf1081d75222d9cf9d6aef13080a21
-DIST drumstick-1.0.2.tar.bz2 233666 BLAKE2B 5a3fcdb48f2a3c977407784c15d4722e9bf45d0cd6b84029ce2e5a71066ca6b93a162272bd8ae7425415244d5081a11f9f6d69a9fe1ace9209124dd2dfc99848 SHA512 df8d36b58e83b1e06cd1e4788e63c504bf2282c26f505509b2125e6c7be8ce8bc013774755b68e36f372a8682328459a5efb67ff09be1e0190805528458b3e45
 DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
-EBUILD drumstick-0.5.0.ebuild 1244 BLAKE2B 66e0fad776ca1e69c0566c16be9f0a5dcada410147a9d2bf1b032664f06ae841086f890cd0e39d924c8b4a8cda9fb308b462344b8092a073171e1729aa34169a SHA512 65a6041d7dde795f7d1bf857df2a5021b6ba2dff44ddfc0ea6c2a76c637ee488259f59a1b472956a97f2d21225692520a2d73b2716178eaae0f885fc371752d6
-EBUILD drumstick-1.0.2.ebuild 1310 BLAKE2B bc9c0d3692bccfc401760fb18088d79944101181c26f3f68079f9cd5ce22962c83e83d23a72eb4796c09222f2bafde9c9ddba73749b2e9c9218b75689bcccbbd SHA512 568c3b7a2345b7bfde09da866caa30f8c02a7b92e7ef23c55d9627c61c493f52a905bf71560e60510f1c68051fb1105f830eb02c1dd4b3e1c2021afe5622163b
-EBUILD drumstick-1.1.0.ebuild 1777 BLAKE2B 4a432e25cb2a09981ddc25815f862eb0782bfaa9a9c91808dc36b7258dc42bc4c194b3fd2cc4aac2e582108027a36bf16c3986cf81c54e7f637a693b8d6fcba3 SHA512 dd790f04c44dbdaccf5de2fcfb3294875494eec004cd504beb9c0ba5726a7ca0616d732c650118d15795cd5b33cd3a819986b2ef73463a77d51954064f426d58
+EBUILD drumstick-1.1.0.ebuild 1775 BLAKE2B 45349cbbad2e23ac95c05e9ec36fda08cc6d230aefcd1edbd9a41c33e4356fd8d5fb220cd1b2185ad60e6f4cb682920bdd515f26b58bb27d751e54bfb470dda5 SHA512 25c9e95e3359c648d3a9b9af17cc5b2db2f4f576598c1de13b9936ba2ee736d1a7b89c7730015a64d4adbd58869cd167bd978b290db782d4c01b724bc78b5284
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild
deleted file mode 100644
index 23e0adbaad10..000000000000
--- a/media-sound/drumstick/drumstick-0.5.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fdo-mime gnome2-utils cmake-utils
-
-DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus doc"
-
-RDEPEND="
-	media-libs/alsa-lib
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	x11-misc/shared-mime-info
-	dbus? ( dev-qt/qtdbus:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-doc_automagicness.patch
-	"${FILESDIR}"/${PV}-underlinking.patch
-	"${FILESDIR}"/${PV}-gcc6-narrowing.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_DBUS=$(usex dbus)
-		-DWITH_DOC=$(usex doc)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.0.2.ebuild b/media-sound/drumstick/drumstick-1.0.2.ebuild
deleted file mode 100644
index 3facc49b0469..000000000000
--- a/media-sound/drumstick/drumstick-1.0.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils fdo-mime gnome2-utils
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile doxygen
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.1.0.ebuild b/media-sound/drumstick/drumstick-1.1.0.ebuild
index 4545970a4f5e..88fb5aae789e 100644
--- a/media-sound/drumstick/drumstick-1.1.0.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 RESTRICT="test"
diff --git a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
deleted file mode 100644
index c2474ae4f1e1..000000000000
--- a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN drumstick-0.5.0.old/CMakeLists.txt drumstick-0.5.0/CMakeLists.txt
---- drumstick-0.5.0.old/CMakeLists.txt	2010-09-09 12:38:56.000000000 +0200
-+++ drumstick-0.5.0/CMakeLists.txt	2011-05-13 11:03:30.156962982 +0200
-@@ -143,6 +143,8 @@
- ADD_SUBDIRECTORY(library)
- ADD_SUBDIRECTORY(utils)
- ADD_SUBDIRECTORY(icons)
-+OPTION(WITH_DOC "Build documentation" ON)
-+IF( WITH_DOC )
- IF(${CMAKE_SYSTEM} MATCHES "Linux")
-     FIND_PACKAGE(Doxygen)
-     IF(DOXYGEN_FOUND)
-@@ -157,6 +159,7 @@
-     ENDIF(DOXYGEN_FOUND)
-     ADD_SUBDIRECTORY(doc)
- ENDIF(${CMAKE_SYSTEM} MATCHES "Linux")
-+ENDIF( WITH_DOC )
- 
- CONFIGURE_FILE(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
- CONFIGURE_FILE(drumstick-file.pc.in drumstick-file.pc IMMEDIATE @ONLY)
diff --git a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
deleted file mode 100644
index 165db470592e..000000000000
--- a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix GCC 6 failures caused by -Wnarrowing
-
---- a/utils/buildsmf/buildsmf.cpp
-+++ b/utils/buildsmf/buildsmf.cpp
-@@ -53,8 +53,8 @@
-     m_engine->writeKeySignature(0, 2, major_mode); // D major (2 sharps)
- 
-     // system exclusive event
--    static char gsreset[] = { 0xf0, 0x41, 0x10, 0x42, 0x12, 
--                              0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7 };
-+    static char gsreset[] = { (char)0xf0, 0x41, 0x10, 0x42, 0x12, 
-+                              0x40, 0x00, 0x7f, 0x00, 0x41, (char)0xf7 };
-     m_engine->writeMidiEvent(0, system_exclusive, sizeof(gsreset), gsreset);
- 
-     // some note events
---- a/utils/testevents/testevents.cpp
-+++ b/utils/testevents/testevents.cpp
-@@ -262,7 +262,7 @@
-     dumpEvent(new KeyPressEvent(5, 60, 124));
-     dumpEvent(new ChanPressEvent(6, 111));
-     dumpEvent(new PitchBendEvent(7, 1234));
--    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
-+    char sysex[] = {(char)0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, (char)0xf7};
-     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
-     QString text = "This can be a copyright, song name, instrument, lyric...";
-     TextEvent te(text, 3);
diff --git a/media-sound/drumstick/files/0.5.0-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch
deleted file mode 100644
index 1ec4fd186029..000000000000
--- a/media-sound/drumstick/files/0.5.0-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/utils/vpiano/CMakeLists.txt
-+++ b/utils/vpiano/CMakeLists.txt
-@@ -1,3 +1,5 @@
-+find_package(X11 REQUIRED)
-+
- SET(vpiano_forms_SRCS
-     vpianoabout.ui
-     connections.ui
-@@ -52,7 +54,7 @@
- TARGET_LINK_LIBRARIES(drumstick-vpiano
-     ${QT_LIBRARIES} 
-     ${ALSA_LIBS} 
--    ${QT_X11_X11_LIBRARY}
-+    ${X11_X11_LIB}
-     drumstick-common
-     drumstick-alsa
- )
diff --git a/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch b/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch
deleted file mode 100644
index 4bb66e85536f..000000000000
--- a/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: library/file/qove.cpp
-===================================================================
---- a/library/file/qove.cpp	(revision 316)
-+++ b/library/file/qove.cpp	(working copy)
-@@ -11356,7 +11356,7 @@
- 				OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);
- 				QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);
- 
--				if (k == 0 || (k > 0 && abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
-+				if (k == 0 || (k > 0 && std::abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
- 					int tick = d->mtt.getTick(k, 0);
- 					int tempo = (int) measure->getTypeTempo();
- 					tempos[tick] = tempo;
-@@ -11739,7 +11739,7 @@
- 				}
- 				case OVE::Articulation_Arpeggio: {
- 					//if( art->getChangeSoundEffect() ) {
--						unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
-+						unsigned int soundEffect = std::abs(art->getSoundEffect().first) + std::abs(art->getSoundEffect().second);
- 						int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
- 						startTick -= tickAmount;
- 					//}
-Index: utils/testevents/testevents.cpp
-===================================================================
---- a/utils/testevents/testevents.cpp	(revision 316)
-+++ b/utils/testevents/testevents.cpp	(working copy)
-@@ -262,7 +262,7 @@
-     dumpEvent(new KeyPressEvent(5, 60, 124));
-     dumpEvent(new ChanPressEvent(6, 111));
-     dumpEvent(new PitchBendEvent(7, 1234));
--    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
-+    char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0', '\x7f', '\0', '\x41', '\xf7'};
-     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
-     QString text = "This can be a copyright, song name, instrument, lyric...";
-     TextEvent te(text, 3);
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index 19b962fa89ba..101145e8c0a1 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,4 +1,4 @@
 AUX musique-1.5-unbundle-qtsingleapplication.patch 273 BLAKE2B f2150b1d54201e8d7bd64675dfc5a73a1c74abcea9c34d45f52f4d414f56c6b26d97a8c12f1d4823b5272fa32ea866b6c1d1c8052f8304a46823504203a207ed SHA512 d51389a43c5045c453aa516da4da6d50e2d7fb2b064e40df5cd3ff50469a414bf0ec4d44c716be8b83b8bbf1944f72474b3b917dfcd661eef25c2b7298440641
 DIST musique-1.5.tar.gz 377072 BLAKE2B 839b6096bd70171f807cd4177c2374f20089e1a8f22e59fb76d251c743cb3b9b8c86eb81131d15c6291bae1020df7380ae007689a23b67529978de9ee08ed1c2 SHA512 ea4ba84e6b1a69acf054c8ca001afcf3f0e9b17f3557209da649662b2940777babac454a5d4fa0a210e2e15c58bcf4cdfc8757f92b677d46217e3400fcbdc12e
-EBUILD musique-1.5.ebuild 1004 BLAKE2B 93e14a986ca1f27b94a7e77ba2a042fcd9f6725ec251033e56d0abd5e8b5c0413ef7ffc98faacdb41180f89486d51de6e3e84dac38b7475c08b5d2be90965b27 SHA512 96ca3c3706b1eea7ac2cf0bcd6c6af25e080153e07a3a43f06654d2cab90fd34989ec4d5143a36115622e95d6aa24fb92cad1f98d846cb9df7aa5b406b08e3aa
+EBUILD musique-1.5.ebuild 1005 BLAKE2B 3c5db6d2febc83d19c72c2b7322e04181f8eb69eac4b08b8f432a135c9d9d5445ec88970cf504b1cd9ccbd89d761d992729429fd450a5612356560b78d5c93af SHA512 15656cc4b2a3e42c6e1fbdb54346893505493382f3b5464b1c6d50cfefa126affb7d89cb8d60caaedf5e20b6d7f75f3e86de045eb64c5c633cebb8467144d011
 MISC metadata.xml 333 BLAKE2B f4794f441a21ea4bab3f70e58bf10828861815424d33768ff8068ba57b955c07d5fa2596e092ba4582fea3730105eb397d9c94b9994e452fb042e4b92022da92 SHA512 b2dc7bd4588fd80bc4bcce0e80102d4522d9dd2a946807ef25ff294e96621da948bead8d8bf0db19b9b65cb8d3934fee69e1f73ef57c3eda3ea429928766a897
diff --git a/media-sound/musique/musique-1.5.ebuild b/media-sound/musique/musique-1.5.ebuild
index acac1e72c4ac..ae570b6f9099 100644
--- a/media-sound/musique/musique-1.5.ebuild
+++ b/media-sound/musique/musique-1.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="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit gnome2-utils qmake-utils
 
 DESCRIPTION="Qt music player"
-HOMEPAGE="http://flavio.tordini.org/musique"
+HOMEPAGE="https://flavio.tordini.org/musique"
 SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-sound/qtagger/Manifest b/media-sound/qtagger/Manifest
index 4573e22afec0..db55c570358e 100644
--- a/media-sound/qtagger/Manifest
+++ b/media-sound/qtagger/Manifest
@@ -1,3 +1,5 @@
 DIST qtagger-1.0.1.tar.gz 60791 BLAKE2B 617f8bcff6e3627ad9f36b814662111ad7cdb9a782e4cd3703e2010ce019ec247e77f6e7dd620409338b1561fcaa356924de009778a812ddbd57ee27abc79a39 SHA512 45969475abefa865244946fb6a74dcfa7397f0a9bd57b0fda4de98fc8c8edb2c0c3a631eccfa199bebb8442df38b0beaca9234fae4166629bcb5c08aee42b47a
+DIST qtagger-1.0.1_p20150402.tar.gz 60745 BLAKE2B 0260ac8cf4b07cdb3b5887357ac4034f4c02a801cc91568cc54cb73293884fefcdbf2019d1b61542353f4ef2e79c07ffda1c1414ff4b99d10faff1e8dcab95fb SHA512 2510350d479008b0c2af4b489aa16ab88003b18f1cbb66796dece6c93dd4222ff073f575b9de8136fb6a46ece1c67ace7de605ef3db0c73038a52472d652f279
 EBUILD qtagger-1.0.1-r2.ebuild 906 BLAKE2B b92ce2eb06c8c053a8dcd943cdd64bc9d50e41f5d86eca5d03b98137b5434c01334a5e66589231b6f438b2409e735dc95b2b1e84dad397fa6f8d12dd6ff4a313 SHA512 d1a61f34be72cc595a19adbe8b6856896bb6c07d73ec1205bc27cac42a1744519180679beeccf26ca37195196dfd170977f38336dbe36405f2abdf182c041dac
+EBUILD qtagger-1.0.1_p20150402.ebuild 1042 BLAKE2B 400191e12c5afa0100d8e3ce979a8b289a05992ababc3abce37f716f4b3d9b337ddd8cab19e73ee12e0dc054f924aae91a20ed91d99cdd77763c36d2781ee065 SHA512 f07ce8858d9d4f5a3c79d7c9623b7f5f65bb6f944aad92fc340477adbe6fd7f07813ffd71801db91d8f1027dd5bef353c483f9d5ac981d4b17897208508039b0
 MISC metadata.xml 326 BLAKE2B 176217a8a77bdd384e28da6436cbd32a61420981e5ab63ea76c9c4681463c6ce69bc9ca197591d9620a48abb145563de081122ecffe976118f7e2276687dd775 SHA512 e73586aa673a0b41300f88e9523c322d3dd42c2f319bd237b8b88fe346327c068c8d9e272ebc0e5503adbfb2562925231663da7fbf86a9edf7b48026d65a3854
diff --git a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild b/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
new file mode 100644
index 000000000000..17e012ecab95
--- /dev/null
+++ b/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+COMMIT=0e74fe022ddbb689f7bae0460a21be303114029b
+inherit cmake-utils qmake-utils vcs-snapshot
+
+DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+HOMEPAGE="https://github.com/DOOMer/qtagger"
+SRC_URI="https://github.com/DOOMer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/taglib
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix doc installation path
+	sed -i -e "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt || die
+	sed -i -e "s/share%1doc%1qtagger/share%1doc%1${PF}/" src/mainwindow.cpp || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON
+		-DQT_LRELEASE_EXECUTABLE=$(qt5_get_bindir)/lrelease
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+}
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
index ef713112edcd..04cf262cbcb2 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -1,5 +1,4 @@
 AUX traverso-0.49.2-desktop.patch 397 BLAKE2B 451566dd3c1f1db012810ce7dc341edf13ec864533a3bd771ced8d9ec96595e5bc89d896d694af45772e4cd64367975c0800e82b50167b2503fdee730150988d SHA512 36b617b837afa2b690433c34cc124fe43b0e5fff585288d279b52070ec0892996ad108c1fdfda0d370b3051b20b5f6238a08c2eb3023313661ceef0bfa5205b7
-AUX traverso-0.49.3-gcc6.patch 358 BLAKE2B f58e9b5a9ab5fcb87266251a3de18a5d5f1575b6b9391b66e3387ef524e1da7edb8d98140366e4ca66d6e09da8d5d6bb3addebc6f88b80215379f84733a5095f SHA512 f877f503ae05e76d653a0021db31ee84ef9e7aac7592ba241b9dfb558e6cd248a758001b817203cf00c81e7012a968c75081b3cdd1948bd5ba2db8e0cbad1eb9
-DIST traverso-0.49.3.tar.gz 1391101 BLAKE2B e0768bf17734903d78dd5e54e201451c24b51ff502b9c6b802d58d3dc0cd374107efac1b052440ca40be5edf1699beaa21a4fbac9e0d86661c9be95e2f68cc10 SHA512 3db1dbc99ef3b0a9597959a6a3ce93909ec32d5f00648659debe1e8c5cec58ac6ab2108d5c66a1fc4145c2fe110c7db801fda8914664127653457132eac94ef2
-EBUILD traverso-0.49.3.ebuild 1852 BLAKE2B f913728b1f97fb02e1bfbfed392288c75a4991f6468336303028843dfd256c9269509344bc24c4cd77935096d65fc400c3b6943923c622f7822300942102cc43 SHA512 45bf52ea2428cf035672c7752be55368a8b08113efccfa396dc80289bb663d124c944d349abbbf093f73bb19f2a0c8b8e8d098796a85ed84e1b1b35dd340779c
+DIST traverso-0.49.5.tar.gz 1510807 BLAKE2B de593be2ae8cc0310f25be45c8996ce6e9dd291a4e04d3ff185253821d84d44b2d816795d9510237b7a651af2f2ded3c032e48299d084db78f5f488e00fecda0 SHA512 86490479a06dca0e03e07a7938dd8ef1cf680da30c83ff1fac5f6a2f99b771995f6ef8f5ef8dff31103db50efadb69179057bf1c6a27b42b66260386986c94c4
+EBUILD traverso-0.49.5.ebuild 1941 BLAKE2B c7633cd92d50da3b677f40fc59021266502a0ba072d0731d42eb9fd2aa6f12ba47285076b7dd38cb671b196eade4afdfeba896da9538dc5d8e62b1faf12613c6 SHA512 b0552f9a49c775b1e4c6319671179a233ea6bddf5c0da155cedd2986346c101610008fa0e648f24b6dff8d0775cb2fa743757af315225a44472b4974beac17aa
 MISC metadata.xml 549 BLAKE2B 24ea010b051ff1f74a4ee02fb17fb8dadd6d5fd7dde139b922accb0bfcab6d6ab9c210eda2446b2c25b9ae9122c037131313451e1b6d7081b1634f81c5982c03 SHA512 24c1c480ae3f907aae2948e43b245cc5882585870829712f89d49302ab36b8439c44400f59f52a2874136b3742fc8ccf4fd446131ca242f9af025eac325da053
diff --git a/media-sound/traverso/files/traverso-0.49.3-gcc6.patch b/media-sound/traverso/files/traverso-0.49.3-gcc6.patch
deleted file mode 100644
index d8ce1e581c8d..000000000000
--- a/media-sound/traverso/files/traverso-0.49.3-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: traverso-0.49.3/src/common/Tsar.h
-===================================================================
---- traverso-0.49.3.orig/src/common/Tsar.h
-+++ traverso-0.49.3/src/common/Tsar.h
-@@ -63,7 +63,6 @@ struct TsarEvent {
- 	QObject* 	caller;
- 	void*		argument;
- 	int		slotindex;
--	void*		_a[];
- 
- // Used for the signal emiting stuff
- 	int signalindex;
diff --git a/media-sound/traverso/traverso-0.49.3.ebuild b/media-sound/traverso/traverso-0.49.3.ebuild
deleted file mode 100644
index b41d0605b8db..000000000000
--- a/media-sound/traverso/traverso-0.49.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="Professional Audio Tools for GNU/Linux"
-HOMEPAGE="http://traverso-daw.org/"
-SRC_URI="http://traverso-daw.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack lame lv2 mad pulseaudio"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	>=media-libs/flac-1.1.2
-	>=media-libs/libogg-1.1.2
-	media-libs/libsamplerate
-	>=media-libs/libsndfile-1.0.12
-	>=media-libs/libvorbis-1.1.2
-	>=media-sound/wavpack-4.40.0
-	>=sci-libs/fftw-3
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	lame? ( media-sound/lame )
-	lv2? ( media-libs/lilv )
-	mad? ( >=media-libs/libmad-0.15.0 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README resources/help.text )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.49.2-desktop.patch
-	"${FILESDIR}"/${PN}-0.49.3-gcc6.patch
-)
-
-src_configure() {
-	use lv2 && append-cppflags "$($(tc-getPKG_CONFIG) --cflags slv2)" #415165
-
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_TRAVERSO_DEBUG=$(usex debug)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_MP3_ENCODE=$(usex lame)
-		-DWANT_LV2=$(usex lv2)
-		-DWANT_MP3_DECODE=$(usex mad)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local res
-	for res in 16 24 48 64 128; do
-		doicon -s ${res} resources/freedesktop/icons/${res}x${res}/apps/${PN}.png
-	done
-	doicon -s scalable resources/freedesktop/icons/scalable/apps/${PN}.svg
-
-	domenu resources/traverso.desktop
-
-	insinto /usr/share/${PN}
-	doins -r resources/themes
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/traverso/traverso-0.49.5.ebuild b/media-sound/traverso/traverso-0.49.5.ebuild
new file mode 100644
index 000000000000..88f028379b41
--- /dev/null
+++ b/media-sound/traverso/traverso-0.49.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop flag-o-matic gnome2-utils xdg-utils
+
+DESCRIPTION="Professional Audio Tools for GNU/Linux"
+HOMEPAGE="https://traverso-daw.org/"
+SRC_URI="https://traverso-daw.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack lame lv2 mad pulseaudio"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/flac-1.1.2
+	>=media-libs/libogg-1.1.2
+	media-libs/libsamplerate
+	>=media-libs/libsndfile-1.0.12
+	>=media-libs/libvorbis-1.1.2
+	>=media-sound/wavpack-4.40.0
+	>=sci-libs/fftw-3
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	lame? ( media-sound/lame )
+	lv2? ( media-libs/lilv )
+	mad? ( >=media-libs/libmad-0.15.0 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README resources/help.text )
+
+PATCHES=( "${FILESDIR}"/${PN}-0.49.2-desktop.patch )
+
+src_configure() {
+	use lv2 && append-cppflags "$($(tc-getPKG_CONFIG) --cflags slv2)" #415165
+
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_TRAVERSO_DEBUG=$(usex debug)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_MP3_ENCODE=$(usex lame)
+		-DWANT_LV2=$(usex lv2)
+		-DWANT_MP3_DECODE=$(usex mad)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local res
+	for res in 16 24 48 64 128; do
+		doicon -s ${res} resources/freedesktop/icons/${res}x${res}/apps/${PN}.png
+	done
+	doicon -s scalable resources/freedesktop/icons/scalable/apps/${PN}.svg
+
+	domenu resources/traverso.desktop
+
+	insinto /usr/share/${PN}
+	doins -r resources/themes
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 71ecc8b859dc..abc8f48dccec 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/blind/Manifest b/media-video/blind/Manifest
new file mode 100644
index 000000000000..bc069c47d636
--- /dev/null
+++ b/media-video/blind/Manifest
@@ -0,0 +1,4 @@
+AUX blind-1.1-ldflags.patch 219 BLAKE2B eb0eb29d385d441253663315848810932ecb8b6f44dcd91193d93f23f8340574224f87f8d08b1769b7b49b92eebd787164a5eba19dde9022e1816c761d035a3e SHA512 cf66425a23cd2202fda9cc825a30b78281501972307ca8c1db942cadf40f58e1aa460fc1e649bc0d279e0d90615acd5b30ac9418cf12db57c499c046a76ca69d
+DIST blind-1.1.tar.gz 47568 BLAKE2B b284e614efafb70ea41c274ddeedce66a0123c1ba6dfbba6522e0a11d6b2aa39b1059a0c9cc1c45a37f951b75c0b23580f714858bf2257a15e4f7d03ffb0b258 SHA512 620a5edc69bf736f642948e4f6ac6dda8cdbea4bdad143b09f931e62aaa57983e23ff60961d1485dcbce1ac461be12b393fe03f056ef46ca5ad2012cb03cf637
+EBUILD blind-1.1.ebuild 809 BLAKE2B a86ab8543ffee8edae09a497f1e241158bdb98bade70d05737e306c9169e52cf86deb7f8b4790d3ef7abff4e1e7b38e1ade4fc05bab3d0225c268f8d71832318 SHA512 8b0130007a0451a646bf0cb316893959001cad23de451ff975213b567e914e3f45aa29f96bfb436d7a02106298d48c0e065b019b6bd46423b938b54f1b68d5a4
+MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/media-video/blind/blind-1.1.ebuild b/media-video/blind/blind-1.1.ebuild
new file mode 100644
index 000000000000..43fc42d195d8
--- /dev/null
+++ b/media-video/blind/blind-1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a collection of command line video editing utilities"
+HOMEPAGE="https://tools.suckless.org/blind/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CC/d' \
+		-e 's|/usr/local|/usr|g' \
+		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \
+		-e '/^LDFLAGS.*/ { s:-s::g; s:=:+=:g; }' \
+		-e 's|{|(|g;s|}|)|g' \
+		config.mk || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install MANPREFIX=/usr/share/man
+}
diff --git a/media-video/blind/files/blind-1.1-ldflags.patch b/media-video/blind/files/blind-1.1-ldflags.patch
new file mode 100644
index 000000000000..6e247b10f13f
--- /dev/null
+++ b/media-video/blind/files/blind-1.1-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@
+ all: $(BIN)
+ 
+ %: %.o util.o stream.o
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) -o $@ $^ $(LDFLAGS)
+ 
+ %.o: src/%.c src/*.h src/*/*.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
diff --git a/media-video/blind/metadata.xml b/media-video/blind/metadata.xml
new file mode 100644
index 000000000000..5ba62861f1c4
--- /dev/null
+++ b/media-video/blind/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index f3fc3aa2bb73..bc938cd7eb23 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,8 +1,9 @@
 AUX simplescreenrecorder-0.3.8-qtbindir.patch 659 BLAKE2B c5de5c06d2dae1e3e0133b77a7d02fade47de65c9a90e9e3a8c5e69dfb8bc6dd3f17e09b974f6021b2ed23b2cc2a5934b84b553cf22e3d4b37e6527416982109 SHA512 5321b44e6cdfbe9081d716008c1da4b5f828a298a2e73e313b7bd960274f1d5151f8c653f2fc165ab7fe27d20ef76fc6a77f4e87de2cf91a91e6f84f8b66bf4f
+AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338
 AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72
 DIST simplescreenrecorder-0.3.8.tar.gz 2037017 BLAKE2B 891d4ab5e02a0a47452dfdd0c936819a46ea558221edb5699dd95682561153f7db9f4a301414145e8582f944490ce6d4f722b71e197fc5fa54008c3dbbc25f4c SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365
 DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
 EBUILD simplescreenrecorder-0.3.8.ebuild 2734 BLAKE2B d59ba3285fab99bf61f5ab9eeeb03dbce471c529d5b3ada2494e95318403b936db3ac0d92b2100dc12b6351bf0a9a24136856924012fa8ef996ce1bb876296d6 SHA512 99bc9d5244b5ad58c88db47f0d4bc0d8f5468e3174a652446eba8a11e455b66137beefd18982c23b8180ba95b486b527f147c44d760e7b6e344ec63fbc8131b7
-EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2881 BLAKE2B aa618128f99fffb83194344140598fe2b1ac4bc3897e294bb0604f9a37e2c6dda1f2c80b3b9bc788bffb0986902f1379c578e22eb2b3c35f380218a30f382f16 SHA512 28e26f8ef4b93bb751480b0325665353afc78700f1c3c29802c026d4902cdf06680a514c67983e8d71deead38e9e61a61ac51ec092c4ba13366a24b75091b144
+EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f
 EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch
new file mode 100644
index 000000000000..6d9fc1fa607b
--- /dev/null
+++ b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch
@@ -0,0 +1,106 @@
+From 7f8f72ac5f7ba7b060b4366828200050b96a9df0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 11 Jan 2018 21:28:15 +0100
+Subject: [PATCH 1/3] Fix Qt5LinguistTools detection/lrelease binary location
+
+Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
+Only available since >= Qt-5.3.1 which is a low enough minimum dependency.
+---
+ src/CMakeLists.txt              | 10 ++++++----
+ src/translations/CMakeLists.txt |  7 ++++++-
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 64652c5..5779a49 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -17,10 +17,12 @@ if(WITH_JACK)
+ endif()
+ 
+ if(WITH_QT5)
+-	find_package(Qt5Core REQUIRED)
+-	find_package(Qt5Gui REQUIRED)
+-	find_package(Qt5Widgets REQUIRED)
+-	find_package(Qt5X11Extras REQUIRED)
++	set(QT_MIN_VERSION "5.3.1")
++	find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
++		Gui
++		Widgets
++		X11Extras
++	)
+ else()
+ 	find_package(Qt4 REQUIRED QtGui)
+ endif()
+diff --git a/src/translations/CMakeLists.txt b/src/translations/CMakeLists.txt
+index 455fdb2..0902cfd 100644
+--- a/src/translations/CMakeLists.txt
++++ b/src/translations/CMakeLists.txt
+@@ -1,6 +1,11 @@
+ # translations for 'simplescreenrecorder' executable
+ 
+-find_program(LRELEASE lrelease)
++if(WITH_QT5)
++	find_package(Qt5LinguistTools REQUIRED)
++	set(LRELEASE Qt5::lrelease)
++else()
++	find_program(LRELEASE lrelease)
++endif()
+ 
+ if(LRELEASE)
+ 
+-- 
+2.15.1
+
+
+From 24db02e2a689e08f737c4d720e195a3758cba2eb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 11 Jan 2018 21:43:08 +0100
+Subject: [PATCH 2/3] Use FeatureSummary
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e770251..cb36d7d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,7 @@ option(WITH_GLINJECT "Build the 'libssr-glinject' library. Required for OpenGL r
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ 
++include(FeatureSummary)
+ include(GNUInstallDirs)
+ 
+ # try to guess the correct 32-bit library path on 64-bit systems
+@@ -106,3 +107,5 @@ if(WITH_SIMPLESCREENRECORDER)
+ 	)
+ 
+ endif()
++
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.15.1
+
+
+From 329ec866097de4f011cd1bbde9dad784acbb487f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 11 Jan 2018 22:07:39 +0100
+Subject: [PATCH 3/3] FindFFmpeg.cmake: Provide FFMPEG_FOUND
+
+---
+ cmake/FindFFmpeg.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
+index 117e654..993219b 100644
+--- a/cmake/FindFFmpeg.cmake
++++ b/cmake/FindFFmpeg.cmake
+@@ -28,3 +28,4 @@ mark_as_advanced(SWSCALE_INCLUDE_DIR SWSCALE_LIBRARY)
+ 
+ set(FFMPEG_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})
+ set(FFMPEG_LIBRARIES ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
++set(FFMPEG_FOUND ${PC_FFMPEG_FOUND})
+-- 
+2.15.1
+
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
index 273c02c9d239..2f317e44e5d3 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-pulseaudio_dep.patch"
+	"${FILESDIR}/${P}-cmake.patch"
 )
 
 pkg_setup() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 31f442cf47b7..95a843ddfb20 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b9a5d670b0ce..749c873f8b58 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 08:09:27 +0000
+Sat, 13 Jan 2018 05:38:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index dcea53f6af9a..0730e81f1a2f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 414446 BLAKE2B 5b433dfd85097ead79bccfcdc5ac71450a49f0cd04217ea95a0da4d9b3a14d6a0df186361cf5d3a4ff24547968a8bdb79ea1e31d21aa21b86708e0885a152525 SHA512 2410eac2ebdd40b883f4296ea6c8ebefb16545c125c9ecb039ba9a79dc2d32f43aaaa01673cb98557d5d7aa414d7d0c72e688610d9b127a0d56cb1584e16cf5c
-TIMESTAMP 2018-01-11T08:09:31Z
+MANIFEST Manifest.files.gz 414930 BLAKE2B 54c8bec7c47b900f490e4e34024351be14f456a48cacf2b39c9c543980f7b457877607be1b1a2619bba3921e272569dddbe7cbe408004596209bfaef3ad1f30e SHA512 fe8b5b4b09d48323bfe7f07a9b7216c4b61eb0986f2508a393f9a5266ae4d6f5c8fb70ea146fd1e2823a5d5995190c0817a11d4bedf5624b5eaaddf74d3af007
+TIMESTAMP 2018-01-13T05:38:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpXG7tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpZm3FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWchAAkB06ilg+f0cQJjuO8Gb102XQO7rjETlzbaTbzsDHJL1ObwHr5CAFOZI2
-iQ/wEqnaUNd7pylDCnUK8JKKZi9CFe9Y2jSqqYqHmQx61+hveE+QO5b94JFT4PeT
-lkiWD2/4jObDBG9T1k5S0vV8upozJ7rrthv9T7/XEs3KhByVQawpsYFL5dfqw40q
-rO32paCDMkC5jPBPN7w98KODysNscMYS8hePUz+INe4xC82/I8cM2yaUXMUAlcKw
-r1JfVrWMg0C+H7X/zLo5HFiB4Dzufsv494IQb+MKlHLAdt8e+QqJSS6EHiC9pBvw
-sp1fn7FNDheP8HCuMeahKzafwWEZ9/4M+3HLelQsUA4YWIOF7isIn/rPhEWqJW8f
-hcHQQb31Kv6SwWqlw+VuczhbMae3hbSGD0l3v9lICyNIjlQL+ULoQSqpiDYeGB2p
-ZlHbw8AxN5x2kNZBFjr8PEPs/MDMXWUVEo01Ya3kzl5AZosUgNc2IygQDNLGEK2E
-jXYtzKnDMXnygiR+vOttiAA5SIv7uRnGsvGPeqj8GyuMOBj+z6h55EoQY2I1g0MD
-ZCL/jOJ466DxuCPamT5ZmVzlsNrphx1Z1TJhyRi0ErMm+Wq5mPSkQQHhdnSRmG5O
-Mz8wV+6hQ5QLOeib14lHYflx84husK67qiNj/fVbTMJRvVGWPaU=
-=xCMV
+klAWuA//UdGefSrX8EJ+MKit+CCilc7b1s9qwlwbJ4TwQvOzzLI3+pZaEZCJLLD9
+eLUiUCuegKbXF55yMd1LWK72NZKeKgdeMLYn7rLFJq6kxJ5HQG12MsA0Gt5QrToj
+CsKHhlOuhDwZGSpa8ppwF4XJeZ8uUif+xaW14dYaRnBQ7nyEGRSPnXhwKd5S/fqN
+m4g6kfaHp6uORmLGD2Aag5Iqz+kX1jQo2DWF5yuxpHd2qSgO3n4Lzl/eA7IqkWHC
+xNLTI1fBrBtsvAZEqNy7IbFbAEDXPnyMaA4wuTpdX6E56GHJkJTK6OVYD3UNxe8O
+loz+Y03NfslKDmchp74781fcC8VRpW4X+G/em0fwLlc8r6WrJPGYG845PFdcfmIX
+G8FN7Vx5i4QuWNWynR/TGOyFyIxGblle1mEytDq3r+9NRxDKfBeDOgzaM/Vb/+kA
+bq+DgI8WwuF3L5WzCXO3Mkx41BmjTHakPLJK8pHRDfoCxnTtfvHo+aoxPzYdBg8c
+VTzy0gkNof7xId25g2MhxISej/bqQZRfmgQocqIVj2IBFSfMSHf+lxUpLP0AmWp/
+jnoniFokq39Mta8+jp22agt1pKk0+u5PncdkdrFvPVWK4oBsHwWZIO7oV+gBTZVF
+lUjvrkO1F8xfoVUSJlEgMbE7ifK1VHxts3mcu2vpbuqIMP4Q4b4=
+=RuEd
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 895c44865813..8ea3f1eb83d4 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201801-11.xml b/metadata/glsa/glsa-201801-11.xml
new file mode 100644
index 000000000000..7359c3c04a81
--- /dev/null
+++ b/metadata/glsa/glsa-201801-11.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-11">
+  <title>PySAML2: Security bypass</title>
+  <synopsis>A vulnerability in PySAML2 might allow remote attackers to bypass
+    authentication.
+  </synopsis>
+  <product type="ebuild">PySAML2</product>
+  <announced>2018-01-11</announced>
+  <revised>2018-01-12: 2</revised>
+  <bug>644016</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-python/pysaml2" auto="yes" arch="*">
+      <unaffected range="ge">4.0.2-r3</unaffected>
+      <unaffected range="ge">4.5.0</unaffected>
+      <vulnerable range="lt">4.0.2-r3</vulnerable>
+      <vulnerable range="lt">4.5.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PySAML2 is a pure python implementation of SAML2</p>
+  </background>
+  <description>
+    <p>It was found that the PySAML2 relies on an assert statement to check the
+      user’s password. A python optimizations might remove this assertion.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could bypass security restrictions and access any
+      application which is using PySAML2 for authentication.
+    </p>
+  </impact>
+  <workaround>
+    <p>Disable python optimizations.</p>
+  </workaround>
+  <resolution>
+    <p>All PySAML2 4.0 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-python/pysaml2-4.0.2-r3"
+    </code>
+    
+    <p>All PySAML2 4.5 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-python/pysaml2-4.5.0"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-1000433">
+      CVE-2017-1000433
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-01-09T14:46:58Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2018-01-12T01:23:24Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201801-12.xml b/metadata/glsa/glsa-201801-12.xml
new file mode 100644
index 000000000000..f97629b7f436
--- /dev/null
+++ b/metadata/glsa/glsa-201801-12.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-12">
+  <title>icoutils: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in icoutils, the worst of
+    which may lead to arbitrary code execution.
+  </synopsis>
+  <product type="ebuild">icoutils</product>
+  <announced>2018-01-11</announced>
+  <revised>2018-01-11: 1</revised>
+  <bug>605138</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="media-gfx/icoutils" auto="yes" arch="*">
+      <unaffected range="ge">0.32.0</unaffected>
+      <vulnerable range="lt">0.32.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A set of command-line programs for extracting and converting images in
+      Microsoft Windows(R) icon and cursor files.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in icoutils. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to process a specially crafted
+      file, possibly resulting in execution of arbitrary code with the
+      privileges of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All icoutils users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-gfx/icoutils-0.32.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5208">
+      CVE-2017-5208
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-6009">
+      CVE-2017-6009
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-6010">
+      CVE-2017-6010
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-6011">
+      CVE-2017-6011
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-01-05T06:04:02Z">jmbailey</metadata>
+  <metadata tag="submitter" timestamp="2018-01-11T22:41:52Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201801-13.xml b/metadata/glsa/glsa-201801-13.xml
new file mode 100644
index 000000000000..e744cfc54c4c
--- /dev/null
+++ b/metadata/glsa/glsa-201801-13.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-13">
+  <title>TigerVNC: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in TigerVNC, the worst of
+    which may lead to arbitrary code execution.
+  </synopsis>
+  <product type="ebuild">tigervnc</product>
+  <announced>2018-01-11</announced>
+  <revised>2018-01-11: 1</revised>
+  <bug>614742</bug>
+  <bug>636396</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="net-misc/tigervnc" auto="yes" arch="*">
+      <unaffected range="ge">1.8.0</unaffected>
+      <vulnerable range="lt">1.8.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>TigerVNC is a high-performance VNC server/client.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in TigerVNC. Please review
+      the referenced CVE Identifiers for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could execute arbitrary code or cause a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All TigerVNC users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/tigervnc-1.8.0"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10207">
+      CVE-2016-10207
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7392">
+      CVE-2017-7392
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7393">
+      CVE-2017-7393
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7394">
+      CVE-2017-7394
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7395">
+      CVE-2017-7395
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7396">
+      CVE-2017-7396
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-11-24T22:29:53Z">chrisadr</metadata>
+  <metadata tag="submitter" timestamp="2018-01-11T22:42:09Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b9a5d670b0ce..749c873f8b58 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 08:09:27 +0000
+Sat, 13 Jan 2018 05:38:53 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index aaca69940ebb..bad538a8fc07 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-83b03abfd2cbeb32bafb0df4d1a742e9717c33a3 1515417463 2018-01-08T13:17:43+00:00
+8dca4027f96f539f3d11cd618e9a606c9597dbca 1515720256 2018-01-12T01:24:16+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 718b2861d85d..9ca4c3a3b88f 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 ba4b62c71d79..4ec730aa907e 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/keepass-2.37 b/metadata/md5-cache/app-admin/keepass-2.37
index 72378fbf3424..5a80cc03f0d8 100644
--- a/metadata/md5-cache/app-admin/keepass-2.37
+++ b/metadata/md5-cache/app-admin/keepass-2.37
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
 DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
 EAPI=6
-HOMEPAGE=http://keepass.info/
+HOMEPAGE=https://keepass.info/
 IUSE=aot
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.37-Source.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6ce84082f30a4c6f24f934b4aa35bb2
+_md5_=e051d8e91b7713454d1f76e57104d526
diff --git a/metadata/md5-cache/app-admin/keepass-2.38 b/metadata/md5-cache/app-admin/keepass-2.38
index 92cb19853382..8dafd1671c3f 100644
--- a/metadata/md5-cache/app-admin/keepass-2.38
+++ b/metadata/md5-cache/app-admin/keepass-2.38
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
 DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
 EAPI=6
-HOMEPAGE=http://keepass.info/
+HOMEPAGE=https://keepass.info/
 IUSE=aot
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.38-Source.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70919da5dd8e721a8cd833b1c18def93
+_md5_=162c099ed788a6df0ba17b7673fc0150
diff --git a/metadata/md5-cache/app-admin/metalog-3-r2 b/metadata/md5-cache/app-admin/metalog-3-r2
index 25d7664359b0..61fd8533116b 100644
--- a/metadata/md5-cache/app-admin/metalog-3-r2
+++ b/metadata/md5-cache/app-admin/metalog-3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A highly configurable replacement for syslogd/klogd
 EAPI=6
 HOMEPAGE=http://metalog.sourceforge.net/
 IUSE=unicode
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre-3.4
 SLOT=0
 SRC_URI=mirror://sourceforge/metalog/metalog-3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e72de6db076c404b5616a40bfb327fcb
+_md5_=fa4f9428d9e045b687e1293db554ff26
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.6.1 b/metadata/md5-cache/app-admin/mongo-tools-3.6.1
deleted file mode 100644
index fdb91571cb9f..000000000000
--- a/metadata/md5-cache/app-admin/mongo-tools-3.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.org
-IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!<dev-db/mongodb-3.0.0
-SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.1.tar.gz -> mongo-tools-3.6.1.tar.gz
-_md5_=01b15c131a54266a7cbe53b179944048
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.6.2 b/metadata/md5-cache/app-admin/mongo-tools-3.6.2
new file mode 100644
index 000000000000..4b2947ba2e6a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.org
+IUSE=sasl ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<dev-db/mongodb-3.0.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.2.tar.gz -> mongo-tools-3.6.2.tar.gz
+_md5_=01b15c131a54266a7cbe53b179944048
diff --git a/metadata/md5-cache/app-admin/packagekit-qt-1.0.0 b/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
new file mode 100644
index 000000000000..cdc955ea55d7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-libs/libxslt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Qt PackageKit backend library
+EAPI=6
+HOMEPAGE=http://www.packagekit.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=app-admin/packagekit-base-0.9 dev-qt/qtcore:5 dev-qt/qtdbus:5
+SLOT=0/1
+SRC_URI=https://github.com/hughsie/PackageKit-Qt/archive/v1.0.0.tar.gz -> packagekit-qt-1.0.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5d9a70ef5e24036d2738d49caa295d2b
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.32.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.32.0-r1
new file mode 100644
index 000000000000..60c6da66be0e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.32.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=http://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( >=net-libs/czmq-3.0.2 )
+SLOT=0
+SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.32.0.tar.gz -> rsyslog-8.32.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.32.0.tar.gz -> rsyslog-docs-8.32.0.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4247f9e8a995b577e25eae8b4f096d3b
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.20_p2 b/metadata/md5-cache/app-admin/sudo-1.8.20_p2
index e4b592a1a8ad..8d7b1e4fe15f 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.20_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.20_p2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl selinux skey +sendmail
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.20p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.20p2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e765c094a3592a5f0474dc4d78999161
+_md5_=ee481b0042018e9ddf26dd1aeceac319
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.12.1 b/metadata/md5-cache/app-admin/syslog-ng-3.12.1
index a0c355b497f5..06da9c294325 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.12.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.12.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
-IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
-REQUIRED_USE=python? ( ^^ ( python_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 ) )
+RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
+REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.12.1/syslog-ng-3.12.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7e1553bac47c7226610a2ffa8ce7e32
+_md5_=a09ce1b7429e4f097abad48a96b79784
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.13.2 b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
index 8d5d9e0f14be..ed2c061b5cf1 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.13.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2 sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
-IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_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(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
-REQUIRED_USE=python? ( ^^ ( python_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 ) )
+RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
+REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.13.2/syslog-ng-3.13.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=684fb2f60095ba094aee68acd96f27f7
+_md5_=f4a1824cf1ec28fad0b8737a1582643e
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 21c87ae56496..0ebb98d685f4 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.2 b/metadata/md5-cache/app-arch/brotli-1.0.2
index 62f97a30ac7c..09f9fab7f288 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.2
+++ b/metadata/md5-cache/app-arch/brotli-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=6
 HOMEPAGE=https://github.com/google/brotli
 IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT python? ( Apache-2.0 )
 RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0/1.0.2
 SRC_URI=https://github.com/google/brotli/archive/v1.0.2.tar.gz -> brotli-1.0.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1c0a7718075ba2879e388f1fe15be22
+_md5_=910bdb9532f87b21d364b1646ce61065
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.3 b/metadata/md5-cache/app-arch/zstd-1.3.3
new file mode 100644
index 000000000000..2cbffa404f4a
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=zstd fast compression library
+EAPI=6
+HOMEPAGE=https://facebook.github.io/zstd/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=app-arch/xz-utils
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/archive/v1.3.3.tar.gz -> zstd-1.3.3.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=917a87ed5dfae39b62b1fcb52da78b47
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a4d6835ce8b9..2e17f0e32286 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/eid-mw-4.2.0 b/metadata/md5-cache/app-crypt/eid-mw-4.2.0
deleted file mode 100644
index 3c8e34438c44..000000000000
--- a/metadata/md5-cache/app-crypt/eid-mw-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
-EAPI=6
-HOMEPAGE=https://eid.belgium.be
-IUSE=+dialogs +gtk p11-kit +xpi
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
-REQUIRED_USE=dialogs? ( gtk )
-SLOT=0
-SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.2.0 -> eid-mw-4.2.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a1c42d71059eb9d6b78192c558703c50
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.3.6 b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
new file mode 100644
index 000000000000..bdcfcc09f571
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
+EAPI=6
+HOMEPAGE=https://eid.belgium.be
+IUSE=+dialogs +gtk p11-kit +xpi
+KEYWORDS=~x86 ~amd64 ~arm
+LICENSE=LGPL-3
+RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
+REQUIRED_USE=dialogs? ( gtk )
+SLOT=0
+SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.3.6 -> eid-mw-4.3.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71a73b41f63008b564f7b1b4cfffe055
diff --git a/metadata/md5-cache/app-crypt/eid-mw-9999 b/metadata/md5-cache/app-crypt/eid-mw-9999
index 5404179e2371..45da250eb0b8 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-9999
+++ b/metadata/md5-cache/app-crypt/eid-mw-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install postinst postrm prepare unpack
+DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
 EAPI=6
 HOMEPAGE=https://eid.belgium.be
 IUSE=+dialogs +gtk p11-kit +xpi
 LICENSE=LGPL-3
-RDEPEND=gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
+RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ed3139d22ffbe3cc2cc7187cbce70530
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c793cb274a1f68ae9feef4c2f242c56
diff --git a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2 b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
index e149f49bfd70..22cba6b7ecd4 100644
--- a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
+++ b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
@@ -4,9 +4,9 @@ DESCRIPTION=library providing a uniform interface to a large number of hash algo
 EAPI=6
 HOMEPAGE=http://mhash.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.9.tar.gz
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3e08b620f492d4d5c6908c8df3a98c1e
+_md5_=99509c8b7508069b9554617a816086bd
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r2 b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
index ba1c613972ca..a4ddcd5ae646 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r2
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Generate or check digests or MACs of files
 EAPI=5
 HOMEPAGE=http://mcrypt.hellug.gr/shash/
 IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8773112c92f2db6a4d4c2ff52f53933f
+_md5_=2220c7ef10386a8a6b8809d8b40fbd41
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f4ad99ede7bf..6879bf572d9a 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.4 b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
index 2dbeb36e27fd..2fd7a5f02c0a 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.4
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
@@ -3,7 +3,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/Py
 DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
 EAPI=6
 HOMEPAGE=https://github.com/lancos/qhexedit2/
-IUSE=doc gui python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=doc +gui python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/v0.8.4.tar.gz -> qhexedit2-0.8.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b80d3801b851232bfc908611e3934b50
+_md5_=05d1b6096a36248bb9368b73ab65df49
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index c06cb42363cd..32a9cce963b6 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/autoconf-mode-2.69 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
index 1f0e5e0e8afc..b7fba9005fdb 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Emacs major modes for editing autoconf and autotest input
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a154535ce54df5fab339b621186ea86d
+_md5_=85adecaf954ea8b26c99e09f13fdf432
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 5af1f91299ec..08e6f1bbe4a4 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2 b/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
index 8b70c0879dd4..ccec43ffa160 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
+++ b/metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/ca-certificates
 IUSE=insecure_certs cacert
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_30_2_RTM/src/nss-3.30.2.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c03f7eb807079d05a7933c47226ec7b8
+_md5_=cbf5ff985cc0d164ff9ecc9cf940a356
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index d0725c85446d..ae426fee7a4a 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/impressive-0.10.5 b/metadata/md5-cache/app-office/impressive-0.10.5
deleted file mode 100644
index 55aeb468e743..000000000000
--- a/metadata/md5-cache/app-office/impressive-0.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Stylish way of giving presentations with Python
-EAPI=5
-HOMEPAGE=http://impressive.sourceforge.net/
-IUSE=python_targets_python2_7
-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_python2_7(-)] !>=dev-python/pillow-3.0.0 app-text/pdftk dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xdg-utils x11-apps/xrandr app-text/ghostscript-gpl || ( media-fonts/dejavu media-fonts/corefonts )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/impressive/Impressive/0.10.5/Impressive-0.10.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=52afe32fbbcb0866985b18fe6b5e9b8d
diff --git a/metadata/md5-cache/app-office/impressive-0.11.0b-r1 b/metadata/md5-cache/app-office/impressive-0.11.0b-r1
deleted file mode 100644
index e89656fa57a8..000000000000
--- a/metadata/md5-cache/app-office/impressive-0.11.0b-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Stylish way of giving presentations with Python
-EAPI=5
-HOMEPAGE=http://impressive.sourceforge.net/
-IUSE=python_targets_python2_7
-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_python2_7(-)] app-text/pdftk dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-apps/xrandr || ( app-text/mupdf app-text/poppler app-text/ghostscript-gpl ) || ( media-fonts/dejavu media-fonts/corefonts )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/impressive/Impressive/0.11.0/Impressive-0.11.0b.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4029f937faaa4c0014573658b47ab991
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 356f6befc6cf..c2b5a3b8ba4b 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/docbook-sgml-utils-0.6.14-r2 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
new file mode 100644
index 000000000000..081cfa0a2a39
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Shell scripts to manage DocBook documents
+EAPI=5
+HOMEPAGE=https://sourceware.org/docbook-tools/
+IUSE=jadetex
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9edfc0a162693bed10ac3ab0bf3af51b
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r5 b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
new file mode 100644
index 000000000000..63cd760acc37
--- /dev/null
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
+DESCRIPTION=E-Book Reader. Supports many e-book formats
+EAPI=6
+HOMEPAGE=http://www.fbreader.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
+SLOT=0
+SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9af374ac8b35e8e062271a62af022549
diff --git a/metadata/md5-cache/app-text/paperwork-1.1.2 b/metadata/md5-cache/app-text/paperwork-1.1.2
deleted file mode 100644
index 4d027092c3de..000000000000
--- a/metadata/md5-cache/app-text/paperwork-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=a personal document manager for scanned documents (and PDFs)
-EAPI=6
-HOMEPAGE=https://github.com/jflesch/paperwork
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/jflesch/paperwork/archive/1.1.2.tar.gz -> paperwork-1.1.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f10e2eed90d416cc0f5dd456e5fef56
diff --git a/metadata/md5-cache/app-text/paperwork-1.2 b/metadata/md5-cache/app-text/paperwork-1.2
deleted file mode 100644
index 38662494ca15..000000000000
--- a/metadata/md5-cache/app-text/paperwork-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a personal document manager for scanned documents (and PDFs)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork/archive/1.2.tar.gz -> paperwork-1.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af3bb6be327d5cbe9910f49e5eb1d0c3
diff --git a/metadata/md5-cache/app-text/paperwork-1.2.1 b/metadata/md5-cache/app-text/paperwork-1.2.1
deleted file mode 100644
index ead17e425fb9..000000000000
--- a/metadata/md5-cache/app-text/paperwork-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.2.1[python_targets_python3_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/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a personal document manager for scanned documents (and PDFs)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.2.1[python_targets_python3_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/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork/archive/1.2.1.tar.gz -> paperwork-1.2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af3bb6be327d5cbe9910f49e5eb1d0c3
diff --git a/metadata/md5-cache/app-text/paperwork-1.2.2 b/metadata/md5-cache/app-text/paperwork-1.2.2
index f1ec19e5b018..2553c136e30f 100644
--- a/metadata/md5-cache/app-text/paperwork-1.2.2
+++ b/metadata/md5-cache/app-text/paperwork-1.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_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(-)]
+DEPEND=~app-text/paperwork-backend-1.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_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/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=a personal document manager for scanned documents (and PDFs)
 EAPI=6
 HOMEPAGE=https://github.com/openpaperwork/paperwork
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_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(-)]
+RDEPEND=~app-text/paperwork-backend-1.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_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/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/openpaperwork/paperwork/archive/1.2.2.tar.gz -> paperwork-1.2.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86c6e0d2200b46f583e82bb141d24e58
+_md5_=ac022acf76ce2d72413afc8620b51042
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.1.2 b/metadata/md5-cache/app-text/paperwork-backend-1.1.2
deleted file mode 100644
index 443835d53b36..000000000000
--- a/metadata/md5-cache/app-text/paperwork-backend-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Backend part of Paperwork (Python API, no UI)
-EAPI=6
-HOMEPAGE=https://github.com/jflesch/paperwork-backend
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/jflesch/paperwork-backend/archive/1.1.2.tar.gz -> paperwork-backend-1.1.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0402d71d3bfd25300eb5637b014bf455
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.2 b/metadata/md5-cache/app-text/paperwork-backend-1.2
deleted file mode 100644
index b62e3cc9cfcc..000000000000
--- a/metadata/md5-cache/app-text/paperwork-backend-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_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/pycountry[python_targets_python3_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/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_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/simplebayes[python_targets_python3_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/termcolor[python_targets_python3_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/whoosh[python_targets_python3_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=Backend part of Paperwork (Python API, no UI)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork-backend
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_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/pycountry[python_targets_python3_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/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_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/simplebayes[python_targets_python3_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/termcolor[python_targets_python3_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/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork-backend/archive/1.2.tar.gz -> paperwork-backend-1.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36ed11e8c48a44d7cae98ba4cc0285ec
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.2.1 b/metadata/md5-cache/app-text/paperwork-backend-1.2.1
deleted file mode 100644
index 80fb264f7937..000000000000
--- a/metadata/md5-cache/app-text/paperwork-backend-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_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/pycountry[python_targets_python3_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/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_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/simplebayes[python_targets_python3_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/termcolor[python_targets_python3_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/whoosh[python_targets_python3_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=Backend part of Paperwork (Python API, no UI)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork-backend
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_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/pycountry[python_targets_python3_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/pyenchant[python_targets_python3_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/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_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/simplebayes[python_targets_python3_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/termcolor[python_targets_python3_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/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork-backend/archive/1.2.1.tar.gz -> paperwork-backend-1.2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36ed11e8c48a44d7cae98ba4cc0285ec
diff --git a/metadata/md5-cache/app-text/po4a-0.47-r1 b/metadata/md5-cache/app-text/po4a-0.47-r1
index 700954a6f00b..fa68e89a3751 100644
--- a/metadata/md5-cache/app-text/po4a-0.47-r1
+++ b/metadata/md5-cache/app-text/po4a-0.47-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for helping translation of documentation
 EAPI=6
 HOMEPAGE=http://po4a.alioth.debian.org
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.47.orig.tar.gz
 _eclasses_=l10n	07318ed5f26525a9d302ca87d20b2865	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e7dce36a6f4dee207b57198d05888862
+_md5_=22fe80025fea3a19dbc01efbc40be1a2
diff --git a/metadata/md5-cache/app-text/tree-1.7.0 b/metadata/md5-cache/app-text/tree-1.7.0
index 026b33188262..d7f904c24ad7 100644
--- a/metadata/md5-cache/app-text/tree-1.7.0
+++ b/metadata/md5-cache/app-text/tree-1.7.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lists directories recursively, and produces an indented listing of files
 EAPI=5
 HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=!=sci-biology/meme-4.8.1
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.7.0.tgz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cef312696b2563dd0ced787854b41ae8
+_md5_=41166dc0a500c1708ba59623f8a8116d
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r5 b/metadata/md5-cache/app-text/xhtml1-20020801-r5
new file mode 100644
index 000000000000..f68f3dfa048a
--- /dev/null
+++ b/metadata/md5-cache/app-text/xhtml1-20020801-r5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
+DEPEND=app-text/sgml-common dev-libs/libxml2 >=app-text/sgml-common-0.6.3-r2
+DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
+EAPI=5
+HOMEPAGE=http://www.w3.org/TR/xhtml1/
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=W3C
+SLOT=0
+SRC_URI=http://www.w3.org/TR/xhtml1/xhtml1.tgz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=02c6efc161e1ee589fe31f99e1635697
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e5309112662b..94094b86b22b 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/catch-1.11.0 b/metadata/md5-cache/dev-cpp/catch-1.11.0
index 4750f0288ea9..7e8976bf6107 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.11.0
+++ b/metadata/md5-cache/dev-cpp/catch-1.11.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
-HOMEPAGE=https://github.com/philsquared/Catch
+HOMEPAGE=https://github.com/catchorg/Catch2
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0
 SLOT=0
-SRC_URI=https://github.com/philsquared/Catch/archive/v1.11.0.tar.gz -> Catch-1.11.0.tar.gz
+SRC_URI=https://github.com/catchorg/Catch2/archive/v1.11.0.tar.gz -> Catch-1.11.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71e62e75fd4c2925c2e025e132f20ba1
+_md5_=98985c73a0f06c9bc63aa215699af297
diff --git a/metadata/md5-cache/dev-cpp/catch-1.9999 b/metadata/md5-cache/dev-cpp/catch-1.9999
index 56b8a444a71c..3490e851d99e 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.9999
+++ b/metadata/md5-cache/dev-cpp/catch-1.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
-HOMEPAGE=https://github.com/philsquared/Catch
+HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
 LICENSE=Boost-1.0
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=55e8816257d7388eec3d323d7d5ec86f
+_md5_=9893bc9a366b475112b345978b1e9152
diff --git a/metadata/md5-cache/dev-cpp/catch-2.0.1 b/metadata/md5-cache/dev-cpp/catch-2.0.1
index 88a35a290fba..71f3ab3cfca1 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.0.1
+++ b/metadata/md5-cache/dev-cpp/catch-2.0.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
-HOMEPAGE=https://github.com/philsquared/Catch
+HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0
 SLOT=0
-SRC_URI=https://github.com/philsquared/Catch/archive/v2.0.1.tar.gz -> Catch2-2.0.1.tar.gz
+SRC_URI=https://github.com/catchorg/Catch2/archive/v2.0.1.tar.gz -> Catch2-2.0.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5df8b9b7aee50ca5d073f647dc6dcf5b
+_md5_=4374a363d78beab8183ea6d1de5bbd70
diff --git a/metadata/md5-cache/dev-cpp/catch-2.1.0 b/metadata/md5-cache/dev-cpp/catch-2.1.0
new file mode 100644
index 000000000000..1f50cd643351
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/catch-2.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Modern C++ header-only framework for unit-tests
+EAPI=6
+HOMEPAGE=https://github.com/catchorg/Catch2
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Boost-1.0
+SLOT=0
+SRC_URI=https://github.com/catchorg/Catch2/archive/v2.1.0.tar.gz -> Catch2-2.1.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4374a363d78beab8183ea6d1de5bbd70
diff --git a/metadata/md5-cache/dev-cpp/catch-9999 b/metadata/md5-cache/dev-cpp/catch-9999
index dee40fbc77a2..581a6e06c2b0 100644
--- a/metadata/md5-cache/dev-cpp/catch-9999
+++ b/metadata/md5-cache/dev-cpp/catch-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=6
-HOMEPAGE=https://github.com/philsquared/Catch
+HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
 LICENSE=Boost-1.0
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de359dc61afea8be06d248a950ce99a5
+_md5_=404bd8298cecf1b6f4c2b23ba1793636
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a16291136b64..882887ff0b14 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/mongodb-3.6.1 b/metadata/md5-cache/dev-db/mongodb-3.6.1
deleted file mode 100644
index fcb25fd40c39..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-3.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-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/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0 virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.1 )
-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.1.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b56f5116bad896e2b90f17fbaaa81fc5
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.2 b/metadata/md5-cache/dev-db/mongodb-3.6.2
new file mode 100644
index 000000000000..30c40e335409
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-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/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0 virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 Apache-2.0
+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	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9d10a60e9a10ca2c60daf8011d17285a
diff --git a/metadata/md5-cache/dev-db/pgadmin4-2.1 b/metadata/md5-cache/dev-db/pgadmin4-2.1
new file mode 100644
index 000000000000..0d8d3d4b5310
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=6
+HOMEPAGE=http://www.pgadmin.org/
+IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=POSTGRESQL
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] >=app-text/htmlmin-0.1.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/Babel-2.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/beautifulsoup-4.4.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/blinker-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/click-6.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/extras-0.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/fixtures-2.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-babel-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-gravatar-0.4.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-htmlmin-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-login-0.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-migrate-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-paranoid-0.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-security-1.7.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-sqlalchemy-2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-wtf-0.12[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/html5lib-0.9999999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/itsdangerous-0.24[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/linecache2-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/markupsafe-0.23[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/mimeparse-1.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/passlib-1.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pbr-1.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/psycopg-2.7.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pycrypto-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pyrsistent-0.11.13[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-dateutil-2.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pytz-2014.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/simplejson-3.6.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/six-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/speaklater-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sqlalchemy-1.0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/werkzeug-0.9.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/wtforms-2.0.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v2.1/source/pgadmin4-2.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1982550ae0de0089e6dbd7d0aa681959
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.5.2 b/metadata/md5-cache/dev-db/pgpool2-3.5.2
deleted file mode 100644
index 2458b61a60d4..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.5.2.tar.gz -> pgpool-II-3.5.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=abcfe3a9e31a7080a14297ad6e70bad0
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.5.5 b/metadata/md5-cache/dev-db/pgpool2-3.5.5
deleted file mode 100644
index 1af0a8bb9e98..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.5.5.tar.gz -> pgpool-II-3.5.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e4425bbd92c1b5153cbf0f78291eeca4
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.1 b/metadata/md5-cache/dev-db/pgpool2-3.6.1
deleted file mode 100644
index 2d0abfde6ee1..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.1.tar.gz -> pgpool-II-3.6.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=587d7431b9a81312b1d931988b3fae4c
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.4 b/metadata/md5-cache/dev-db/pgpool2-3.6.4
deleted file mode 100644
index 36b22a7daf83..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.4.tar.gz -> pgpool-II-3.6.4.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=20f290462919b6f4106ae6c42f73cc78
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.5 b/metadata/md5-cache/dev-db/pgpool2-3.6.5
deleted file mode 100644
index a6d722693108..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.5.tar.gz -> pgpool-II-3.6.5.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bd587108ed38da311b65462ac3f94e23
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.6 b/metadata/md5-cache/dev-db/pgpool2-3.6.6
deleted file mode 100644
index 4d3804a1fb58..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.6.tar.gz -> pgpool-II-3.6.6.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bd587108ed38da311b65462ac3f94e23
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.7 b/metadata/md5-cache/dev-db/pgpool2-3.6.7
deleted file mode 100644
index f3fc5da0f812..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.7.tar.gz -> pgpool-II-3.6.7.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bd587108ed38da311b65462ac3f94e23
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.1 b/metadata/md5-cache/dev-db/pgpool2-3.7.1
new file mode 100644
index 000000000000..e164d79e1b0d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=6
+HOMEPAGE=http://www.pgpool.net/
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
+SLOT=0
+SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.1.tar.gz -> pgpool-II-3.7.1.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=cf4190c545cbd46f15a6e6df4460e8eb
diff --git a/metadata/md5-cache/dev-db/pgtap-0.93.0 b/metadata/md5-cache/dev-db/pgtap-0.93.0
deleted file mode 100644
index ee181fdc6218..000000000000
--- a/metadata/md5-cache/dev-db/pgtap-0.93.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-db/postgresql-8.4 dev-perl/TAP-Parser-SourceHandler-pgTAP
-DESCRIPTION=Unit testing for PostgreSQL
-EAPI=5
-HOMEPAGE=http://pgtap.org/
-KEYWORDS=amd64
-LICENSE=POSTGRESQL
-RDEPEND=>=dev-db/postgresql-8.4 dev-perl/TAP-Parser-SourceHandler-pgTAP
-SLOT=0
-SRC_URI=http://api.pgxn.org/dist/pgtap/0.93.0/pgtap-0.93.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ef9cdcd9587edf2be240f0a3b3789b
diff --git a/metadata/md5-cache/dev-db/pgtap-0.97.0 b/metadata/md5-cache/dev-db/pgtap-0.97.0
deleted file mode 100644
index a562e4e68a99..000000000000
--- a/metadata/md5-cache/dev-db/pgtap-0.97.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) dev-perl/TAP-Parser-SourceHandler-pgTAP
-DESCRIPTION=Unit testing for PostgreSQL
-EAPI=6
-HOMEPAGE=http://pgtap.org/
-IUSE=postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) dev-perl/TAP-Parser-SourceHandler-pgTAP
-SLOT=0
-SRC_URI=http://api.pgxn.org/dist/pgtap/0.97.0/pgtap-0.97.0.zip
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=fc11b804eee2a9ca7000b8812cf0407c
diff --git a/metadata/md5-cache/dev-db/pspg-0.9.1 b/metadata/md5-cache/dev-db/pspg-0.9.1
new file mode 100644
index 000000000000..c251ab7be42a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pspg-0.9.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:*
+DESCRIPTION=A better pager for psql and mysql
+EAPI=6
+HOMEPAGE=https://github.com/okbob/pspg
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:*
+SLOT=0
+SRC_URI=https://github.com/okbob/pspg/archive/0.9.1.tar.gz -> pspg-0.9.1.tar.gz
+_md5_=584f8a3d3cb871e00337361288a09afa
diff --git a/metadata/md5-cache/dev-db/psqlodbc-09.06.0200 b/metadata/md5-cache/dev-db/psqlodbc-09.06.0200
deleted file mode 100644
index 5faf5b18d899..000000000000
--- a/metadata/md5-cache/dev-db/psqlodbc-09.06.0200
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-DESCRIPTION=Official ODBC driver for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc iodbc ssl threads unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-SLOT=0
-SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-09.06.0200.tar.gz
-_md5_=a279d5bab4f70440f5eaf97cf3b20d98
diff --git a/metadata/md5-cache/dev-db/psqlodbc-09.06.0300 b/metadata/md5-cache/dev-db/psqlodbc-09.06.0300
deleted file mode 100644
index 5c1e43c94387..000000000000
--- a/metadata/md5-cache/dev-db/psqlodbc-09.06.0300
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-DESCRIPTION=Official ODBC driver for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc iodbc ssl threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-SLOT=0
-SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-09.06.0300.tar.gz
-_md5_=a9c0ca240b3b46be6bb03882c407ada1
diff --git a/metadata/md5-cache/dev-db/psqlodbc-09.06.0310 b/metadata/md5-cache/dev-db/psqlodbc-09.06.0310
deleted file mode 100644
index 701d9753d0f6..000000000000
--- a/metadata/md5-cache/dev-db/psqlodbc-09.06.0310
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-DESCRIPTION=Official ODBC driver for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc iodbc ssl threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-SLOT=0
-SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-09.06.0310.tar.gz
-_md5_=a9c0ca240b3b46be6bb03882c407ada1
diff --git a/metadata/md5-cache/dev-db/psqlodbc-10.01.0000 b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
new file mode 100644
index 000000000000..009223b93a2b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
+DESCRIPTION=Official ODBC driver for PostgreSQL
+EAPI=6
+HOMEPAGE=http://www.postgresql.org/
+IUSE=doc iodbc ssl threads
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
+SLOT=0
+SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-10.01.0000.tar.gz
+_md5_=2ed6b192584961914bedc43b81e90a70
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index c66e9a5650d7..8accfc875900 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
new file mode 100644
index 000000000000..bdb588837341
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Jakarta-Commons Collections Component
+EAPI=6
+HOMEPAGE=https://commons.apache.org/collections/
+IUSE=test elibc_FreeBSD doc source test elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1713f067657de7c914fca922ad3ee314
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1 b/metadata/md5-cache/dev-java/commons-collections-4.1
index 0ada07ec4f08..714c492f5b05 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.7 test? ( dev-java/easymock:3.2 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Extends the JCF classes with new interfaces, implementations and utilities
 EAPI=6
-HOMEPAGE=http://commons.apache.org/collections/
+HOMEPAGE=https://commons.apache.org/collections/
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.1-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f36f2129fc25942089cdbf4d75b58739
+_md5_=bd6ab5d01d5d6f7f82098f7d93c6e610
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9c585513c80f..b3b09c97bd22 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/perl-5.24.3 b/metadata/md5-cache/dev-lang/perl-5.24.3
index 787de49f8400..9bf678597c3f 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.3
+++ b/metadata/md5-cache/dev-lang/perl-5.24.3
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=https://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.3.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.3-patches-2/perl-5.24.3-patches-2.tar.xz mirror://gentoo/perl-5.24.3-patches-2.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.3-patches-2.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2f65a3920682db7c3ac85a9f839b786b
+_md5_=3b3f795f8a06ace9a4306c046c735c43
diff --git a/metadata/md5-cache/dev-lang/python-3.6.3-r1 b/metadata/md5-cache/dev-lang/python-3.6.3-r1
index 25ba5f069400..b8d56d9dff54 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.2-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e22eff8f9efbae5c43b86b5f3cdadd28
+_md5_=0b07c8076a669a1464bf30f81a6d7bdf
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0 b/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
index b9f4ccb43555..68e018833fd9 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
@@ -11,4 +11,4 @@ RESTRICT=ia64? ( test )
 SLOT=38
 SRC_URI=https://people.mozilla.org/~sstangl/mozjs-38.2.1.rc0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=327d8dd0e29fd9916263d1e59195e2e8
+_md5_=7796dd5d167b01f4c6e2728ed2b1eaba
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a239087e2dbe..6adea729de6f 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/elfutils-0.170-r1 b/metadata/md5-cache/dev-libs/elfutils-0.170-r1
index 162f139e4f5d..23ed96586d26 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.170-r1
+++ b/metadata/md5-cache/dev-libs/elfutils-0.170-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=6
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-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+ LGPL-3+ ) utils? ( GPL-3+ )
 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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.170/elfutils-0.170.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5e65247b3df1e0304ec12515b4409346
+_md5_=6b09d10dcc06fd4005f81870dad8fb04
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.8.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.8.0
new file mode 100644
index 000000000000..61136c868f7c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Memory efficient serialization library
+EAPI=6
+HOMEPAGE=https://google.github.io/flatbuffers/
+IUSE=static-libs test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/google/flatbuffers/archive/v1.8.0.tar.gz -> flatbuffers-1.8.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c8c6487442895cf3fc6f1aafe3052d5d
diff --git a/metadata/md5-cache/dev-libs/gecode-3.7.3-r1 b/metadata/md5-cache/dev-libs/gecode-3.7.3-r1
index fd617d13a6b7..6a4b44a9150d 100644
--- a/metadata/md5-cache/dev-libs/gecode-3.7.3-r1
+++ b/metadata/md5-cache/dev-libs/gecode-3.7.3-r1
@@ -1,12 +1,10 @@
 DEFINED_PHASES=compile configure install
-DEPEND=gist? ( dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/freetype media-libs/libpng >=dev-libs/glib-2 )
 DESCRIPTION=An environment for developing constraint-based applications
 EAPI=4
 HOMEPAGE=http://www.gecode.org/
-IUSE=doc examples gist
+IUSE=doc examples
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=gist? ( dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/freetype media-libs/libpng >=dev-libs/glib-2 )
 SLOT=0
 SRC_URI=http://www.gecode.org/download/gecode-3.7.3.tar.gz
-_md5_=27e5c82631f6dccf5a8cdbf47452f497
+_md5_=6b070e44aa6f7182fac88b6ccb84b0c8
diff --git a/metadata/md5-cache/dev-libs/gecode-4.4.0-r1 b/metadata/md5-cache/dev-libs/gecode-4.4.0-r1
deleted file mode 100644
index 4aebbe55baba..000000000000
--- a/metadata/md5-cache/dev-libs/gecode-4.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gist? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) gmp? ( dev-libs/gmp:0 dev-libs/mpfr:0 ) sys-devel/bison sys-devel/flex doc? ( app-doc/doxygen media-gfx/graphviz ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An environment for developing constraint-based applications
-EAPI=6
-HOMEPAGE=http://www.gecode.org/
-IUSE=doc examples gist gmp
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=gist? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) gmp? ( dev-libs/gmp:0 dev-libs/mpfr:0 )
-SLOT=0
-SRC_URI=http://www.gecode.org/download/gecode-4.4.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1bf350736e9766db1392f95cc7ad6200
diff --git a/metadata/md5-cache/dev-libs/gecode-4.4.0-r2 b/metadata/md5-cache/dev-libs/gecode-4.4.0-r2
new file mode 100644
index 000000000000..6506109b5e26
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gecode-4.4.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gist? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) gmp? ( dev-libs/gmp:0 dev-libs/mpfr:0 ) sys-devel/bison sys-devel/flex doc? ( app-doc/doxygen media-gfx/graphviz ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An environment for developing constraint-based applications
+EAPI=6
+HOMEPAGE=http://www.gecode.org/
+IUSE=doc examples gist gmp
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=gist? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) gmp? ( dev-libs/gmp:0 dev-libs/mpfr:0 )
+SLOT=0
+SRC_URI=http://www.gecode.org/download/gecode-4.4.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=79dc0e30d5baece9e85ed77553e4b236
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.1 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.1
index da316ff77517..b5adab476463 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d0bca285f8816d3245e97b41f71c8768
+_md5_=3ba84c0ad7e615173600c5c6302b1fa6
diff --git a/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2 b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2
new file mode 100644
index 000000000000..302e9af661ce
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmemcache-1.4.0_rc2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=C API for memcached
+EAPI=6
+HOMEPAGE=http://people.freebsd.org/~seanc/libmemcache/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.rc2.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=638a55b3487e022dd443d736e42abb3c
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-2.0.0 b/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
index 3f65cb180666..7ee6f9d27622 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A Qt implementation of XDG standards
 EAPI=5
-HOMEPAGE=http://lxqt.org/
+HOMEPAGE=https://lxqt.org/
 IUSE=test test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
 SLOT=0
-SRC_URI=http://downloads.lxqt.org/libqtxdg/2.0.0/libqtxdg-2.0.0.tar.xz
+SRC_URI=https://downloads.lxqt.org/libqtxdg/2.0.0/libqtxdg-2.0.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=461402e1a31727fe7e09d1964ded341b
+_md5_=df5b343bdf1eeb789001f1eea70ae78e
diff --git a/metadata/md5-cache/dev-libs/libunicode-0.4-r2 b/metadata/md5-cache/dev-libs/libunicode-0.4-r2
new file mode 100644
index 000000000000..5b9b04884417
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libunicode-0.4-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Unicode library
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2 LGPL-2
+SLOT=0
+SRC_URI=ftp://ftp.gnome.org/pub/GNOME/sources/libunicode/0.4/libunicode-0.4.gnome.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=701ffbc1759917dfd642e8629d1d36d3
diff --git a/metadata/md5-cache/dev-libs/log4cplus-1.2.0 b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
index e438e35015ea..d0653682b1ea 100644
--- a/metadata/md5-cache/dev-libs/log4cplus-1.2.0
+++ b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install test
-DEPEND=virtual/pkgconfig iconv? ( virtual/libiconv ) qt4? ( dev-qt/qtcore:4 )
+DEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 ) virtual/pkgconfig
 DESCRIPTION=C++ port of the Log for Java (log4j) logging library
 EAPI=6
-HOMEPAGE=http://log4cplus.sourceforge.net/
-IUSE=iconv qt4 threads working-locale working-c-locale
+HOMEPAGE=http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus
+IUSE=iconv qt5 threads working-locale working-c-locale
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Apache-2.0 BSD-2 )
-RDEPEND=iconv? ( virtual/libiconv ) qt4? ( dev-qt/qtcore:4 )
+RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=?? ( iconv working-locale working-c-locale )
 SLOT=0/1.2-5
 SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.bz2
-_md5_=433af8a4cb6b5209e853b0d6028c204a
+_md5_=c0abef49807d72924b1a0624580a0b59
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3 b/metadata/md5-cache/dev-libs/mpc-1.0.3
index 9df9169df0cf..426ee2743ee6 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.3
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=4
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.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(-)?,static-libs?] >=dev-libs/mpfr-2.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=eee2d88bd40a25d4023b90b4e6b157e2
+_md5_=885a11d9552817f1d786314be529fb9a
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3-r1 b/metadata/md5-cache/dev-libs/mpc-1.0.3-r1
deleted file mode 100644
index 375e8f3c404a..000000000000
--- a/metadata/md5-cache/dev-libs/mpc-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/gmp-4.3.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-2.4.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=app-portage/elt-patches-20170422
-DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
-EAPI=6
-HOMEPAGE=http://mpc.multiprecision.org/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-4.3.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-2.4.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-SLOT=0
-SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8468a5c294b05adec669eb6b8e635254
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3-r2 b/metadata/md5-cache/dev-libs/mpc-1.0.3-r2
new file mode 100644
index 000000000000..5c6846dfc41c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/gmp-4.3.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-2.4.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=app-portage/elt-patches-20170422
+DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
+EAPI=6
+HOMEPAGE=http://mpc.multiprecision.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-4.3.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-2.4.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+SLOT=0/3
+SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5e49b26c1b630679f1afd791d4451668
diff --git a/metadata/md5-cache/dev-libs/mpc-1.1.0 b/metadata/md5-cache/dev-libs/mpc-1.1.0
new file mode 100644
index 000000000000..10944d8a3464
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mpc-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
+EAPI=6
+HOMEPAGE=http://mpc.multiprecision.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+SLOT=0/3
+SRC_URI=https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c04a7cf91c72ef635c29bfe77fe151f0
diff --git a/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0 b/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
index b9755e8df413..e20803934c79 100644
--- a/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
+++ b/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gettext virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=A Perl module for accessing the GNU locale utilities
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/gettext/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-devel/gettext dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9be7eb9364ba445d2bdef60704018a38
+_md5_=0ebc22b01ff0159bd14cb815bcd02f5a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 3e1168300fee..90130a008e95 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Module-Build-0.421.600 b/metadata/md5-cache/dev-perl/Module-Build-0.421.600
index 402be21e21bb..d2b2a8ec02f1 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-0.421.600
+++ b/metadata/md5-cache/dev-perl/Module-Build-0.421.600
@@ -4,10 +4,10 @@ DESCRIPTION=Build and install Perl modules
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-Build/
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.142.60 virtual/perl-Data-Dumper >=virtual/perl-ExtUtils-CBuilder-0.270.0 virtual/perl-ExtUtils-Install virtual/perl-ExtUtils-Manifest virtual/perl-ExtUtils-MakeMaker >=virtual/perl-ExtUtils-ParseXS-2.210.0 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Getopt-Long >=virtual/perl-Module-Metadata-1.0.2 >=virtual/perl-Perl-OSType-1 virtual/perl-Test-Harness virtual/perl-Text-ParseWords dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4216.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b28406095976523f65769cff0ecbe432
+_md5_=385f2cef0958ec9f5168af805696e434
diff --git a/metadata/md5-cache/dev-perl/Specio-0.420.0 b/metadata/md5-cache/dev-perl/Specio-0.420.0
index 1aff0de4f3c1..159f081ff431 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.420.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.420.0
@@ -4,10 +4,10 @@ DESCRIPTION=Type constraints and coercions for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Specio/
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ff49245f20be021e1a23025cf3400998
+_md5_=621bc73d2d57c56aa7cb013741f22cab
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1 b/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
index fb7f70b8e086..a9e270275e62 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Quote/
 IUSE=test minimal
-KEYWORDS=amd64 ~arm hppa ppc ~sparc x86
+KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.003001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3c45dc1c7c37f4a9223fed289edc2e48
+_md5_=fd19a737cb1d047007992c06bb9f258b
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0 b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
index 9c58e98045f4..b09d8f2a8ee1 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Quote/
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.004000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ed705549cff290682c83eb12b8463823
+_md5_=501aca75aae02e3890eb0de7bbe9f78e
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index efac00d5cb6a..899e83f4bc2f 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/awl-0.59 b/metadata/md5-cache/dev-php/awl-0.59
new file mode 100644
index 000000000000..205876bcf777
--- /dev/null
+++ b/metadata/md5-cache/dev-php/awl-0.59
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=test? ( dev-php/phpunit )
+DESCRIPTION=Andrew McMillan's Web Libraries
+EAPI=6
+HOMEPAGE=https://gitlab.com/davical-project/awl
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php:*[pdo,postgres,xml]
+SLOT=0
+SRC_URI=https://gitlab.com/davical-project/awl/repository/archive.tar.gz?ref=r0.59 -> awl-0.59.tar.gz
+_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=d85627ef34596eb5305c3d362bec70ed
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 653d183b286a..7dd3a8b5a9b1 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/aiosmtpd-1.0 b/metadata/md5-cache/dev-python/aiosmtpd-1.0
new file mode 100644
index 000000000000..a72ceb991095
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=asyncio based SMTP server
+EAPI=6
+HOMEPAGE=http://aiosmtpd.readthedocs.io/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/atpublic[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=57b0c91380e2df9b7d704cbefd9ffc7b
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.3 b/metadata/md5-cache/dev-python/appdirs-1.4.3
index fa78c2c5957f..7c3cc9ae4af4 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.3
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Module for determining appropriate platform-specific dirs
 EAPI=6
 HOMEPAGE=https://github.com/ActiveState/appdirs
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.3.tar.gz -> appdirs-1.4.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b2c52fddea351a0bfcc2db04e6dee33
+_md5_=d5d37637d35d4201c88d92be2ec4b7ed
diff --git a/metadata/md5-cache/dev-python/certifi-2017.4.17 b/metadata/md5-cache/dev-python/certifi-2017.4.17
index 458d4b73f02c..1de733e5ef1a 100644
--- a/metadata/md5-cache/dev-python/certifi-2017.4.17
+++ b/metadata/md5-cache/dev-python/certifi-2017.4.17
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for providing Mozilla's CA Bundle
 EAPI=6
 HOMEPAGE=http://certifi.io/ https://pypi.python.org/pypi/certifi
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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=LGPL-2.1
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2017.4.17.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44c011f9842b809197675c2aee4fa8ce
+_md5_=b8434e57f064b05bbe6f4a88cfe58908
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.1 b/metadata/md5-cache/dev-python/libpillowfight-0.2.1
deleted file mode 100644
index 5b3223c2cf54..000000000000
--- a/metadata/md5-cache/dev-python/libpillowfight-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Small library containing various image processing algorithms
-EAPI=6
-HOMEPAGE=https://github.com/jflesch/libpillowfight
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/jflesch/libpillowfight/archive/0.2.1.tar.gz -> libpillowfight-0.2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e696d9747bd1468af538ac23b4f0ad7
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-5.30.1 b/metadata/md5-cache/dev-python/oslo-messaging-5.30.1
deleted file mode 100644
index a6e4083e5d37..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-5.30.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-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[python_targets_python2_7(-)?,python_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-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/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/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cachetools-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/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/py-amqp-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/py-amqp-2.1.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/kombu-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/kombu-4.0.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/pika-0.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/pika-pool-0.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(-)] 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/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/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-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.messaging/oslo.messaging-5.30.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00f782354b35129bd1d537dd6c805a79
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-5.30.2 b/metadata/md5-cache/dev-python/oslo-messaging-5.30.2
index 7ce5ec32e334..7c48f3203e35 100644
--- a/metadata/md5-cache/dev-python/oslo-messaging-5.30.2
+++ b/metadata/md5-cache/dev-python/oslo-messaging-5.30.2
@@ -4,11 +4,11 @@ DESCRIPTION=Messaging API for RPC and notifications over different messaging tra
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_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-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/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/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cachetools-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/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/py-amqp-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/py-amqp-2.1.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/kombu-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/kombu-4.0.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/pika-0.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/pika-pool-0.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(-)] 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/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/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-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.messaging/oslo.messaging-5.30.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2cd27395eecc274bfebee9626fc363f6
+_md5_=7e3786b900f66535685825f9a3235bcd
diff --git a/metadata/md5-cache/dev-python/packaging-16.8 b/metadata/md5-cache/dev-python/packaging-16.8
index e60326697620..06ba067ebdf6 100644
--- a/metadata/md5-cache/dev-python/packaging-16.8
+++ b/metadata/md5-cache/dev-python/packaging-16.8
@@ -4,11 +4,11 @@ DESCRIPTION=Core utilities for Python packages
 EAPI=6
 HOMEPAGE=https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 BSD-2 )
 RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-16.8.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fa8dbf5309cafffc574b877e6205863
+_md5_=f140424e09ae7f2d25f833cd55120c54
diff --git a/metadata/md5-cache/dev-python/psycopg-2.7.3.2 b/metadata/md5-cache/dev-python/psycopg-2.7.3.2
new file mode 100644
index 000000000000..57ea6bf233eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psycopg-2.7.3.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/postgresql-8.1:* doc? ( >=dev-python/pygments-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=PostgreSQL database adapter for Python
+EAPI=6
+HOMEPAGE=http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2
+IUSE=debug doc examples 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=LGPL-3+
+RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=2
+SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.7.3.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf89e91653c228f095700a5e5a1e9e5f
diff --git a/metadata/md5-cache/dev-python/pyinsane-2.0.9 b/metadata/md5-cache/dev-python/pyinsane-2.0.9
deleted file mode 100644
index 32c587c4e0ea..000000000000
--- a/metadata/md5-cache/dev-python/pyinsane-2.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python implementation of the Sane API and abstration layer
-EAPI=6
-HOMEPAGE=https://github.com/jflesch/pyinsane
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=2
-SRC_URI=https://github.com/jflesch/pyinsane/archive/2.0.9.tar.gz -> pyinsane-2.0.9.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4dec1268c54aca76b2f0bd6825f876dd
diff --git a/metadata/md5-cache/dev-python/pyocr-0.4.6 b/metadata/md5-cache/dev-python/pyocr-0.4.6
deleted file mode 100644
index 12c462a1445e..000000000000
--- a/metadata/md5-cache/dev-python/pyocr-0.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=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=An optical character recognition (OCR) tool wrapper for python
-EAPI=6
-HOMEPAGE=https://github.com/jflesch/pyocr
-IUSE=cuneiform +tesseract python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=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=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/jflesch/pyocr/archive/0.4.6.tar.gz -> pyocr-0.4.6.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=538ad87aa6a64604f25c23d08d01ed49
diff --git a/metadata/md5-cache/dev-python/pyocr-0.4.7 b/metadata/md5-cache/dev-python/pyocr-0.4.7
deleted file mode 100644
index b6434def787d..000000000000
--- a/metadata/md5-cache/dev-python/pyocr-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=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=An optical character recognition (OCR) tool wrapper for python
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/pyocr
-IUSE=cuneiform +tesseract python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=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=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/pyocr/archive/0.4.7.tar.gz -> pyocr-0.4.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=899549477ad9d7bd2b3379b513cd355d
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3 b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
new file mode 100644
index 000000000000..169d6a2de6c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
@@ -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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python implementation of SAML Version 2 to be used in a WSGI environment
+EAPI=6
+HOMEPAGE=https://github.com/rohe/pysaml2
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/repoze-who[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.0.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f6cb87762c356f3b5a696b557a446efb
diff --git a/metadata/md5-cache/dev-python/six-1.10.0 b/metadata/md5-cache/dev-python/six-1.10.0
index e197a30c6f2c..9f392eaec037 100644
--- a/metadata/md5-cache/dev-python/six-1.10.0
+++ b/metadata/md5-cache/dev-python/six-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python 2 and 3 compatibility library
 EAPI=5
 HOMEPAGE=https://github.com/benjaminp/six https://pypi.python.org/pypi/six
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.10.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0da844f27334d4f8a824e745ab26606
+_md5_=9e971dd318c43bb130c66fbe67ffd7c5
diff --git a/metadata/md5-cache/dev-python/tlslite-0.4.9-r2 b/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
index e4d191410ed5..b793bec7e228 100644
--- a/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
+++ b/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=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(-)]
+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=TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1
 EAPI=6
 HOMEPAGE=http://trevp.net/tlslite/ https://pypi.python.org/pypi/tlslite https://github.com/trevp/tlslite
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tlslite/tlslite-0.4.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21b01fa0d64db8d43bca7934bd4a86bf
+_md5_=0cad530e525f4af7c33ab65fd6e2da09
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1c9b4ff495ea..57eea50a2197 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/msgpack-0.7.6 b/metadata/md5-cache/dev-ruby/msgpack-0.7.6
deleted file mode 100644
index 70f0ad24111e..000000000000
--- a/metadata/md5-cache/dev-ruby/msgpack-0.7.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Binary-based efficient data interchange format for ruby binding
-EAPI=5
-HOMEPAGE=http://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/msgpack-0.7.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2adabb97be76cfa52628a33afad78331
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.3 b/metadata/md5-cache/dev-ruby/msgpack-1.0.3
deleted file mode 100644
index c8921b7dbebb..000000000000
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Binary-based efficient data interchange format for ruby binding
-EAPI=5
-HOMEPAGE=https://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/msgpack-1.0.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5788976a1a4574ae28bc2f6dabaddef0
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.1.0 b/metadata/md5-cache/dev-ruby/msgpack-1.1.0
deleted file mode 100644
index 06869784c0dc..000000000000
--- a/metadata/md5-cache/dev-ruby/msgpack-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Binary-based efficient data interchange format for ruby binding
-EAPI=5
-HOMEPAGE=https://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/msgpack-1.1.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5788976a1a4574ae28bc2f6dabaddef0
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.2.2 b/metadata/md5-cache/dev-ruby/msgpack-1.2.2
new file mode 100644
index 000000000000..b53b4424176d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Binary-based efficient data interchange format for ruby binding
+EAPI=6
+HOMEPAGE=https://msgpack.org/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/msgpack-1.2.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f238f4013d2ba257d74034098a516af2
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.11.2 b/metadata/md5-cache/dev-ruby/parallel-1.11.2
deleted file mode 100644
index 46479641a8ad..000000000000
--- a/metadata/md5-cache/dev-ruby/parallel-1.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Run any code in parallel Processes or Threads
-EAPI=5
-HOMEPAGE=https://github.com/grosser/parallel
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1
-SRC_URI=https://github.com/grosser/parallel/archive/v1.11.2.tar.gz -> parallel-1.11.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6e8846154fe4a983c986eec4a587f231
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 49c60581d49b..e1997e55cd73 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/abntex-0.9_beta2 b/metadata/md5-cache/dev-tex/abntex-0.9_beta2
deleted file mode 100644
index cdd98b2e3059..000000000000
--- a/metadata/md5-cache/dev-tex/abntex-0.9_beta2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX macros for writing documents following the ABNT norms
-EAPI=3
-HOMEPAGE=http://abntex.codigolivre.org.br/ http://abntex.sourceforge.net/
-IUSE=doc examples lyx
-KEYWORDS=~amd64 ~x86
-LICENSE=LPPL-1.3c
-RDEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base
-SLOT=0
-SRC_URI=mirror://sourceforge/abntex/abntex-0.9-beta2.tar.gz doc? ( mirror://sourceforge/abntex/abntex-doc-0.9-beta2.tar.gz )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1662ce979907ab0098582e72331bfc83
diff --git a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1 b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
new file mode 100644
index 000000000000..28fac380aed0
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=LaTeX macros for writing documents following the ABNT norms
+EAPI=6
+HOMEPAGE=http://abntex.codigolivre.org.br/ http://abntex.sourceforge.net/
+IUSE=doc examples lyx
+KEYWORDS=~amd64 ~x86
+LICENSE=LPPL-1.3c
+RDEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base
+SLOT=0
+SRC_URI=mirror://sourceforge/abntex/abntex-0.9-beta2.tar.gz doc? ( mirror://sourceforge/abntex/abntex-doc-0.9-beta2.tar.gz )
+_eclasses_=latex-package	79acad19b9efeec616d0ad70cd117b03
+_md5_=a2ddd450141688b4d2301c20a88f0be8
diff --git a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1 b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
new file mode 100644
index 000000000000..971643883003
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=HLaTeX is a LaTeX package to use Hangul with LaTeX
+EAPI=6
+HOMEPAGE=http://project.ktug.or.kr/hlatex/
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=virtual/latex-base
+SLOT=0
+SRC_URI=ftp://ftp.ktug.or.kr/pub/ktug/hlatex/HLaTeX-1.0.1.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-myoungjo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gothic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-taza-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-graphic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gungseo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-shinmun-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgi-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pen-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-bom-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-yetgul-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-jamo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-vada-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgia-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-dinaru-1.0.tar.gz
+_eclasses_=latex-package	79acad19b9efeec616d0ad70cd117b03	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a1ce0fb1a6221b9a07a9edfde0334911
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 726c095a9d5b..2e044cc304c6 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/diffstat-1.60 b/metadata/md5-cache/dev-util/diffstat-1.60
index 8e6f18ff4c3a..1af666de36ec 100644
--- a/metadata/md5-cache/dev-util/diffstat-1.60
+++ b/metadata/md5-cache/dev-util/diffstat-1.60
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=Display a histogram of diff changes
 EAPI=5
 HOMEPAGE=http://invisible-island.net/diffstat/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=ftp://invisible-island.net/diffstat/diffstat-1.60.tgz
-_md5_=89bfbf6c2eacbe833cc3b07f17d92d6e
+_md5_=cff2b98524533dcba9e154578b04a550
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.1 b/metadata/md5-cache/dev-util/drone-cli-0.8.1
new file mode 100644
index 000000000000..56289fc706ff
--- /dev/null
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!<dev-util/drone-0.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.1.tar.gz -> drone-cli-0.8.1.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=8d7bf968c1c1644397fddee1ae332453
diff --git a/metadata/md5-cache/dev-util/intltool-0.51.0-r2 b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
index fbfaf51f5ec0..236b1f8af57f 100644
--- a/metadata/md5-cache/dev-util/intltool-0.51.0-r2
+++ b/metadata/md5-cache/dev-util/intltool-0.51.0-r2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
 DESCRIPTION=Internationalization Tool Collection
 EAPI=6
 HOMEPAGE=https://launchpad.net/intltool/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
-_md5_=6fe59734fe7020b5dd44d4cf81fa1d9a
+_md5_=a4f7e6d535009114c314ee99e1df28a1
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 8e4ae37b17cc..78168727d008 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.13.6 b/metadata/md5-cache/dev-vcs/git-2.13.6
index 9629172bb6f1..fcc98fb6e7b2 100644
--- a/metadata/md5-cache/dev-vcs/git-2.13.6
+++ b/metadata/md5-cache/dev-vcs/git-2.13.6
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.13.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.13.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.13.6.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f807e6731c0c39b811a503de444f1222
+_md5_=a7e9dff5eef4576d8bb0d3e553a10ccf
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 6ae58d4c05d2..27ea800f24aa 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0 b/metadata/md5-cache/games-emulation/dolphin-5.0
index c41a0ace3bcb..36d364b50ca0 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:= sys-libs/glibc sys-libs/readline:= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) >=dev-util/cmake-2.8.8 >=sys-devel/gcc-4.9.0 app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=5
 HOMEPAGE=https://www.dolphin-emu.org/
-IUSE=alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
+IUSE=alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:= sys-libs/glibc sys-libs/readline:= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
+RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cae8542629f48bf14b400df97fe34f03
+_md5_=8a4b3b1b16ebb407f6c4e0c59d41cd3b
diff --git a/metadata/md5-cache/games-emulation/dosbox-9999 b/metadata/md5-cache/games-emulation/dosbox-9999
index 5eb2ff9e4917..601eee35bd87 100644
--- a/metadata/md5-cache/games-emulation/dosbox-9999
+++ b/metadata/md5-cache/games-emulation/dosbox-9999
@@ -7,6 +7,6 @@ IUSE=alsa debug glide hardened opengl
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound
 SLOT=0
-SRC_URI=glide? ( https://raw.githubusercontent.com/voyageur/openglide/3722fc563b737d2d7933df6a771651c2154e6f7b/platform/dosbox/dosbox_glide.diff -> dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff )
+SRC_URI=glide? ( https://raw.githubusercontent.com/voyageur/openglide/841e1071597b64ead14dd08c25a03206b2d1d1b6/platform/dosbox/dosbox_glide.diff -> dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d47acc2b28440e1d5214dab56ef17f59
+_md5_=2006a7920a7fefcd22d6fb09f02741da
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 061df067f2ea..51e9e346008d 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/openmw-0.43.0 b/metadata/md5-cache/games-engines/openmw-0.43.0
new file mode 100644
index 000000000000..eed5e55d0989
--- /dev/null
+++ b/metadata/md5-cache/games-engines/openmw-0.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-games/openscenegraph-3.3.4[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib] dev-games/mygui dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Open source reimplementation of TES III: Morrowind
+EAPI=6
+HOMEPAGE=https://openmw.org/
+IUSE=doc devtools +qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 MIT BitstreamVera ZLIB
+RDEPEND=>=dev-games/openscenegraph-3.3.4[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib] dev-games/mygui dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.43.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c801ee9218f0069b8f492fad23d323d1
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index de1db5bff6f7..08ec6cf13037 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/qjoypad-4.3.0 b/metadata/md5-cache/games-util/qjoypad-4.3.0
index 5b6e46d24121..9097b881b97a 100644
--- a/metadata/md5-cache/games-util/qjoypad-4.3.0
+++ b/metadata/md5-cache/games-util/qjoypad-4.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst dev-qt/linguist-tools:5 x11-proto/inputproto x11-proto/xextproto x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Translate gamepad/joystick input into key strokes/mouse actions in X
 EAPI=6
 HOMEPAGE=https://github.com/panzi/qjoypad
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 v
 SLOT=0
 SRC_URI=https://github.com/panzi/qjoypad/archive/v4.3.0.tar.gz -> qjoypad-4.3.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f7d575d0993a20918d53666c0ae91a5
+_md5_=5087ae48f591617bd92d6d4d7fcad6cf
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index e95f5f127086..be0be915c003 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-17.12.0
deleted file mode 100644
index 8d33adf23b7e..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-17.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c6f05a113fb11a4cdd1e4247d60360c6
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-17.12.1
new file mode 100644
index 000000000000..e83c27939b4c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-17.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=6
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.0
deleted file mode 100644
index 0b9efe879cdf..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-calendar-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc58934e5bc918e916bad16e7b27c851
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
new file mode 100644
index 000000000000..31c9c9af9996
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca879f245848cce518db77992d05805b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.0
deleted file mode 100644
index 20c2eef0d1ef..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-contacts-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c99461e098cb40644844d845cb79d514
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
new file mode 100644
index 000000000000..2abea3ebaecb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi contact integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-contacts-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12b715649347b94ae0aa26ff37555a61
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.0
deleted file mode 100644
index f756e4087666..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/mailimporter-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/mailimporter-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-import-wizard-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a60317535390c06e7f0a4ddc54b15878
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
new file mode 100644
index 000000000000..a45c273effb3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-import-wizard-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.0
deleted file mode 100644
index d359d519365e..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-mime-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c7f50cdec14d9f3c44d88aa36bf0257
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
new file mode 100644
index 000000000000..8521f4ae5405
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi mime types
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-mime-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=714b811db60bee10aac6bcea42abbcb1
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.0
deleted file mode 100644
index b85689847224..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-apps/akonadi-17.12.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-notes-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b22ea9689e925a459ddfb91afaae3068
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
new file mode 100644
index 000000000000..1753f54390f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-apps/akonadi-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi notes integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-notes-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.12.0 b/metadata/md5-cache/kde-apps/akonadi-search-17.12.0
deleted file mode 100644
index 7de3e5e54458..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-17.12.0:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-search-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43dd6249803d167b10d6662c0ffebe21
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
new file mode 100644
index 000000000000..362bf7ba0014
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-17.12.1:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/akonadi-search.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-search-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=43dd6249803d167b10d6662c0ffebe21
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.0 b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.0
deleted file mode 100644
index dafec0a2ebc9..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadiconsole-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f76aa5c04e9f71bd3d45a04d808b514
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1 b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
new file mode 100644
index 000000000000..b1f82e2b5254
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadiconsole-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38836db7ab983fb6652ab0abbb63e116
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.0 b/metadata/md5-cache/kde-apps/akregator-17.12.0
deleted file mode 100644
index fc9bafee0f96..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=kde-apps/syndication-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=kde-apps/syndication-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akregator-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90f1ecca54f7f986325c8b28d953281d
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.1 b/metadata/md5-cache/kde-apps/akregator-17.12.1
new file mode 100644
index 000000000000..0e46941bc9d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=kde-apps/syndication-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=News feed aggregator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=kde-apps/syndication-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akregator-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6d63687dda7afcfc0c3e861faeb6d614
diff --git a/metadata/md5-cache/kde-apps/analitza-17.12.0 b/metadata/md5-cache/kde-apps/analitza-17.12.0
deleted file mode 100644
index eeb206419f68..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for mathematical features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/analitza-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad7f9776702b5ff683fddc700f31a5b2
diff --git a/metadata/md5-cache/kde-apps/analitza-17.12.1 b/metadata/md5-cache/kde-apps/analitza-17.12.1
new file mode 100644
index 000000000000..d9df3aa5faf8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for mathematical features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/analitza-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.0 b/metadata/md5-cache/kde-apps/ark-17.12.0
deleted file mode 100644
index 49f3f9988aa3..000000000000
--- a/metadata/md5-cache/kde-apps/ark-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Archiving tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip zlib test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ark-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07950e6876d820414a425fb9800fec4b
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.1 b/metadata/md5-cache/kde-apps/ark-17.12.1
new file mode 100644
index 000000000000..dda125e39705
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Archiving tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip zlib test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ark-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2aead06fe85a6b66f44eeebd312af7a
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.12.0 b/metadata/md5-cache/kde-apps/artikulate-17.12.0
deleted file mode 100644
index 83bd44dec337..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/language/artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/artikulate-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc418571a20f96fbca9c40b25a8f5c09
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.12.1 b/metadata/md5-cache/kde-apps/artikulate-17.12.1
new file mode 100644
index 000000000000..0c3a4429e25e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/language/artikulate
+IUSE=+gstreamer qtmedia debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/artikulate-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.0 b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.0
deleted file mode 100644
index 378ecad8fce7..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.0:5 >=kde-apps/libkcompactdisc-17.12.0:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.0:5 >=kde-apps/libkcompactdisc-17.12.0:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/audiocd-kio-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43b7755fb16687d9a42ee9f2d438ed73
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1 b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
new file mode 100644
index 000000000000..3db58dfd9ef6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=kde-apps/libkcompactdisc-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=kde-apps/libkcompactdisc-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/audiocd-kio-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.0 b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.0
deleted file mode 100644
index 4ff823b6ac9a..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Widget library for baloo
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/baloo-widgets-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc736f8cf0c286208c145a1414677fed
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1 b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
new file mode 100644
index 000000000000..00c4d88cea96
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Widget library for baloo
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/baloo-widgets-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/blinken-17.12.0 b/metadata/md5-cache/kde-apps/blinken-17.12.0
deleted file mode 100644
index 5abc4c06ab42..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the Simon Says game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/blinken-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31184b1a3688c179af846b477470573f
diff --git a/metadata/md5-cache/kde-apps/blinken-17.12.1 b/metadata/md5-cache/kde-apps/blinken-17.12.1
new file mode 100644
index 000000000000..36546960e1db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the Simon Says game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/blinken-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/bomber-17.12.0 b/metadata/md5-cache/kde-apps/bomber-17.12.0
deleted file mode 100644
index 179312e200f6..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE arcade bombing game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bomber/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/bomber-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afac903baf353556841f0d53aa32a883
diff --git a/metadata/md5-cache/kde-apps/bomber-17.12.1 b/metadata/md5-cache/kde-apps/bomber-17.12.1
new file mode 100644
index 000000000000..4a9059708ded
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE arcade bombing game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bomber/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/bomber-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bovo-17.12.0 b/metadata/md5-cache/kde-apps/bovo-17.12.0
deleted file mode 100644
index bb3efda897b8..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bovo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/bovo-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df02d34ae13de52187d5ab8b28ddeeaf
diff --git a/metadata/md5-cache/kde-apps/bovo-17.12.1 b/metadata/md5-cache/kde-apps/bovo-17.12.1
new file mode 100644
index 000000000000..e0637dcb966d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bovo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/bovo-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.0 b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.0
deleted file mode 100644
index fdc5046a818d..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-calendar-tools-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c613940e6fae33207cb852b75ea41bf7
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1 b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
new file mode 100644
index 000000000000..b4702aea45c1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.12.0 b/metadata/md5-cache/kde-apps/calendarsupport-17.12.0
deleted file mode 100644
index 7b6f96d737e8..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/calendarsupport-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=712a5bf0e53545d155017fedc3a9f9da
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.12.1 b/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
new file mode 100644
index 000000000000..9282e7d66602
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar support library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/calendarsupport-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e11627aaecb67bb19d093ffcfadfa87
diff --git a/metadata/md5-cache/kde-apps/cantor-17.12.0 b/metadata/md5-cache/kde-apps/cantor-17.12.0
deleted file mode 100644
index fef035847354..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-17.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.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.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.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.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/cantor-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=439b9ee9b2b08ae52ac4ec00811f49de
diff --git a/metadata/md5-cache/kde-apps/cantor-17.12.1 b/metadata/md5-cache/kde-apps/cantor-17.12.1
new file mode 100644
index 000000000000..5ee5c82864f8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-17.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/cantor-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.12.0 b/metadata/md5-cache/kde-apps/cervisia-17.12.0
deleted file mode 100644
index 6fc38237e9da..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=CVS frontend by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/cervisia-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd919ffccd336d35b577fc3017f76d6d
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.12.1 b/metadata/md5-cache/kde-apps/cervisia-17.12.1
new file mode 100644
index 000000000000..c992901f9e36
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=CVS frontend by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/cervisia-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.12.0 b/metadata/md5-cache/kde-apps/dolphin-17.12.0
deleted file mode 100644
index 2ecd47f6b017..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.0:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
-IUSE=semantic-desktop thumbnail test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.0:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0:5 ) >=kde-apps/kio-extras-17.12.0:5 thumbnail? ( >=kde-apps/ffmpegthumbs-17.12.0:5 >=kde-apps/thumbnailers-17.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/dolphin-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef1ca6e58057398c8dd55455f8e82679
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.12.1 b/metadata/md5-cache/kde-apps/dolphin-17.12.1
new file mode 100644
index 000000000000..43c551a368a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
+IUSE=semantic-desktop thumbnail test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0:5 ) >=kde-apps/kio-extras-17.12.1:5 thumbnail? ( >=kde-apps/ffmpegthumbs-17.12.1:5 >=kde-apps/thumbnailers-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/dolphin-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.0
deleted file mode 100644
index 295d135ddd4f..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Dolphin plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=bazaar dropbox git mercurial subversion debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 ) >=kde-apps/kompare-17.12.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.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/dolphin-plugins-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff4e800540ac3fb25b9a904a025442e7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
new file mode 100644
index 000000000000..955c206187d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Dolphin plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=bazaar dropbox git mercurial subversion debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 ) >=kde-apps/kompare-17.12.1:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/dolphin-plugins-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dragon-17.12.0 b/metadata/md5-cache/kde-apps/dragon-17.12.0
deleted file mode 100644
index 165cfdd16a2a..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A simple video player
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/dragon-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c9a0df7f6583f7bfe694913b8ececfb
diff --git a/metadata/md5-cache/kde-apps/dragon-17.12.1 b/metadata/md5-cache/kde-apps/dragon-17.12.1
new file mode 100644
index 000000000000..ae9bf51cac28
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A simple video player
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/dragon-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.12.0 b/metadata/md5-cache/kde-apps/eventviews-17.12.0
deleted file mode 100644
index 6695a4e5b886..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/eventviews-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65fca02db04d2cd98e0dd5c5863b439c
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.12.1 b/metadata/md5-cache/kde-apps/eventviews-17.12.1
new file mode 100644
index 000000000000..7d1e1e1f557b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/eventviews-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.0 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.0
deleted file mode 100644
index e9de2bb03d9f..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libav debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ffmpegthumbs-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3175d8010d01dd641df6183b354bc27e
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
new file mode 100644
index 000000000000..b0bed20ef4fe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libav debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ffmpegthumbs-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/filelight-17.12.0 b/metadata/md5-cache/kde-apps/filelight-17.12.0
deleted file mode 100644
index 710fde776e14..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/filelight-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=942017602317c0347ae5a37cd1ec5e68
diff --git a/metadata/md5-cache/kde-apps/filelight-17.12.1 b/metadata/md5-cache/kde-apps/filelight-17.12.1
new file mode 100644
index 000000000000..2d08786442cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/filelight-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/granatier-17.12.0 b/metadata/md5-cache/kde-apps/granatier-17.12.0
deleted file mode 100644
index 0aa3e5beb211..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bomberman game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/granatier/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/granatier-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51567d434d6fad5b41cf74d1242c701f
diff --git a/metadata/md5-cache/kde-apps/granatier-17.12.1 b/metadata/md5-cache/kde-apps/granatier-17.12.1
new file mode 100644
index 000000000000..d5d5e25b0cc4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bomberman game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/granatier/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/granatier-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.0 b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.0
deleted file mode 100644
index 2a036f1fbb9a..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/grantlee-editor-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f5473a22bebf9df481853fc2862f557
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1 b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
new file mode 100644
index 000000000000..9a71d8f98c63
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/grantlee-editor-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.12.0 b/metadata/md5-cache/kde-apps/grantleetheme-17.12.0
deleted file mode 100644
index 0139071c4b34..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/grantleetheme-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=303b3c51981be94e40bb5dd882d6c864
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.12.1 b/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
new file mode 100644
index 000000000000..720e71f49930
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for Grantlee plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/grantleetheme-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.12.0 b/metadata/md5-cache/kde-apps/gwenview-17.12.0
deleted file mode 100644
index 95a9ba446caa..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.0:5= ) raw? ( >=kde-apps/libkdcraw-17.12.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE image viewer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=fits kipi raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.0:5= ) raw? ( >=kde-apps/libkdcraw-17.12.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.40.0:5 >=dev-qt/qtimageformats-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/gwenview-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1151280dbe395efcf99a6aa19cd26df
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.12.1 b/metadata/md5-cache/kde-apps/gwenview-17.12.1
new file mode 100644
index 000000000000..93066bc78c6e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.1:5= ) raw? ( >=kde-apps/libkdcraw-17.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE image viewer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=fits kipi raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.1:5= ) raw? ( >=kde-apps/libkdcraw-17.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.40.0:5 >=dev-qt/qtimageformats-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/gwenview-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.0 b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.0
deleted file mode 100644
index 297de11b979f..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/eventviews-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/eventviews-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/incidenceeditor-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebd41ba3a22d60f113f5318ff8e1025e
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1 b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
new file mode 100644
index 000000000000..5dc53c5a9a92
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Incidence editor for korganizer
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/incidenceeditor-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/juk-17.12.0 b/metadata/md5-cache/kde-apps/juk-17.12.0
deleted file mode 100644
index 030a4563953a..000000000000
--- a/metadata/md5-cache/kde-apps/juk-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/juk-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b09a4899e9f299dd0bb527512781d006
diff --git a/metadata/md5-cache/kde-apps/juk-17.12.1 b/metadata/md5-cache/kde-apps/juk-17.12.1
new file mode 100644
index 000000000000..c9b4adf0d0df
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/juk-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/k3b-17.12.0 b/metadata/md5-cache/kde-apps/k3b-17.12.0
deleted file mode 100644
index 6c59f2b7df91..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/K3b
-IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/k3b-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d11356bb2a6347228cc652394a2bed4
diff --git a/metadata/md5-cache/kde-apps/k3b-17.12.1 b/metadata/md5-cache/kde-apps/k3b-17.12.1
new file mode 100644
index 000000000000..15675b61436a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/K3b
+IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FDL-1.2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/k3b-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.0 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.0
deleted file mode 100644
index 296c30beeb3d..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kaccounts-integration-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f7a32fb67105217e546530226b47de2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
new file mode 100644
index 000000000000..532f349f68e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaccounts-integration-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.0 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.0
deleted file mode 100644
index e33dcb92b829..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE accounts providers
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kaccounts-providers-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43f55919daf6816a96551286df961ac6
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
new file mode 100644
index 000000000000..e5fd0d799890
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE accounts providers
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaccounts-providers-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.12.0 b/metadata/md5-cache/kde-apps/kaddressbook-17.12.0
deleted file mode 100644
index 49894fb122ae..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/libgravatar-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-17.12.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/libgravatar-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kaddressbook-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce4c1f2c880a50f092828ef2aec10650
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.12.1 b/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
new file mode 100644
index 000000000000..ac6c8f808274
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaddressbook-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.12.0 b/metadata/md5-cache/kde-apps/kajongg-17.12.0
deleted file mode 100644
index 24a59b336fdd..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-17.12.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/17.12.0/src/kajongg-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14a8f63c45bae3f636904b9052801084
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.12.1 b/metadata/md5-cache/kde-apps/kajongg-17.12.1
new file mode 100644
index 000000000000..2a1b91dbcfcc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kajongg/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-17.12.1:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kajongg-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.12.0 b/metadata/md5-cache/kde-apps/kalarm-17.12.0
deleted file mode 100644
index 6cfad3d2203b..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kalarmcal-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kalarmcal-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kalarm-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16c276dc2a5d4bd2c79a0b84baa9acce
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.12.1 b/metadata/md5-cache/kde-apps/kalarm-17.12.1
new file mode 100644
index 000000000000..f23ef04b7d81
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalarm-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=524a0c2398d6cb25e0247079c3633a35
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.12.0 b/metadata/md5-cache/kde-apps/kalarmcal-17.12.0
deleted file mode 100644
index bd6b94548fe4..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kalarmcal-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09dfff195a5386bf81e2df6837004aa9
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.12.1 b/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
new file mode 100644
index 000000000000..66d56610b51e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalarmcal-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fb5966e650ff5a137e8e6d578692fc7a
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.12.0 b/metadata/md5-cache/kde-apps/kalgebra-17.12.0
deleted file mode 100644
index bfc78a67e096..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=MathML-based graph calculator by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kalgebra-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77ecf669ef52a9275777eba16fbb1cf6
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.12.1 b/metadata/md5-cache/kde-apps/kalgebra-17.12.1
new file mode 100644
index 000000000000..5de17a3972d8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=MathML-based graph calculator by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalgebra-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.0 b/metadata/md5-cache/kde-apps/kalzium-17.12.0
deleted file mode 100644
index 6cefa6762511..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kalzium-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a767d2181080eef3664ba3063539aa9d
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.1 b/metadata/md5-cache/kde-apps/kalzium-17.12.1
new file mode 100644
index 000000000000..aea3b3b45205
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Periodic table of the elements
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalzium-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=481bb05e9f63905a24fdfce2bc275d90
diff --git a/metadata/md5-cache/kde-apps/kamera-17.12.0 b/metadata/md5-cache/kde-apps/kamera-17.12.0
deleted file mode 100644
index 9cb1be714c16..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kamera-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09d5890772fb4fc7ea581d06314ef0a8
diff --git a/metadata/md5-cache/kde-apps/kamera-17.12.1 b/metadata/md5-cache/kde-apps/kamera-17.12.1
new file mode 100644
index 000000000000..54ed4f84cfe5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kamera-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.12.0 b/metadata/md5-cache/kde-apps/kanagram-17.12.0
deleted file mode 100644
index 1ed6f9367051..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on anagrams of words
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/kdeedu-data-17.12.0:5 >=dev-qt/qtmultimedia-5.9.1:5[qml] >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kanagram-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87ef376754addfdbc09a90cb435c1462
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.12.1 b/metadata/md5-cache/kde-apps/kanagram-17.12.1
new file mode 100644
index 000000000000..98ba4a73d187
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on anagrams of words
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/kdeedu-data-17.12.1:5 >=dev-qt/qtmultimedia-5.9.1:5[qml] >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kanagram-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kapman-17.12.0 b/metadata/md5-cache/kde-apps/kapman-17.12.0
deleted file mode 100644
index 00f0b52cd4cb..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kapman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kapman-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=511d2fa32307900eceac13fb5ccfe045
diff --git a/metadata/md5-cache/kde-apps/kapman-17.12.1 b/metadata/md5-cache/kde-apps/kapman-17.12.1
new file mode 100644
index 000000000000..e618d9467dba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kapman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kapman-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.12.0 b/metadata/md5-cache/kde-apps/kapptemplate-17.12.0
deleted file mode 100644
index 708aa8e5a7b7..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kapptemplate-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2a32430429514d7c12be1892c6cdafa
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.12.1 b/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
new file mode 100644
index 000000000000..cb60ba5d96fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kapptemplate-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kate-17.12.0 b/metadata/md5-cache/kde-apps/kate-17.12.0
deleted file mode 100644
index 72696624791c..000000000000
--- a/metadata/md5-cache/kde-apps/kate-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kate is an advanced text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
-IUSE=+addons test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kate-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=054ad8d56555f93ea77ba597e4a0f02c
diff --git a/metadata/md5-cache/kde-apps/kate-17.12.1 b/metadata/md5-cache/kde-apps/kate-17.12.1
new file mode 100644
index 000000000000..b56a7a37ee28
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kate is an advanced text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
+IUSE=+addons test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kate-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e6fb9fb9cf9bd21ba4fc733de05f37e4
diff --git a/metadata/md5-cache/kde-apps/katomic-17.12.0 b/metadata/md5-cache/kde-apps/katomic-17.12.0
deleted file mode 100644
index ee5aa031eea6..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/katomic-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd9394b7e4365dfc7b3f50cd9b353ebd
diff --git a/metadata/md5-cache/kde-apps/katomic-17.12.1 b/metadata/md5-cache/kde-apps/katomic-17.12.1
new file mode 100644
index 000000000000..165a68edf6dd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/katomic-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.12.0 b/metadata/md5-cache/kde-apps/kblackbox-17.12.0
deleted file mode 100644
index 460b49b01db3..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Blackbox Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kblackbox-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc8679a89009133d354a5e172cb09f72
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.12.1 b/metadata/md5-cache/kde-apps/kblackbox-17.12.1
new file mode 100644
index 000000000000..ad5f77003a04
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Blackbox Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblackbox-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.12.0 b/metadata/md5-cache/kde-apps/kblocks-17.12.0
deleted file mode 100644
index 3aedeb16635e..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A single-player Tetris-like KDE game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kblocks/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kblocks-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96f4647d6e2e3ca37660fb414a0ca1ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.12.1 b/metadata/md5-cache/kde-apps/kblocks-17.12.1
new file mode 100644
index 000000000000..512a8a4ac80f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A single-player Tetris-like KDE game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kblocks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblocks-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblog-17.12.0 b/metadata/md5-cache/kde-apps/kblog-17.12.0
deleted file mode 100644
index 9686a58b8434..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/syndication-17.12.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/syndication-17.12.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kblog-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cabd770a14c238373204fb7723e1fce5
diff --git a/metadata/md5-cache/kde-apps/kblog-17.12.1 b/metadata/md5-cache/kde-apps/kblog-17.12.1
new file mode 100644
index 000000000000..aeceb30b8565
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/syndication-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing client-side support for web application remote blogging APIs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/syndication-17.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblog-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.12.0 b/metadata/md5-cache/kde-apps/kbounce-17.12.0
deleted file mode 100644
index 0cac505615a6..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kbounce-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b7c2b257d09d4f5e573ce4accb93dc2
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.12.1 b/metadata/md5-cache/kde-apps/kbounce-17.12.1
new file mode 100644
index 000000000000..eec8422c95c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbounce-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.12.0 b/metadata/md5-cache/kde-apps/kbreakout-17.12.0
deleted file mode 100644
index 113c7236cfac..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breakout-like game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kbreakout-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bce51ff72f645818703b2d3de80b18b7
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.12.1 b/metadata/md5-cache/kde-apps/kbreakout-17.12.1
new file mode 100644
index 000000000000..5962ad51889d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breakout-like game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbreakout-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.12.0 b/metadata/md5-cache/kde-apps/kbruch-17.12.0
deleted file mode 100644
index 73a9f692fcd9..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kbruch-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8aea660b0eac1a181f7b234d7f05a70e
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.12.1 b/metadata/md5-cache/kde-apps/kbruch-17.12.1
new file mode 100644
index 000000000000..51f607adcc7c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbruch-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.12.0 b/metadata/md5-cache/kde-apps/kcachegrind-17.12.0
deleted file mode 100644
index b15178113825..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcachegrind-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0df1cb93e6f6d2b27a1dbec7becfb5e1
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.12.1 b/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
new file mode 100644
index 000000000000..fa0db6f57055
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcachegrind-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.12.0 b/metadata/md5-cache/kde-apps/kcalc-17.12.0
deleted file mode 100644
index a51aa1967cd7..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE calculator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcalc-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c3605f0ebcb68e9a9581bf3edd97e79
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.12.1 b/metadata/md5-cache/kde-apps/kcalc-17.12.1
new file mode 100644
index 000000000000..847ac6d56b1d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE calculator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalc-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.12.0 b/metadata/md5-cache/kde-apps/kcalcore-17.12.0
deleted file mode 100644
index 99f2940ac599..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcalcore-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c90afc00852794e319faf68bf722542
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.12.1 b/metadata/md5-cache/kde-apps/kcalcore-17.12.1
new file mode 100644
index 000000000000..2f12739bb53c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalcore-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.12.0 b/metadata/md5-cache/kde-apps/kcalutils-17.12.0
deleted file mode 100644
index e0a4c49c91f7..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcalutils-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18a905f74129b204c1ec20473f688259
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.12.1 b/metadata/md5-cache/kde-apps/kcalutils-17.12.1
new file mode 100644
index 000000000000..3f90af77cdd4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalutils-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24f7271bbaf43ae761f5a385f33ef95f
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.12.0 b/metadata/md5-cache/kde-apps/kcharselect-17.12.0
deleted file mode 100644
index 5d01f8f4523c..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE character selection utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcharselect-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af17a179f871a802a41fc912a67b86b0
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.12.1 b/metadata/md5-cache/kde-apps/kcharselect-17.12.1
new file mode 100644
index 000000000000..bb4286631dc6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE character selection utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcharselect-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.0 b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.0
deleted file mode 100644
index f3c2112cd886..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE color selector/editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcolorchooser-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4c1358970d0e04611e0ef83becc2f63
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1 b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
new file mode 100644
index 000000000000..287e17931341
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE color selector/editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcolorchooser-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.12.0 b/metadata/md5-cache/kde-apps/kcontacts-17.12.0
deleted file mode 100644
index fbeb6a738461..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcontacts-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6eba6c39634819f9cbfb676e6f3d714
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.12.1 b/metadata/md5-cache/kde-apps/kcontacts-17.12.1
new file mode 100644
index 000000000000..3a66075b33c5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcontacts-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=148fb5f93144399536f4d1ea45af4470
diff --git a/metadata/md5-cache/kde-apps/kcron-17.12.0 b/metadata/md5-cache/kde-apps/kcron-17.12.0
deleted file mode 100644
index 0b50defab17c..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Task Scheduler
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kcron-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b90d1926d3b289ce550d733b62425da
diff --git a/metadata/md5-cache/kde-apps/kcron-17.12.1 b/metadata/md5-cache/kde-apps/kcron-17.12.1
new file mode 100644
index 000000000000..b1e25a4c93e2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Task Scheduler
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcron-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kdav-17.12.0 b/metadata/md5-cache/kde-apps/kdav-17.12.0
deleted file mode 100644
index dbe455d7c0ce..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdav-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc7ce894bd9c40ada66865bb59f6b526
diff --git a/metadata/md5-cache/kde-apps/kdav-17.12.1 b/metadata/md5-cache/kde-apps/kdav-17.12.1
new file mode 100644
index 000000000000..86084e8d1761
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdav-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.0 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.0
deleted file mode 100644
index 126d77c014b7..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.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-17.12.0 >=kde-apps/kdeadmin-meta-17.12.0 >=kde-apps/kdecore-meta-17.12.0 >=kde-apps/kdeedu-meta-17.12.0 >=kde-apps/kdegames-meta-17.12.0 >=kde-apps/kdegraphics-meta-17.12.0 >=kde-apps/kdemultimedia-meta-17.12.0 >=kde-apps/kdenetwork-meta-17.12.0 >=kde-apps/kdeutils-meta-17.12.0 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.12.0 ) pim? ( >=kde-apps/kdepim-meta-17.12.0 ) sdk? ( >=kde-apps/kdesdk-meta-17.12.0 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bbafaa56f85319791f869a14d47f1853
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1
new file mode 100644
index 000000000000..1c2251894b42
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.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-17.12.1 >=kde-apps/kdeadmin-meta-17.12.1 >=kde-apps/kdecore-meta-17.12.1 >=kde-apps/kdeedu-meta-17.12.1 >=kde-apps/kdegames-meta-17.12.1 >=kde-apps/kdegraphics-meta-17.12.1 >=kde-apps/kdemultimedia-meta-17.12.1 >=kde-apps/kdenetwork-meta-17.12.1 >=kde-apps/kdeutils-meta-17.12.1 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.12.1 ) pim? ( >=kde-apps/kdepim-meta-17.12.1 ) sdk? ( >=kde-apps/kdesdk-meta-17.12.1 ) !kde-apps/kde-apps-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.0 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.0
deleted file mode 100644
index 5dd7477683ef..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kde-dev-scripts-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46b0c7430a0d769e71b22bf047a4117d
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
new file mode 100644
index 000000000000..2264330d0e9b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kde-dev-scripts-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.0 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.0
deleted file mode 100644
index fbde6e0f002d..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Utilities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kde-dev-utils-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c76350aa0783e2e8ee31a9916eae6ee2
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
new file mode 100644
index 000000000000..f29e59042a6e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Utilities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kde-dev-utils-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.12.0 b/metadata/md5-cache/kde-apps/kde-meta-17.12.0
deleted file mode 100644
index 53a16287c43c..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-17.12.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-17.12.0 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6df415eaf1c1240a04118e31bf40ca0e
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.12.1 b/metadata/md5-cache/kde-apps/kde-meta-17.12.1
new file mode 100644
index 000000000000..3a4f1bb6cbee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-17.12.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-17.12.1 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.0
deleted file mode 100644
index b2e0117a94e3..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.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-17.12.0 >=kde-apps/kmousetool-17.12.0 >=kde-apps/kmouth-17.12.0 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ca90746c4eee73d88bb032a68179c5b3
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1
new file mode 100644
index 000000000000..96c6a2df9904
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.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-17.12.1 >=kde-apps/kmousetool-17.12.1 >=kde-apps/kmouth-17.12.1 !kde-apps/kdeaccessibility-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.0
deleted file mode 100644
index f2430c60fa0c..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.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-17.12.0 cron? ( >=kde-apps/kcron-17.12.0 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c719c0e2ead66f187eb200ef12813d4a
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1
new file mode 100644
index 000000000000..fa9fdabc2711
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.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-17.12.1 cron? ( >=kde-apps/kcron-17.12.1 ) !kde-apps/kdeadmin-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.0
deleted file mode 100644
index 4b2efb00fcb1..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.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-17.12.0 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=459ca2c24abac3ae618cc76a775ba688
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1
new file mode 100644
index 000000000000..e70ce86792ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.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-17.12.1 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.0 b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.0
deleted file mode 100644
index c0ec68fce1dd..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdebugsettings-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee273a1ab793d58db1b0a0aa616ad8b2
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1 b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
new file mode 100644
index 000000000000..8a490826b0c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdebugsettings-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.0
deleted file mode 100644
index b5da452f54bd..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.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-17.12.0 >=kde-apps/kdialog-17.12.0 >=kde-apps/keditbookmarks-17.12.0 >=kde-apps/kfind-17.12.0 || ( www-client/qupzilla >=kde-apps/konqueror-17.12.0 ) >=kde-apps/konsole-17.12.0 >=kde-apps/kwrite-17.12.0 handbook? ( >=kde-apps/khelpcenter-17.12.0 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3d35511d8c23eebc094e4b1b63295c6c
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1
new file mode 100644
index 000000000000..f533894402a9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.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-17.12.1 >=kde-apps/kdialog-17.12.1 >=kde-apps/keditbookmarks-17.12.1 >=kde-apps/kfind-17.12.1 || ( www-client/qupzilla >=kde-apps/konqueror-17.12.1 ) >=kde-apps/konsole-17.12.1 >=kde-apps/kwrite-17.12.1 handbook? ( >=kde-apps/khelpcenter-17.12.1 ) !kde-apps/kdecore-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b55ecb9037bb7597648e18f4d84071c2
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.0 b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.0
deleted file mode 100644
index 4fd1604c1808..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdeedu-data-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8df1f18a4595f02c672186b0f285404
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1 b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
new file mode 100644
index 000000000000..92168cc6b013
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdeedu-data-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.0
deleted file mode 100644
index a26a507ad339..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.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-17.12.0 >=kde-apps/artikulate-17.12.0 >=kde-apps/blinken-17.12.0 >=kde-apps/cantor-17.12.0 >=kde-apps/kalgebra-17.12.0 >=kde-apps/kalzium-17.12.0 >=kde-apps/kanagram-17.12.0 >=kde-apps/kbruch-17.12.0 >=kde-apps/kdeedu-data-17.12.0 >=kde-apps/kgeography-17.12.0 >=kde-apps/khangman-17.12.0 >=kde-apps/kig-17.12.0 >=kde-apps/kiten-17.12.0 >=kde-apps/klettres-17.12.0 >=kde-apps/kmplot-17.12.0 >=kde-apps/kqtquickcharts-17.12.0 >=kde-apps/ktouch-17.12.0 >=kde-apps/kturtle-17.12.0 >=kde-apps/kwordquiz-17.12.0 >=kde-apps/libkeduvocdocument-17.12.0 >=kde-apps/marble-17.12.0 >=kde-apps/minuet-17.12.0 >=kde-apps/parley-17.12.0 >=kde-apps/rocs-17.12.0 >=kde-apps/step-17.12.0 !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=60c6d9c597fc426394ad28813bd53d39
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
new file mode 100644
index 000000000000..44ba1f5d03d8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=6
+HOMEPAGE=https://edu.kde.org
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-17.12.1 >=kde-apps/artikulate-17.12.1 >=kde-apps/blinken-17.12.1 >=kde-apps/cantor-17.12.1 >=kde-apps/kalgebra-17.12.1 >=kde-apps/kalzium-17.12.1 >=kde-apps/kanagram-17.12.1 >=kde-apps/kbruch-17.12.1 >=kde-apps/kdeedu-data-17.12.1 >=kde-apps/kgeography-17.12.1 >=kde-apps/khangman-17.12.1 >=kde-apps/kig-17.12.1 >=kde-apps/kiten-17.12.1 >=kde-apps/klettres-17.12.1 >=kde-apps/kmplot-17.12.1 >=kde-apps/kqtquickcharts-17.12.1 >=kde-apps/ktouch-17.12.1 >=kde-apps/kturtle-17.12.1 >=kde-apps/kwordquiz-17.12.1 >=kde-apps/libkeduvocdocument-17.12.1 >=kde-apps/marble-17.12.1 >=kde-apps/minuet-17.12.1 >=kde-apps/parley-17.12.1 >=kde-apps/rocs-17.12.1 >=kde-apps/step-17.12.1 !kde-apps/kdeedu-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fad2326e88a11480daf662622befb4b9
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.0
deleted file mode 100644
index a3746d9f1fc7..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.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-17.12.0 >=kde-apps/bovo-17.12.0 >=kde-apps/granatier-17.12.0 >=kde-apps/kapman-17.12.0 >=kde-apps/katomic-17.12.0 >=kde-apps/kblackbox-17.12.0 >=kde-apps/kblocks-17.12.0 >=kde-apps/kbounce-17.12.0 >=kde-apps/kbreakout-17.12.0 >=kde-apps/kdiamond-17.12.0 >=kde-apps/kfourinline-17.12.0 >=kde-apps/kgoldrunner-17.12.0 >=kde-apps/kigo-17.12.0 >=kde-apps/killbots-17.12.0 >=kde-apps/kiriki-17.12.0 >=kde-apps/kjumpingcube-17.12.0 >=kde-apps/klickety-17.12.0 >=kde-apps/klines-17.12.0 >=kde-apps/kmahjongg-17.12.0 >=kde-apps/kmines-17.12.0 >=kde-apps/knavalbattle-17.12.0 >=kde-apps/knetwalk-17.12.0 >=kde-apps/kolf-17.12.0 >=kde-apps/kollision-17.12.0 >=kde-apps/konquest-17.12.0 >=kde-apps/kpat-17.12.0 >=kde-apps/kreversi-17.12.0 >=kde-apps/kshisen-17.12.0 >=kde-apps/ksirk-17.12.0 >=kde-apps/ksnakeduel-17.12.0 >=kde-apps/kspaceduel-17.12.0 >=kde-apps/ksquares-17.12.0 >=kde-apps/ktuberling-17.12.0 >=kde-apps/libkdegames-17.12.0 >=kde-apps/libkmahjongg-17.12.0 >=kde-apps/lskat-17.12.0 >=kde-apps/palapeli-17.12.0 >=kde-apps/picmi-17.12.0 opengl? ( >=kde-apps/ksudoku-17.12.0 >=kde-apps/kubrick-17.12.0 ) python? ( >=kde-apps/kajongg-17.12.0 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f61422d5e34e5626538f5deb436f4b99
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1
new file mode 100644
index 000000000000..c5b64a7a6b26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.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-17.12.1 >=kde-apps/bovo-17.12.1 >=kde-apps/granatier-17.12.1 >=kde-apps/kapman-17.12.1 >=kde-apps/katomic-17.12.1 >=kde-apps/kblackbox-17.12.1 >=kde-apps/kblocks-17.12.1 >=kde-apps/kbounce-17.12.1 >=kde-apps/kbreakout-17.12.1 >=kde-apps/kdiamond-17.12.1 >=kde-apps/kfourinline-17.12.1 >=kde-apps/kgoldrunner-17.12.1 >=kde-apps/kigo-17.12.1 >=kde-apps/killbots-17.12.1 >=kde-apps/kiriki-17.12.1 >=kde-apps/kjumpingcube-17.12.1 >=kde-apps/klickety-17.12.1 >=kde-apps/klines-17.12.1 >=kde-apps/kmahjongg-17.12.1 >=kde-apps/kmines-17.12.1 >=kde-apps/knavalbattle-17.12.1 >=kde-apps/knetwalk-17.12.1 >=kde-apps/kolf-17.12.1 >=kde-apps/kollision-17.12.1 >=kde-apps/konquest-17.12.1 >=kde-apps/kpat-17.12.1 >=kde-apps/kreversi-17.12.1 >=kde-apps/kshisen-17.12.1 >=kde-apps/ksirk-17.12.1 >=kde-apps/ksnakeduel-17.12.1 >=kde-apps/kspaceduel-17.12.1 >=kde-apps/ksquares-17.12.1 >=kde-apps/ktuberling-17.12.1 >=kde-apps/libkdegames-17.12.1 >=kde-apps/libkmahjongg-17.12.1 >=kde-apps/lskat-17.12.1 >=kde-apps/palapeli-17.12.1 >=kde-apps/picmi-17.12.1 opengl? ( >=kde-apps/ksudoku-17.12.1 >=kde-apps/kubrick-17.12.1 ) python? ( >=kde-apps/kajongg-17.12.1 ) !kde-apps/kdegames-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.0
deleted file mode 100644
index 3f57f39019cf..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.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-17.12.0 >=kde-apps/kamera-17.12.0 >=kde-apps/kcolorchooser-17.12.0 >=kde-apps/kdegraphics-mobipocket-17.12.0 >=kde-apps/kolourpaint-17.12.0 >=kde-apps/kruler-17.12.0 >=kde-apps/libkdcraw-17.12.0 >=kde-apps/libkexiv2-17.12.0 >=kde-apps/libkipi-17.12.0 >=kde-apps/okular-17.12.0 >=kde-apps/spectacle-17.12.0 >=kde-apps/svgpart-17.12.0 >=kde-apps/thumbnailers-17.12.0 scanner? ( >=kde-apps/libksane-17.12.0 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=55dc1ef4433a6a94ad93fd8fcb79489f
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1
new file mode 100644
index 000000000000..2e5cb9692eeb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.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-17.12.1 >=kde-apps/kamera-17.12.1 >=kde-apps/kcolorchooser-17.12.1 >=kde-apps/kdegraphics-mobipocket-17.12.1 >=kde-apps/kolourpaint-17.12.1 >=kde-apps/kruler-17.12.1 >=kde-apps/libkdcraw-17.12.1 >=kde-apps/libkexiv2-17.12.1 >=kde-apps/libkipi-17.12.1 >=kde-apps/okular-17.12.1 >=kde-apps/spectacle-17.12.1 >=kde-apps/svgpart-17.12.1 >=kde-apps/thumbnailers-17.12.1 scanner? ( >=kde-apps/libksane-17.12.1 ) !kde-apps/kdegraphics-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.0 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.0
deleted file mode 100644
index c8e59d4a22a0..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdegraphics-mobipocket-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=150cb8e8e6beaccba814a86068584d6f
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
new file mode 100644
index 000000000000..07384965be25
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdegraphics-mobipocket-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.0
deleted file mode 100644
index cb083d914ad3..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.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-17.12.0 >=kde-apps/juk-17.12.0 >=kde-apps/kdenlive-17.12.0 >=kde-apps/kmix-17.12.0 >=kde-apps/kwave-17.12.0 >=kde-apps/libkcddb-17.12.0 cdrom? ( >=kde-apps/audiocd-kio-17.12.0 >=kde-apps/k3b-17.12.0 >=kde-apps/libkcompactdisc-17.12.0 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.12.0 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8576c6613469bb8d840c1041d42080cc
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1
new file mode 100644
index 000000000000..d230f437c62a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.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
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-17.12.1 >=kde-apps/juk-17.12.1 >=kde-apps/kdenlive-17.12.1 >=kde-apps/kmix-17.12.1 >=kde-apps/kwave-17.12.1 >=kde-apps/libkcddb-17.12.1 cdrom? ( >=kde-apps/audiocd-kio-17.12.1 >=kde-apps/k3b-17.12.1 >=kde-apps/libkcompactdisc-17.12.1 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.12.1 ) !kde-apps/kdemultimedia-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f6b67c399a121114b39562478c45c64d
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.0 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.0
deleted file mode 100644
index 705e351e6eaf..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kcontrol filesharing config module for SMB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdenetwork-filesharing-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36e996fe8d326947bbc73e3d1dddb64e
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
new file mode 100644
index 000000000000..1d5ac18897de
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kcontrol filesharing config module for SMB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdenetwork-filesharing-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.0
deleted file mode 100644
index 04f421ea1ca2..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.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-17.12.0 >=kde-apps/kget-17.12.0 >=kde-apps/krdc-17.12.0 >=kde-apps/krfb-17.12.0 >=kde-apps/plasma-telepathy-meta-17.12.0 >=kde-apps/zeroconf-ioslave-17.12.0 !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=39a2a7f531bb23fa72538de7f8629149
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
new file mode 100644
index 000000000000..0e26f4d8fbc2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-17.12.1 >=kde-apps/kget-17.12.1 >=kde-apps/krdc-17.12.1 >=kde-apps/krfb-17.12.1 >=kde-apps/plasma-telepathy-meta-17.12.1 >=kde-apps/zeroconf-ioslave-17.12.1 !kde-apps/kdenetwork-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0864a5560d9ca2bca5050d667bebd1ca
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.12.0 b/metadata/md5-cache/kde-apps/kdenlive-17.12.0
deleted file mode 100644
index 7a6b62fead59..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=6
-HOMEPAGE=https://www.kdenlive.org/
-IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdenlive-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=260e956f638e78516f22ad1088b357e7
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.12.1 b/metadata/md5-cache/kde-apps/kdenlive-17.12.1
new file mode 100644
index 000000000000..82d2f5d4d047
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=6
+HOMEPAGE=https://www.kdenlive.org/
+IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdenlive-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=794abc15cefaba740e923c5794ef0d8c
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.0 b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.0
deleted file mode 100644
index 9cf89f42c406..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/eventviews-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/incidenceeditor-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kimap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/libksieve-17.12.0:5 >=kde-apps/libktnef-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.0:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=importwizard test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/eventviews-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/incidenceeditor-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kimap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/libksieve-17.12.0:5 >=kde-apps/libktnef-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.0:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdepim-addons-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=956cd4950235ea67339d962df1cb83b0
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
new file mode 100644
index 000000000000..bda84904272c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.1:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=importwizard test debug examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.1:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-addons-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17c2fc135e8e7195bcfae5a99233f5c6
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.0 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.0
deleted file mode 100644
index 76ea167ac8a4..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdepim-apps-libs-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=003367934cb8bca31d367691838f499c
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
new file mode 100644
index 000000000000..ac6eb1194090
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-apps-libs-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.0
deleted file mode 100644
index 08385150650a..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.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-17.12.0 >=kde-apps/akonadiconsole-17.12.0 >=kde-apps/akonadi-calendar-17.12.0 >=kde-apps/akonadi-contacts-17.12.0 >=kde-apps/akonadi-import-wizard-17.12.0 >=kde-apps/akonadi-mime-17.12.0 >=kde-apps/akonadi-notes-17.12.0 >=kde-apps/akonadi-search-17.12.0 >=kde-apps/akregator-17.12.0 >=kde-apps/calendarjanitor-17.12.0 >=kde-apps/calendarsupport-17.12.0 >=kde-apps/eventviews-17.12.0 >=kde-apps/grantlee-editor-17.12.0 >=kde-apps/grantleetheme-17.12.0 >=kde-apps/incidenceeditor-17.12.0 >=kde-apps/kaddressbook-17.12.0 >=kde-apps/kalarm-17.12.0 >=kde-apps/kalarmcal-17.12.0 >=kde-apps/kcalcore-17.12.0 >=kde-apps/kcalutils-17.12.0 >=kde-apps/kcontacts-17.12.0 >=kde-apps/kdepim-addons-17.12.0 >=kde-apps/kdepim-apps-libs-17.12.0 >=kde-apps/kdepim-runtime-17.12.0 >=kde-apps/kholidays-17.12.0 >=kde-apps/kidentitymanagement-17.12.0 >=kde-apps/kimap-17.12.0 >=kde-apps/kldap-17.12.0 >=kde-apps/kleopatra-17.12.0 >=kde-apps/kmail-17.12.0 >=kde-apps/kmail-account-wizard-17.12.0 >=kde-apps/kmailtransport-17.12.0 >=kde-apps/kmbox-17.12.0 >=kde-apps/kmime-17.12.0 >=kde-apps/knotes-17.12.0 >=kde-apps/konsolekalendar-17.12.0 >=kde-apps/kontact-17.12.0 >=kde-apps/kontactinterface-17.12.0 >=kde-apps/korganizer-17.12.0 >=kde-apps/kpimtextedit-17.12.0 >=kde-apps/ksmtp-17.12.0 >=kde-apps/libgravatar-17.12.0 >=kde-apps/libkdepim-17.12.0 >=kde-apps/libkgapi-17.12.0 >=kde-apps/libkleo-17.12.0 >=kde-apps/libksieve-17.12.0 >=kde-apps/libktnef-17.12.0 >=kde-apps/mailcommon-17.12.0 >=kde-apps/mailimporter-17.12.0 >=kde-apps/mbox-importer-17.12.0 >=kde-apps/messagelib-17.12.0 >=kde-apps/pim-data-exporter-17.12.0 >=kde-apps/pim-sieve-editor-17.12.0 >=kde-apps/pimcommon-17.12.0 >=kde-apps/syndication-17.12.0 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=198d5f2f1ad8a3a374b8c755bb9f2fe3
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1
new file mode 100644
index 000000000000..062bb6822927
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.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-17.12.1 >=kde-apps/akonadiconsole-17.12.1 >=kde-apps/akonadi-calendar-17.12.1 >=kde-apps/akonadi-contacts-17.12.1 >=kde-apps/akonadi-import-wizard-17.12.1 >=kde-apps/akonadi-mime-17.12.1 >=kde-apps/akonadi-notes-17.12.1 >=kde-apps/akonadi-search-17.12.1 >=kde-apps/akregator-17.12.1 >=kde-apps/calendarjanitor-17.12.1 >=kde-apps/calendarsupport-17.12.1 >=kde-apps/eventviews-17.12.1 >=kde-apps/grantlee-editor-17.12.1 >=kde-apps/grantleetheme-17.12.1 >=kde-apps/incidenceeditor-17.12.1 >=kde-apps/kaddressbook-17.12.1 >=kde-apps/kalarm-17.12.1 >=kde-apps/kalarmcal-17.12.1 >=kde-apps/kcalcore-17.12.1 >=kde-apps/kcalutils-17.12.1 >=kde-apps/kcontacts-17.12.1 >=kde-apps/kdepim-addons-17.12.1 >=kde-apps/kdepim-apps-libs-17.12.1 >=kde-apps/kdepim-runtime-17.12.1 >=kde-apps/kholidays-17.12.1 >=kde-apps/kidentitymanagement-17.12.1 >=kde-apps/kimap-17.12.1 >=kde-apps/kldap-17.12.1 >=kde-apps/kleopatra-17.12.1 >=kde-apps/kmail-17.12.1 >=kde-apps/kmail-account-wizard-17.12.1 >=kde-apps/kmailtransport-17.12.1 >=kde-apps/kmbox-17.12.1 >=kde-apps/kmime-17.12.1 >=kde-apps/knotes-17.12.1 >=kde-apps/konsolekalendar-17.12.1 >=kde-apps/kontact-17.12.1 >=kde-apps/kontactinterface-17.12.1 >=kde-apps/korganizer-17.12.1 >=kde-apps/kpimtextedit-17.12.1 >=kde-apps/ksmtp-17.12.1 >=kde-apps/libgravatar-17.12.1 >=kde-apps/libkdepim-17.12.1 >=kde-apps/libkgapi-17.12.1 >=kde-apps/libkleo-17.12.1 >=kde-apps/libksieve-17.12.1 >=kde-apps/libktnef-17.12.1 >=kde-apps/mailcommon-17.12.1 >=kde-apps/mailimporter-17.12.1 >=kde-apps/mbox-importer-17.12.1 >=kde-apps/messagelib-17.12.1 >=kde-apps/pim-data-exporter-17.12.1 >=kde-apps/pim-sieve-editor-17.12.1 >=kde-apps/pimcommon-17.12.1 >=kde-apps/syndication-17.12.1 !kde-apps/kdepim-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fdfbef72ec0b621d29033dfd1d832b61
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.0 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.0
deleted file mode 100644
index 8863070251f5..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/kalarmcal-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdav-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kimap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmbox-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkgapi-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-17.12.0:5[test] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/kalarmcal-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdav-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kimap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmbox-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkgapi-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/oxygen-icons-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdepim-runtime-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df33eda8929e11f8fe8dc67864e6237c
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
new file mode 100644
index 000000000000..34734c8382ff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdav-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkgapi-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-17.12.1:5[test] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdav-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkgapi-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-runtime-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bddc5ac99087b20657606d4e79001c9b
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.0 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.0
deleted file mode 100644
index 70e33e312e87..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdesdk-kioslaves-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e01e030d33d63b51b9a7bd733692e35
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
new file mode 100644
index 000000000000..4e86a9442e10
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdesdk-kioslaves-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.0
deleted file mode 100644
index 4ecc87e0aa0c..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.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-17.12.0 >=kde-apps/kapptemplate-17.12.0 >=kde-apps/kcachegrind-17.12.0 >=kde-apps/kde-dev-scripts-17.12.0 >=kde-apps/kde-dev-utils-17.12.0 >=kde-apps/kdesdk-kioslaves-17.12.0 >=kde-apps/kdesdk-thumbnailers-17.12.0 >=kde-apps/kompare-17.12.0 >=kde-apps/kross-interpreters-17.12.0 >=kde-apps/libkomparediff2-17.12.0 >=kde-apps/lokalize-17.12.0 >=kde-apps/okteta-17.12.0 >=kde-apps/poxml-17.12.0 >=kde-apps/umbrello-17.12.0 cvs? ( >=kde-apps/cervisia-17.12.0 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=114605720174a6fa936e89c618473325
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1
new file mode 100644
index 000000000000..85004f92d5ec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.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-17.12.1 >=kde-apps/kapptemplate-17.12.1 >=kde-apps/kcachegrind-17.12.1 >=kde-apps/kde-dev-scripts-17.12.1 >=kde-apps/kde-dev-utils-17.12.1 >=kde-apps/kdesdk-kioslaves-17.12.1 >=kde-apps/kdesdk-thumbnailers-17.12.1 >=kde-apps/kompare-17.12.1 >=kde-apps/kross-interpreters-17.12.1 >=kde-apps/libkomparediff2-17.12.1 >=kde-apps/lokalize-17.12.1 >=kde-apps/okteta-17.12.1 >=kde-apps/poxml-17.12.1 >=kde-apps/umbrello-17.12.1 cvs? ( >=kde-apps/cervisia-17.12.1 ) !kde-apps/kdesdk-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2758888f24f743555392ef164e1fcf94
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.0 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.0
deleted file mode 100644
index 2c9ad7e61da4..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdesdk-thumbnailers-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37e7992cc1faa181cedb1ceb1c36cee9
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
new file mode 100644
index 000000000000..f5480d59533a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdesdk-thumbnailers-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.0 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.0
deleted file mode 100644
index 025495b0b0a4..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.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-17.12.0 >=kde-apps/filelight-17.12.0 >=kde-apps/kcalc-17.12.0 >=kde-apps/kcharselect-17.12.0 >=kde-apps/kdebugsettings-17.12.0 >=kde-apps/kdf-17.12.0 >=kde-apps/kgpg-17.12.0 >=kde-apps/kimagemapeditor-17.12.0 >=kde-apps/kteatime-17.12.0 >=kde-apps/ktimer-17.12.0 >=kde-apps/kwalletmanager-17.12.0 >=kde-apps/sweeper-17.12.0 cups? ( >=kde-apps/print-manager-17.12.0 ) floppy? ( >=kde-apps/kfloppy-17.12.0 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b5b17fd911aa4a5db47a3e1c5666a384
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1
new file mode 100644
index 000000000000..6ea0b8e6f169
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.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-17.12.1 >=kde-apps/filelight-17.12.1 >=kde-apps/kcalc-17.12.1 >=kde-apps/kcharselect-17.12.1 >=kde-apps/kdebugsettings-17.12.1 >=kde-apps/kdf-17.12.1 >=kde-apps/kgpg-17.12.1 >=kde-apps/kimagemapeditor-17.12.1 >=kde-apps/kteatime-17.12.1 >=kde-apps/ktimer-17.12.1 >=kde-apps/kwalletmanager-17.12.1 >=kde-apps/sweeper-17.12.1 cups? ( >=kde-apps/print-manager-17.12.1 ) floppy? ( >=kde-apps/kfloppy-17.12.1 ) !kde-apps/kdeutils-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ab21cf3351c714255ac295dddbedcba2
diff --git a/metadata/md5-cache/kde-apps/kdf-17.12.0 b/metadata/md5-cache/kde-apps/kdf-17.12.0
deleted file mode 100644
index f41d7e27463c..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE free disk space utility
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/kdf
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdf-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46385897e6f84477df1a2f9f908f87b8
diff --git a/metadata/md5-cache/kde-apps/kdf-17.12.1 b/metadata/md5-cache/kde-apps/kdf-17.12.1
new file mode 100644
index 000000000000..dc2540bdbe9d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE free disk space utility
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/kdf
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdf-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.12.0 b/metadata/md5-cache/kde-apps/kdialog-17.12.0
deleted file mode 100644
index d45c2e3157a5..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdialog-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0224afa13f5df1c3f337782dea0f45fc
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.12.1 b/metadata/md5-cache/kde-apps/kdialog-17.12.1
new file mode 100644
index 000000000000..1406c4c5ac49
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdialog-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.12.0 b/metadata/md5-cache/kde-apps/kdiamond-17.12.0
deleted file mode 100644
index 1eece5b6927a..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE three-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdiamond-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5d1fd8f0cd7e9b12634be727f603355
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.12.1 b/metadata/md5-cache/kde-apps/kdiamond-17.12.1
new file mode 100644
index 000000000000..d47480a6f8ed
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE three-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdiamond-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.0 b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.0
deleted file mode 100644
index 423194e8ab9f..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/keditbookmarks-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e27d75f10ec45d14d9ebb28c08e68a7
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1 b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
new file mode 100644
index 000000000000..d04e766c8ab0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/keditbookmarks-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/kfind-17.12.0 b/metadata/md5-cache/kde-apps/kfind-17.12.0
deleted file mode 100644
index 71cdf8ef0f27..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kfind-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d56bffbc361579838e7abc10a3a7b2dc
diff --git a/metadata/md5-cache/kde-apps/kfind-17.12.1 b/metadata/md5-cache/kde-apps/kfind-17.12.1
new file mode 100644
index 000000000000..641e7891d967
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfind-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b50e517d22b1dde4520221d9f2d71405
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.12.0 b/metadata/md5-cache/kde-apps/kfloppy-17.12.0
deleted file mode 100644
index bb96a49e8543..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kfloppy-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6bd5424d699a023094178058e55ab6a2
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.12.1 b/metadata/md5-cache/kde-apps/kfloppy-17.12.1
new file mode 100644
index 000000000000..06e9f6640b91
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfloppy-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.12.0 b/metadata/md5-cache/kde-apps/kfourinline-17.12.0
deleted file mode 100644
index 7633ae9d4004..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE four-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kfourinline-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa2e5e7abaf6427c3a719f745b1066e8
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.12.1 b/metadata/md5-cache/kde-apps/kfourinline-17.12.1
new file mode 100644
index 000000000000..800073520b37
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE four-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfourinline-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.12.0 b/metadata/md5-cache/kde-apps/kgeography-17.12.0
deleted file mode 100644
index d03476688bee..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Geography learning tool
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kgeography-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71b1df7e58789d824cbe47b4ce6ba931
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.12.1 b/metadata/md5-cache/kde-apps/kgeography-17.12.1
new file mode 100644
index 000000000000..b7f106b3dd5e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Geography learning tool
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgeography-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kget-17.12.0 b/metadata/md5-cache/kde-apps/kget-17.12.0
deleted file mode 100644
index f6f9a3243133..000000000000
--- a/metadata/md5-cache/kde-apps/kget-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kget-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e891f194fe275b3da1c7c726b34323ce
diff --git a/metadata/md5-cache/kde-apps/kget-17.12.1 b/metadata/md5-cache/kde-apps/kget-17.12.1
new file mode 100644
index 000000000000..1b6c50b42365
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced download manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kget/
+IUSE=bittorrent gpg mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kget-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65a9736c7fb6338fffa8ca64b48123d3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.0 b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.0
deleted file mode 100644
index 4e7e8ac7bb40..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kgoldrunner-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8389f7db96f24679ce45787c7c3cf8e6
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1 b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
new file mode 100644
index 000000000000..b987e561e2ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgoldrunner-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.12.0 b/metadata/md5-cache/kde-apps/kgpg-17.12.0
deleted file mode 100644
index dca85870120d..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kgpg-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed220bc2853668b18576bdb4a0acd0ec
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.12.1 b/metadata/md5-cache/kde-apps/kgpg-17.12.1
new file mode 100644
index 000000000000..8e220ab10b30
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgpg-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/khangman-17.12.0 b/metadata/md5-cache/kde-apps/khangman-17.12.0
deleted file mode 100644
index 95e93021109a..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical hangman game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.12.0:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/khangman-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d2fa14487c61ad5e21f38eb1b578d00
diff --git a/metadata/md5-cache/kde-apps/khangman-17.12.1 b/metadata/md5-cache/kde-apps/khangman-17.12.1
new file mode 100644
index 000000000000..2b2c1f5dba47
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical hangman game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.12.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/khangman-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.12.0 b/metadata/md5-cache/kde-apps/khelpcenter-17.12.0
deleted file mode 100644
index b6a96e37f685..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The KDE Help Center
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/khelpcenter-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0da08dcdabb7a0fabf7a079d2c44d66c
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.12.1 b/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
new file mode 100644
index 000000000000..ab7a9192d90f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The KDE Help Center
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/khelpcenter-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.12.0 b/metadata/md5-cache/kde-apps/kholidays-17.12.0
deleted file mode 100644
index ce2f9c8cc515..000000000000
--- a/metadata/md5-cache/kde-apps/kholidays-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kholidays-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c2f17cf472b512411da7b097f4e2f2e
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.12.1 b/metadata/md5-cache/kde-apps/kholidays-17.12.1
new file mode 100644
index 000000000000..1857a121ea4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kholidays-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kholidays-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=887a19a07585116dd938068a964c095c
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.0 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.0
deleted file mode 100644
index 2aa38e0cee83..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kidentitymanagement-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38f99875d3da7d5b399db124f1b0a3a9
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
new file mode 100644
index 000000000000..ea3b0f150346
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for managing identitites
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kidentitymanagement-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kig-17.12.0 b/metadata/md5-cache/kde-apps/kig-17.12.0
deleted file mode 100644
index 88f05b2b46bd..000000000000
--- a/metadata/md5-cache/kde-apps/kig-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
-IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kig-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d285661d3ae05d76fdf250b4948033d
diff --git a/metadata/md5-cache/kde-apps/kig-17.12.1 b/metadata/md5-cache/kde-apps/kig-17.12.1
new file mode 100644
index 000000000000..f49a921c80c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
+IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kig-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kigo-17.12.0 b/metadata/md5-cache/kde-apps/kigo-17.12.0
deleted file mode 100644
index 260501db1b8f..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Go game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kigo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kigo-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e186742a5c529bc1ecba514553e3911a
diff --git a/metadata/md5-cache/kde-apps/kigo-17.12.1 b/metadata/md5-cache/kde-apps/kigo-17.12.1
new file mode 100644
index 000000000000..5e37c22589ec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Go game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kigo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kigo-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/killbots-17.12.0 b/metadata/md5-cache/kde-apps/killbots-17.12.0
deleted file mode 100644
index f162f5b4a834..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/killbots/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/killbots-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94032392d3e59ef8c7838215f64e57f7
diff --git a/metadata/md5-cache/kde-apps/killbots-17.12.1 b/metadata/md5-cache/kde-apps/killbots-17.12.1
new file mode 100644
index 000000000000..12188e883c60
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/killbots/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/killbots-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.0 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.0
deleted file mode 100644
index cc9e70a23f45..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Generator of HTML image maps
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kimagemapeditor-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a9d2ec86c4f3d5ad22188e9757a3a9af
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
new file mode 100644
index 000000000000..22a9e6ae3797
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Generator of HTML image maps
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kimagemapeditor-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimap-17.12.0 b/metadata/md5-cache/kde-apps/kimap-17.12.0
deleted file mode 100644
index fb9d5526fec4..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kimap-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b7a2f343ce77b50b2ebbbb419dbbdfe1
diff --git a/metadata/md5-cache/kde-apps/kimap-17.12.1 b/metadata/md5-cache/kde-apps/kimap-17.12.1
new file mode 100644
index 000000000000..301a7a6713ac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kimap-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.12.0 b/metadata/md5-cache/kde-apps/kio-extras-17.12.0
deleted file mode 100644
index 6e41a920315c..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kio-extras-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48a6c48df9f19a5ddc0a7ac5078e87cc
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.12.1 b/metadata/md5-cache/kde-apps/kio-extras-17.12.1
new file mode 100644
index 000000000000..ebe45b4db415
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kio-extras-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=548b6de70c654ac17fd9d17f89322657
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.12.0 b/metadata/md5-cache/kde-apps/kiriki-17.12.0
deleted file mode 100644
index b4f2036f3b5a..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An addictive and fun dice game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kiriki-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a04f31a6b96f960471bfbcdc8e56f82
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.12.1 b/metadata/md5-cache/kde-apps/kiriki-17.12.1
new file mode 100644
index 000000000000..8fb35e5a1164
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An addictive and fun dice game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kiriki-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiten-17.12.0 b/metadata/md5-cache/kde-apps/kiten-17.12.0
deleted file mode 100644
index 80c56255ccf5..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kiten-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d86d7c84d253a42e48dffc89de97727
diff --git a/metadata/md5-cache/kde-apps/kiten-17.12.1 b/metadata/md5-cache/kde-apps/kiten-17.12.1
new file mode 100644
index 000000000000..e091ba6b7480
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kiten-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.0 b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.0
deleted file mode 100644
index 9deb12ee882b..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tactical one or two player game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kjumpingcube-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8de775a32c75d5517e5ceaa0f15951e6
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1 b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
new file mode 100644
index 000000000000..98fceb9cb83f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tactical one or two player game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kjumpingcube-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kldap-17.12.0 b/metadata/md5-cache/kde-apps/kldap-17.12.0
deleted file mode 100644
index 721fbb4edaaf..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kldap-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6cf9bec4c6d54d66af8ab0cfa3e40e93
diff --git a/metadata/md5-cache/kde-apps/kldap-17.12.1 b/metadata/md5-cache/kde-apps/kldap-17.12.1
new file mode 100644
index 000000000000..2aaeb7fac477
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kldap-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.12.0 b/metadata/md5-cache/kde-apps/kleopatra-17.12.0
deleted file mode 100644
index e4177604299c..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kleopatra-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a429e81a628b2ba94d75cb0285512eca
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.12.1 b/metadata/md5-cache/kde-apps/kleopatra-17.12.1
new file mode 100644
index 000000000000..f211a2e15c40
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kleopatra-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0253a589684d6b34dab71366729f8e1f
diff --git a/metadata/md5-cache/kde-apps/klettres-17.12.0 b/metadata/md5-cache/kde-apps/klettres-17.12.0
deleted file mode 100644
index fef46986098b..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Alphabet learning application
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/klettres-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b45558f48275a3ff46a50641b7a06160
diff --git a/metadata/md5-cache/kde-apps/klettres-17.12.1 b/metadata/md5-cache/kde-apps/klettres-17.12.1
new file mode 100644
index 000000000000..f6930565b286
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Alphabet learning application
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/klettres-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klickety-17.12.0 b/metadata/md5-cache/kde-apps/klickety-17.12.0
deleted file mode 100644
index b0634bf97076..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/klickety-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd525e45a0d3387df30f4e9e04fcf734
diff --git a/metadata/md5-cache/kde-apps/klickety-17.12.1 b/metadata/md5-cache/kde-apps/klickety-17.12.1
new file mode 100644
index 000000000000..1844de9a2610
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/klickety-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klines-17.12.0 b/metadata/md5-cache/kde-apps/klines-17.12.0
deleted file mode 100644
index e2a2e4a96764..000000000000
--- a/metadata/md5-cache/kde-apps/klines-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/klines-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bcc5d0becc96342c5bf8ae9038089713
diff --git a/metadata/md5-cache/kde-apps/klines-17.12.1 b/metadata/md5-cache/kde-apps/klines-17.12.1
new file mode 100644
index 000000000000..18d7b38d386b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/klines-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/kmag-17.12.0 b/metadata/md5-cache/kde-apps/kmag-17.12.0
deleted file mode 100644
index 99c98bec2e71..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE screen magnifier
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmag-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dad7688e051281b2f934dcfa3fe19c7d
diff --git a/metadata/md5-cache/kde-apps/kmag-17.12.1 b/metadata/md5-cache/kde-apps/kmag-17.12.1
new file mode 100644
index 000000000000..e79dca177800
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE screen magnifier
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmag-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.12.0 b/metadata/md5-cache/kde-apps/kmahjongg-17.12.0
deleted file mode 100644
index f235459a6c09..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=kde-apps/libkmahjongg-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A tile matching game for one or two players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=kde-apps/libkmahjongg-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmahjongg-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b41c37913ac829ca7fb4a7c5b1be2503
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.12.1 b/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
new file mode 100644
index 000000000000..e9b7678b09ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A tile matching game for one or two players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmahjongg-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.0 b/metadata/md5-cache/kde-apps/kmail-17.12.0
deleted file mode 100644
index c6ca37622959..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libgravatar-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/libksieve-17.12.0:5 >=kde-apps/libktnef-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kldap-17.12.0:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libgravatar-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/libksieve-17.12.0:5 >=kde-apps/libktnef-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmail-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23a2d6530d81d2e93eda99f6ca9fe5e5
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.1 b/metadata/md5-cache/kde-apps/kmail-17.12.1
new file mode 100644
index 000000000000..b0fb821bc7ba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kldap-17.12.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kmail/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-apps/kmail-account-wizard-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ae430b3dae64f3dcc528bc125988c2f
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.0 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.0
deleted file mode 100644
index 9f8ca9e8e22e..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmail-account-wizard-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61dda8cd5c6f05f3edc34cbd07830443
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
new file mode 100644
index 000000000000..0bf13a5a723e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-account-wizard-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.0 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.0
deleted file mode 100644
index f83970eb2405..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/ksmtp-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/ksmtp-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmailtransport-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=acaeb1b6623a5bfa38e60ce0167b9038
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.1 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.1
new file mode 100644
index 000000000000..75879116bbfb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mail transport service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmailtransport-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9a93aaa264a89b008a8d483cfc59e071
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.12.0 b/metadata/md5-cache/kde-apps/kmbox-17.12.0
deleted file mode 100644
index 06d13c3455de..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-17.12.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmbox-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8d55cacd3f34febe85bbcf97a0caad0
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.12.1 b/metadata/md5-cache/kde-apps/kmbox-17.12.1
new file mode 100644
index 000000000000..6a4c5690ee9b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmbox-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmime-17.12.0 b/metadata/md5-cache/kde-apps/kmime-17.12.0
deleted file mode 100644
index 9a2fe17aea9b..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmime-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37933c5b528552dfac1f2f3bc1a87b0d
diff --git a/metadata/md5-cache/kde-apps/kmime-17.12.1 b/metadata/md5-cache/kde-apps/kmime-17.12.1
new file mode 100644
index 000000000000..6fed49c5a113
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmime-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmines-17.12.0 b/metadata/md5-cache/kde-apps/kmines-17.12.0
deleted file mode 100644
index 4e2e85664d0c..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classic mine sweeper game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmines-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a9310845fe81c836fed7018f155d9f73
diff --git a/metadata/md5-cache/kde-apps/kmines-17.12.1 b/metadata/md5-cache/kde-apps/kmines-17.12.1
new file mode 100644
index 000000000000..5343c5b8855a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classic mine sweeper game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmines-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmix-17.12.0 b/metadata/md5-cache/kde-apps/kmix-17.12.0
deleted file mode 100644
index bda8f61f8b69..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma mixer gui
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
-IUSE=alsa pulseaudio debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmix-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fe77d1e0bf98ab958a1b7ca63d0920c
diff --git a/metadata/md5-cache/kde-apps/kmix-17.12.1 b/metadata/md5-cache/kde-apps/kmix-17.12.1
new file mode 100644
index 000000000000..4df3ee15d09e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma mixer gui
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
+IUSE=alsa pulseaudio debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmix-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.12.0 b/metadata/md5-cache/kde-apps/kmousetool-17.12.0
deleted file mode 100644
index f3cdd8d4503f..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-libs/libXext x11-libs/libXt x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmousetool-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac9ae4b7ff55ad3ec3194b6edbcc0e8d
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.12.1 b/metadata/md5-cache/kde-apps/kmousetool-17.12.1
new file mode 100644
index 000000000000..76c055adc79f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-libs/libXext x11-libs/libXt x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmousetool-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc810b85c89f63d3ad8945b7d0f4c513
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.12.0 b/metadata/md5-cache/kde-apps/kmouth-17.12.0
deleted file mode 100644
index fa9f48addd90..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmouth-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c708fbfc505dab3ef7e9c0a604d7278f
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.12.1 b/metadata/md5-cache/kde-apps/kmouth-17.12.1
new file mode 100644
index 000000000000..5de4de56c205
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmouth-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.12.0 b/metadata/md5-cache/kde-apps/kmplot-17.12.0
deleted file mode 100644
index e1e7da0b63c3..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mathematical function plotter
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kmplot-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d7b6ee991a41136d1d558be7b1f90527
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.12.1 b/metadata/md5-cache/kde-apps/kmplot-17.12.1
new file mode 100644
index 000000000000..987fcd1722d7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mathematical function plotter
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmplot-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.12.0 b/metadata/md5-cache/kde-apps/knavalbattle-17.12.0
deleted file mode 100644
index 9a6ca874c211..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Battleship clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/knavalbattle-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=516fcca2fcefea74615ff6079b29c9f7
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.12.1 b/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
new file mode 100644
index 000000000000..25d6a9e6d5c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Battleship clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/knavalbattle-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.12.0 b/metadata/md5-cache/kde-apps/knetwalk-17.12.0
deleted file mode 100644
index 65135160b775..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/knetwalk-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ea771caf6ca3567ffa10cd5042ad585
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.12.1 b/metadata/md5-cache/kde-apps/knetwalk-17.12.1
new file mode 100644
index 000000000000..fd3cb23431e4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/knetwalk-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knotes-17.12.0 b/metadata/md5-cache/kde-apps/knotes-17.12.0
deleted file mode 100644
index 3d89c537a1ec..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/knotes-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc797dc78090841df72f676040a04a89
diff --git a/metadata/md5-cache/kde-apps/knotes-17.12.1 b/metadata/md5-cache/kde-apps/knotes-17.12.1
new file mode 100644
index 000000000000..130e601d8682
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Note taking application
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/knotes-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/kolf-17.12.0 b/metadata/md5-cache/kde-apps/kolf-17.12.0
deleted file mode 100644
index a0d082f323e7..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Minigolf game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kolf-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fd702c8c1c2f0cc9f19aae61e53b51a
diff --git a/metadata/md5-cache/kde-apps/kolf-17.12.1 b/metadata/md5-cache/kde-apps/kolf-17.12.1
new file mode 100644
index 000000000000..ad83470557fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Minigolf game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kolf-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kollision-17.12.0 b/metadata/md5-cache/kde-apps/kollision-17.12.0
deleted file mode 100644
index 18216948421a..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple ball dodging game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kollision-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7815be8bf8ef6e4bc680111399601297
diff --git a/metadata/md5-cache/kde-apps/kollision-17.12.1 b/metadata/md5-cache/kde-apps/kollision-17.12.1
new file mode 100644
index 000000000000..c48ee85dbe45
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple ball dodging game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kollision-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.12.0 b/metadata/md5-cache/kde-apps/kolourpaint-17.12.0
deleted file mode 100644
index 1d33a01c8639..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Paint Program by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kolourpaint-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=805940581f0b96ecfe8b7077f8dde4e8
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.12.1 b/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
new file mode 100644
index 000000000000..df12b9d6ec7c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.1:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Paint Program by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kolourpaint-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kompare-17.12.0 b/metadata/md5-cache/kde-apps/kompare-17.12.0
deleted file mode 100644
index 04bf8464bbde..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A program to view the differences between files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kompare-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6221468178b9448b800134f8365f79f3
diff --git a/metadata/md5-cache/kde-apps/kompare-17.12.1 b/metadata/md5-cache/kde-apps/kompare-17.12.1
new file mode 100644
index 000000000000..c7e714bad4bc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A program to view the differences between files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kompare-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.12.0 b/metadata/md5-cache/kde-apps/konqueror-17.12.0
deleted file mode 100644
index 873d8592c6f5..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=kde-apps/kfind-17.12.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/konqueror-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a4491af6e530243c3c247296b548f468
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.12.1 b/metadata/md5-cache/kde-apps/konqueror-17.12.1
new file mode 100644
index 000000000000..0a0f27ca9de4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
+IUSE=activities speech tidy X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=kde-apps/kfind-17.12.1:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/konqueror-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3bf841515709ddd381afb8bd0135d204
diff --git a/metadata/md5-cache/kde-apps/konquest-17.12.0 b/metadata/md5-cache/kde-apps/konquest-17.12.0
deleted file mode 100644
index a3d9cdce6165..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/konquest-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=851f3ea048788ab76e56c63f79537701
diff --git a/metadata/md5-cache/kde-apps/konquest-17.12.1 b/metadata/md5-cache/kde-apps/konquest-17.12.1
new file mode 100644
index 000000000000..f4938d2f5f2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/konquest-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konsole-17.12.0 b/metadata/md5-cache/kde-apps/konsole-17.12.0
deleted file mode 100644
index 7e5f9f981657..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE's terminal emulator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/konsole-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52175fe37f9ca44b9b803e79705ecaa2
diff --git a/metadata/md5-cache/kde-apps/konsole-17.12.1 b/metadata/md5-cache/kde-apps/konsole-17.12.1
new file mode 100644
index 000000000000..bc571a03fd56
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE's terminal emulator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/konsole-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=866ca0be0b19b1bce9e1b7099d9b24a8
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.0 b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.0
deleted file mode 100644
index 7624f03328a8..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/akonadi-calendar-tools-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ff4e821b77c927da72329b3ffcac332
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1 b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
new file mode 100644
index 000000000000..b791d24b073b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/kontact-17.12.0 b/metadata/md5-cache/kde-apps/kontact-17.12.0
deleted file mode 100644
index 53d727637c3b..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kontact-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c4f051537f515774455f619448a41fa
diff --git a/metadata/md5-cache/kde-apps/kontact-17.12.1 b/metadata/md5-cache/kde-apps/kontact-17.12.1
new file mode 100644
index 000000000000..118b1aa8cb10
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kontact-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.12.0 b/metadata/md5-cache/kde-apps/kontactinterface-17.12.0
deleted file mode 100644
index fbbf1b0c5ae4..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kontactinterface-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce4494c3691ba3c6d546e7a0295ec941
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.12.1 b/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
new file mode 100644
index 000000000000..6e44ba24d992
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kontactinterface-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.12.0 b/metadata/md5-cache/kde-apps/korganizer-17.12.0
deleted file mode 100644
index 79addf3cc222..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/eventviews-17.12.0:5 >=kde-apps/incidenceeditor-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-apps/kldap-17.12.0:5 >=dev-qt/designer-5.9.1:5 test? ( >=kde-apps/akonadi-17.12.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/eventviews-17.12.0:5 >=kde-apps/incidenceeditor-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kholidays-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/korganizer-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1463e4d730861e68ed2a764cd0f725f
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.12.1 b/metadata/md5-cache/kde-apps/korganizer-17.12.1
new file mode 100644
index 000000000000..2e7c5b078a41
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-apps/kldap-17.12.1:5 >=dev-qt/designer-5.9.1:5 test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/korganizer/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/korganizer-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e0d5d1f582fc64deb8a95bb83763425
diff --git a/metadata/md5-cache/kde-apps/kpat-17.12.0 b/metadata/md5-cache/kde-apps/kpat-17.12.0
deleted file mode 100644
index 7d4eeb83fb12..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE patience game
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kpat-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dea33a739ea024a079bea20f86422fea
diff --git a/metadata/md5-cache/kde-apps/kpat-17.12.1 b/metadata/md5-cache/kde-apps/kpat-17.12.1
new file mode 100644
index 000000000000..510332336910
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE patience game
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kpat-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.0 b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.0
deleted file mode 100644
index 2dcb71acb844..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kpimtextedit-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88f5d2f5546f4740bce8c5735a0ff8e4
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1 b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
new file mode 100644
index 000000000000..e3c066625eb4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A textedit with PIM-specific features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kpimtextedit-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.0 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.0
deleted file mode 100644
index dff7db2397ff..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kqtquickcharts-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7828c72d7ce2935aa4bf543a1953df48
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
new file mode 100644
index 000000000000..201f73a27dbe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kqtquickcharts-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/krdc-17.12.0 b/metadata/md5-cache/kde-apps/krdc-17.12.0
deleted file mode 100644
index d8b07d0ddd0c..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/krdc/
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/krdc-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe1daff997d6251469ebdf7222c9a153
diff --git a/metadata/md5-cache/kde-apps/krdc-17.12.1 b/metadata/md5-cache/kde-apps/krdc-17.12.1
new file mode 100644
index 000000000000..6fd8baa2f2db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/krdc/
+IUSE=+rdp vnc debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/krdc-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.12.0 b/metadata/md5-cache/kde-apps/kreversi-17.12.0
deleted file mode 100644
index dd0e578b388e..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Board game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kreversi-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48023618750ddab7179e8561de14cf84
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.12.1 b/metadata/md5-cache/kde-apps/kreversi-17.12.1
new file mode 100644
index 000000000000..6d35bf32037e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Board game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kreversi-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/krfb-17.12.0 b/metadata/md5-cache/kde-apps/krfb-17.12.0
deleted file mode 100644
index eb5fce1978c0..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/krfb/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/krfb-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06475e7515f1364cc550305426f9a4ad
diff --git a/metadata/md5-cache/kde-apps/krfb-17.12.1 b/metadata/md5-cache/kde-apps/krfb-17.12.1
new file mode 100644
index 000000000000..6f82d76ba153
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/krfb/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/krfb-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.0 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.0
deleted file mode 100644
index db93fbeb793f..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=python_targets_python2_7 debug
-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/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kross-interpreters-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=201840e857fd64493827d02913b23319
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
new file mode 100644
index 000000000000..b3fad8ef5b42
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+python ruby debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d66643edd6a99e6a0a165c2f4d349149
diff --git a/metadata/md5-cache/kde-apps/kruler-17.12.0 b/metadata/md5-cache/kde-apps/kruler-17.12.0
deleted file mode 100644
index 93478979db04..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen ruler for Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kruler-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=474fe2d549ad3a2ce7da14e224797528
diff --git a/metadata/md5-cache/kde-apps/kruler-17.12.1 b/metadata/md5-cache/kde-apps/kruler-17.12.1
new file mode 100644
index 000000000000..a3213e57f1e9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen ruler for Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kruler-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.12.0 b/metadata/md5-cache/kde-apps/kshisen-17.12.0
deleted file mode 100644
index a4e3b75df8b4..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=kde-apps/libkmahjongg-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE game similiar to Mahjongg
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=kde-apps/libkmahjongg-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kshisen-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58790ee4d2ad07b60680384f7205413a
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.12.1 b/metadata/md5-cache/kde-apps/kshisen-17.12.1
new file mode 100644
index 000000000000..066f6c5203cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE game similiar to Mahjongg
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kshisen-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.12.0 b/metadata/md5-cache/kde-apps/ksirk-17.12.0
deleted file mode 100644
index f081ec8d3491..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Port of the board game risk
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ksirk-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7bf80027c626606fa95dd661d7b3ebdf
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.12.1 b/metadata/md5-cache/kde-apps/ksirk-17.12.1
new file mode 100644
index 000000000000..c2c025256d94
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Port of the board game risk
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksirk-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d587c4d35a7ed0315be6ea7b6c66785
diff --git a/metadata/md5-cache/kde-apps/ksmtp-17.12.0-r2 b/metadata/md5-cache/kde-apps/ksmtp-17.12.0-r2
deleted file mode 100644
index 08c27f370d7f..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-17.12.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.0:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ksmtp-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7145edda1562371383688e9c75d8403f
diff --git a/metadata/md5-cache/kde-apps/ksmtp-17.12.1 b/metadata/md5-cache/kde-apps/ksmtp-17.12.1
new file mode 100644
index 000000000000..07cc80e1b0c1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksmtp-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.0 b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.0
deleted file mode 100644
index df6fb1a73f20..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Tron game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ksnakeduel-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27224072086862320e3fcf82891879a6
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1 b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
new file mode 100644
index 000000000000..0e28be67546e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Tron game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksnakeduel-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.12.0 b/metadata/md5-cache/kde-apps/kspaceduel-17.12.0
deleted file mode 100644
index 3889a5ebe8ae..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Space Game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kspaceduel-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c21a99a5940fd481e5315d319d0666f4
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.12.1 b/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
new file mode 100644
index 000000000000..8bfd03212bef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Space Game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kspaceduel-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.12.0 b/metadata/md5-cache/kde-apps/ksquares-17.12.0
deleted file mode 100644
index be8860d35f3e..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE clone of the game squares
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ksquares-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af72aac5d44e4622c23bbc4c222de5d5
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.12.1 b/metadata/md5-cache/kde-apps/ksquares-17.12.1
new file mode 100644
index 000000000000..481af7b3deca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE clone of the game squares
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksquares-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.12.0 b/metadata/md5-cache/kde-apps/ksudoku-17.12.0
deleted file mode 100644
index 7de50c97f0a5..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ksudoku-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aba62f5f271b6382ae092d9416575d6a
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.12.1 b/metadata/md5-cache/kde-apps/ksudoku-17.12.1
new file mode 100644
index 000000000000..020d3abde2c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksudoku-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.12.0 b/metadata/md5-cache/kde-apps/ksystemlog-17.12.0
deleted file mode 100644
index 892fa86e80eb..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System log viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
-IUSE=systemd test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ksystemlog-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fdb3ba77573f4599cc8bb7c950b431d7
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.12.1 b/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
new file mode 100644
index 000000000000..8faa488d853e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System log viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
+IUSE=systemd test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksystemlog-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.12.0 b/metadata/md5-cache/kde-apps/kteatime-17.12.0
deleted file mode 100644
index b280508ba49d..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kteatime-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfbcdc8f6b817ef290ce9e757569fda5
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.12.1 b/metadata/md5-cache/kde-apps/kteatime-17.12.1
new file mode 100644
index 000000000000..d68b29bdefef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kteatime-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.12.0 b/metadata/md5-cache/kde-apps/ktimer-17.12.0
deleted file mode 100644
index 61c7eb40c34e..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Timer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktimer-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=68bb95b5eb3bcfb03817e882679c0713
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.12.1 b/metadata/md5-cache/kde-apps/ktimer-17.12.1
new file mode 100644
index 000000000000..bf69b689685b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Timer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktimer-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.12.0 b/metadata/md5-cache/kde-apps/ktouch-17.12.0
deleted file mode 100644
index 5a826c5fd560..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/ktouch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktouch-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f1f0663af218bb3fd9bd7aa1b7e1894
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.12.1 b/metadata/md5-cache/kde-apps/ktouch-17.12.1
new file mode 100644
index 000000000000..4c49da32f5c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/ktouch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktouch-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.0 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.0
deleted file mode 100644
index 4e865009ee5f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=experimental debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.12.0:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-accounts-kcm-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=274339f910329b0b01a6b8a6c90b5600
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
new file mode 100644
index 000000000000..45308cf945f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=experimental debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.12.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-accounts-kcm-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5e58f595839a82e85d28331ddd6a0d0
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.12.0 b/metadata/md5-cache/kde-apps/ktp-approver-17.12.0
deleted file mode 100644
index 55185dde571c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-approver-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a1055d230e198fc14130ba745f5c7ec
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.12.1 b/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
new file mode 100644
index 000000000000..62ad08c92431
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-approver-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.0 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.0
deleted file mode 100644
index 086d9c2885d7..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-auth-handler-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d211865d742ee6c15aa6ba7e860f978
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
new file mode 100644
index 000000000000..066bee17e3c5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-auth-handler-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1cd0a3041d5b9cc30f75ec1228fa54ae
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.0 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.0
deleted file mode 100644
index b7fb0c0da9f3..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy audio/video conferencing ui
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-call-ui-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb73b4d93e9b6ccf3336d5b5f10f7e54
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
new file mode 100644
index 000000000000..6c2da3057e0b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy audio/video conferencing ui
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-call-ui-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.0 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.0
deleted file mode 100644
index 666523beb0ae..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.0:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy common library
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.0:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-common-internals-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=539ff12967cf2d7bbce0de8b42910ef4
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
new file mode 100644
index 000000000000..f36c7efb8327
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy common library
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-common-internals-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.0 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.0
deleted file mode 100644
index 13456c93c89f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact list
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-contact-list-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65f546bbd75445997bc0484cccfc2705
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
new file mode 100644
index 000000000000..f66185f914cd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact list
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-contact-list-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.0 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.0
deleted file mode 100644
index 52317aa22592..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-contact-runner-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a612eb4ad1e321b24e2554904f4da52f
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
new file mode 100644
index 000000000000..a3c0ffc0aeb7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-contact-runner-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.0 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.0
deleted file mode 100644
index 5e8e9f6d8b18..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-desktop-applets-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9545ca6fc9dd049f9cab616876c5dbc
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
new file mode 100644
index 000000000000..e2b8781bcfa6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-desktop-applets-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.0 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.0
deleted file mode 100644
index 0eb6d3992698..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-filetransfer-handler-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7b08991d956943363b276a37e0380756
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
new file mode 100644
index 000000000000..4e58b9681821
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-filetransfer-handler-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.0 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.0
deleted file mode 100644
index 0d445762acd8..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-kded-module-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61f5d00109926fd578b9935e2de4674a
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
new file mode 100644
index 000000000000..9ba7671c6d1a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-kded-module-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.0 b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.0
deleted file mode 100644
index 15864468e1a5..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.0:5 >=kde-apps/ktp-filetransfer-handler-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-send-file-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=655040e58b3c635da976a10af0e2e73e
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1 b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
new file mode 100644
index 000000000000..e14e94ca33e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-apps/ktp-filetransfer-handler-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-send-file-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.0 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.0
deleted file mode 100644
index 52ed834a968a..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=speech debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.0:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/ktp-contact-list-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktp-text-ui-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f8e51316fe7ebd58498ec95058f842e
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
new file mode 100644
index 000000000000..e77e7155751d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=speech debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-text-ui-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.12.0 b/metadata/md5-cache/kde-apps/ktuberling-17.12.0
deleted file mode 100644
index 95ca26ef0a6d..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Potato game for kids by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktuberling-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee61f824da5fe185c6b139d3f5de52ad
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.12.1 b/metadata/md5-cache/kde-apps/ktuberling-17.12.1
new file mode 100644
index 000000000000..a7d74985a12b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Potato game for kids by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktuberling-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.12.0 b/metadata/md5-cache/kde-apps/kturtle-17.12.0
deleted file mode 100644
index 0b96cb83b074..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kturtle-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a88be7f625daa3169d5191e1a5cd1be
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.12.1 b/metadata/md5-cache/kde-apps/kturtle-17.12.1
new file mode 100644
index 000000000000..9a749f037c74
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kturtle-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.12.0 b/metadata/md5-cache/kde-apps/kubrick-17.12.0
deleted file mode 100644
index 41252cde08e1..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kubrick/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kubrick-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71381d8d7f071505c80d4b075c1773d9
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.12.1 b/metadata/md5-cache/kde-apps/kubrick-17.12.1
new file mode 100644
index 000000000000..b3562287bf69
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kubrick/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kubrick-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.0 b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.0
deleted file mode 100644
index 809adb0229b9..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Wallet management tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kwalletmanager-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffad2d8cdf209f1894e73492bc95627e
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1 b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
new file mode 100644
index 000000000000..c303f0da3d25
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Wallet management tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwalletmanager-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwave-17.12.0 b/metadata/md5-cache/kde-apps/kwave-17.12.0
deleted file mode 100644
index f6a9aa4c5e8b..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-17.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=6
-HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kwave-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e4a0304b9334b633765ff24178b53a1
diff --git a/metadata/md5-cache/kde-apps/kwave-17.12.1 b/metadata/md5-cache/kde-apps/kwave-17.12.1
new file mode 100644
index 000000000000..6162ce9e5255
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=6
+HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwave-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.12.0 b/metadata/md5-cache/kde-apps/kwordquiz-17.12.0
deleted file mode 100644
index 0501310e4e8e..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A powerful flashcard and vocabulary learning program
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kwordquiz-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b6191b0dd52b6450f6a88dc2e380e3d
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.12.1 b/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
new file mode 100644
index 000000000000..c544108e6231
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A powerful flashcard and vocabulary learning program
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwordquiz-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.12.0 b/metadata/md5-cache/kde-apps/kwrite-17.12.0
deleted file mode 100644
index 38f6e5e9c702..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE simple text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kate-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=834f3332aaa9d5039c5e904090a30c1b
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.12.1 b/metadata/md5-cache/kde-apps/kwrite-17.12.1
new file mode 100644
index 000000000000..98405400a98c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE simple text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kate-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.12.0 b/metadata/md5-cache/kde-apps/libgravatar-17.12.0
deleted file mode 100644
index 3a74743fdda0..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libgravatar-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6d8a39e6ab21e441faaa1a333697ce3
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.12.1 b/metadata/md5-cache/kde-apps/libgravatar-17.12.1
new file mode 100644
index 000000000000..133432293692
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for gravatar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libgravatar-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.12.0 b/metadata/md5-cache/kde-apps/libkcddb-17.12.0
deleted file mode 100644
index ec82f9fa6598..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for CDDB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkcddb-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e596fbb08a6cc0bc1a7b357111298fb7
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.12.1 b/metadata/md5-cache/kde-apps/libkcddb-17.12.1
new file mode 100644
index 000000000000..644cb4149a90
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for CDDB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkcddb-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.0 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.0
deleted file mode 100644
index f574c20ec206..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=alsa debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkcompactdisc-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36ce868fb4be6c50f7014bbcd1e9af34
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
new file mode 100644
index 000000000000..f4bc983b008a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=alsa debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkcompactdisc-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.12.0 b/metadata/md5-cache/kde-apps/libkdcraw-17.12.0
deleted file mode 100644
index d7466c1c946d..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkdcraw-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2825ecf22e5e502429717dccd216e4fb
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.12.1 b/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
new file mode 100644
index 000000000000..b72a3e5e064a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdcraw-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.12.0 b/metadata/md5-cache/kde-apps/libkdegames-17.12.0
deleted file mode 100644
index c91e35e0124c..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Base library common to many KDE games
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkdegames-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65d67ee5b736815b3decafef925dfd33
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.12.1 b/metadata/md5-cache/kde-apps/libkdegames-17.12.1
new file mode 100644
index 000000000000..a1e4a77e70b3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Base library common to many KDE games
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdegames-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.12.0 b/metadata/md5-cache/kde-apps/libkdepim-17.12.0
deleted file mode 100644
index 73088eb6bdfc..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkdepim-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54e8a1ebd61071fbceee73367437f286
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.12.1 b/metadata/md5-cache/kde-apps/libkdepim-17.12.1
new file mode 100644
index 000000000000..c757c3fa0404
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdepim-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.0 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.0
deleted file mode 100644
index 2611aed02bfe..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkeduvocdocument-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4805d93bfe3ff9debab4061d3ae7e363
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
new file mode 100644
index 000000000000..be18101bf4a9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkeduvocdocument-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.12.0 b/metadata/md5-cache/kde-apps/libkexiv2-17.12.0
deleted file mode 100644
index 01ff3025122e..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkexiv2-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16c1a752d246b2d16860a533f193c06a
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.12.1 b/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
new file mode 100644
index 000000000000..96b93e043a2e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkexiv2-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.12.0 b/metadata/md5-cache/kde-apps/libkgapi-17.12.0
deleted file mode 100644
index 3b6dbc1c94ec..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/libkgapi.git
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkgapi-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbf51bcdca3467e37a7cf055b94e335b
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.12.1 b/metadata/md5-cache/kde-apps/libkgapi-17.12.1
new file mode 100644
index 000000000000..9d997757afa5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/libkgapi.git
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkgapi-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.12.0 b/metadata/md5-cache/kde-apps/libkgeomap-17.12.0
deleted file mode 100644
index b75c94aed3d7..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/marble-17.12.0:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=6
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/marble-17.12.0:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkgeomap-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0d45505ea6346df1cc872a24915520c
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.12.1 b/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
new file mode 100644
index 000000000000..5a32186d5e22
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/marble-17.12.1:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
+EAPI=6
+HOMEPAGE=https://www.digikam.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/marble-17.12.1:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkgeomap-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.12.0 b/metadata/md5-cache/kde-apps/libkipi-17.12.0
deleted file mode 100644
index a4a2bb15fc5e..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkipi-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dcb171a2447ffca8a06f9b62f9b522f1
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.12.1 b/metadata/md5-cache/kde-apps/libkipi-17.12.1
new file mode 100644
index 000000000000..e4587ed3920f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkipi-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.12.0 b/metadata/md5-cache/kde-apps/libkleo-17.12.0
deleted file mode 100644
index 1065a3f1204d..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkleo-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58513d6ce947dfdb11a79afa0d984a12
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.12.1 b/metadata/md5-cache/kde-apps/libkleo-17.12.1
new file mode 100644
index 000000000000..bba01b00f3cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for encryption handling
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkleo-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.0 b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.0
deleted file mode 100644
index cd9be3ec13c8..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkmahjongg-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae0159c985c9ea72b115b8e9158c5d44
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1 b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
new file mode 100644
index 000000000000..574729a3d339
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkmahjongg-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.0 b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.0
deleted file mode 100644
index 6f85d40bfbdf..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library to compare files and strings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libkomparediff2-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d43df2985a81ae8cb8b159e61e0b91f
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1 b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
new file mode 100644
index 000000000000..d8a4f69453da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library to compare files and strings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkomparediff2-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libksane-17.12.0 b/metadata/md5-cache/kde-apps/libksane-17.12.0
deleted file mode 100644
index d896c909e96a..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libksane-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3afc048f212ddb8582ddc852f3ef8aa4
diff --git a/metadata/md5-cache/kde-apps/libksane-17.12.1 b/metadata/md5-cache/kde-apps/libksane-17.12.1
new file mode 100644
index 000000000000..f41d0a508fc9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libksane-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c6e6c58cb19f02f56b03eeac0b7f6693
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.12.0 b/metadata/md5-cache/kde-apps/libksieve-17.12.0
deleted file mode 100644
index 5ac0e8e32fba..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/libksieve-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b10fc1ba62f3d2492fca52fedb8c692
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.12.1 b/metadata/md5-cache/kde-apps/libksieve-17.12.1
new file mode 100644
index 000000000000..cbc6aff79609
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/libksieve-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.12.0 b/metadata/md5-cache/kde-apps/libktnef-17.12.0
deleted file mode 100644
index 27ce3f4c8c7c..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcalutils-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/ktnef-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8acaadf8f1d796dba303424f2e6599b0
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.12.1 b/metadata/md5-cache/kde-apps/libktnef-17.12.1
new file mode 100644
index 000000000000..64f6b2d31ae8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling TNEF data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktnef-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.12.0 b/metadata/md5-cache/kde-apps/lokalize-17.12.0
deleted file mode 100644
index 0dddf409aa97..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/lokalize http://l10n.kde.org/tools
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/lokalize-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4819e7907ca5be8c1e4f6dfc723cfd76
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.12.1 b/metadata/md5-cache/kde-apps/lokalize-17.12.1
new file mode 100644
index 000000000000..6a9caa0d94a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/lokalize http://l10n.kde.org/tools
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/lokalize-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c620f02ee70224779b40da303cb5febe
diff --git a/metadata/md5-cache/kde-apps/lskat-17.12.0 b/metadata/md5-cache/kde-apps/lskat-17.12.0
deleted file mode 100644
index 73a009170bd0..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Skat game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/lskat-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e840025da932be0ae1c7434f74bf349
diff --git a/metadata/md5-cache/kde-apps/lskat-17.12.1 b/metadata/md5-cache/kde-apps/lskat-17.12.1
new file mode 100644
index 000000000000..6e5c9c1719fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Skat game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/lskat-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.12.0 b/metadata/md5-cache/kde-apps/mailcommon-17.12.0
deleted file mode 100644
index 5aca61018127..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailimporter-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailimporter-17.12.0:5 >=kde-apps/messagelib-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/mailcommon-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72871c08eb6139f000742fe8d8e88f55
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.12.1 b/metadata/md5-cache/kde-apps/mailcommon-17.12.1
new file mode 100644
index 000000000000..7891c2f8862e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common mail library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/mailcommon-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.12.0 b/metadata/md5-cache/kde-apps/mailimporter-17.12.0
deleted file mode 100644
index 928659235ead..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/mailimporter-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fd5e0538adba1dc85f0ca314e528d8f
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.12.1 b/metadata/md5-cache/kde-apps/mailimporter-17.12.1
new file mode 100644
index 000000000000..f0af941aeb8a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to import mail from various sources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/mailimporter-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/marble-17.12.0 b/metadata/md5-cache/kde-apps/marble-17.12.0
deleted file mode 100644
index c31e171bca24..000000000000
--- a/metadata/md5-cache/kde-apps/marble-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=6
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5/17.12
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/marble-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=55fcb6830c471c91ec82fb310bf87a07
diff --git a/metadata/md5-cache/kde-apps/marble-17.12.1 b/metadata/md5-cache/kde-apps/marble-17.12.1
new file mode 100644
index 000000000000..791915c8e37c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=6
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5/17.12
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/marble-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.12.0 b/metadata/md5-cache/kde-apps/mbox-importer-17.12.0
deleted file mode 100644
index 9fec6538a164..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/mailimporter-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/mailimporter-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/mbox-importer-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54ff6df6a1f35d241108aba19ce6f998
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.12.1 b/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
new file mode 100644
index 000000000000..b449a8ad9f80
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/mbox-importer-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.12.0 b/metadata/md5-cache/kde-apps/messagelib-17.12.0
deleted file mode 100644
index 3717f9be3ad0..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/incidenceeditor-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmbox-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libgravatar-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/grantleetheme-17.12.0:5 >=kde-apps/incidenceeditor-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kdepim-apps-libs-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmbox-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libgravatar-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/libkleo-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/messagelib-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b9a53760439779be8ff46e7f71137cf
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.12.1 b/metadata/md5-cache/kde-apps/messagelib-17.12.1
new file mode 100644
index 000000000000..6bce2e4e8ae0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for messaging functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/messagelib-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/minuet-17.12.0 b/metadata/md5-cache/kde-apps/minuet-17.12.0
deleted file mode 100644
index 4582e68a0712..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE Software for Music Education
-EAPI=6
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/minuet-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9d531c954732a7f496b47179c3da7a0
diff --git a/metadata/md5-cache/kde-apps/minuet-17.12.1 b/metadata/md5-cache/kde-apps/minuet-17.12.1
new file mode 100644
index 000000000000..e642411f659d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE Software for Music Education
+EAPI=6
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/minuet-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/okteta-17.12.0 b/metadata/md5-cache/kde-apps/okteta-17.12.0
deleted file mode 100644
index 73b8cb6e0e5e..000000000000
--- a/metadata/md5-cache/kde-apps/okteta-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE hexeditor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
-IUSE=crypt designer test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/okteta-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c8a703492429ed4d5e8ed83fa57294c
diff --git a/metadata/md5-cache/kde-apps/okteta-17.12.1 b/metadata/md5-cache/kde-apps/okteta-17.12.1
new file mode 100644
index 000000000000..a7fe6565ee56
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okteta-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE hexeditor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/okteta-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce52bb1e3e841e0ae3ede6aa8dc36327
diff --git a/metadata/md5-cache/kde-apps/okular-17.12.0 b/metadata/md5-cache/kde-apps/okular-17.12.0
deleted file mode 100644
index b4a70feb2fbc..000000000000
--- a/metadata/md5-cache/kde-apps/okular-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.0:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.0:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( dev-libs/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.0:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.0:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( dev-libs/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.40.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/okular-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc7b13a399f022bc2f1a33b3e254b848
diff --git a/metadata/md5-cache/kde-apps/okular-17.12.1 b/metadata/md5-cache/kde-apps/okular-17.12.1
new file mode 100644
index 000000000000..ec936d1913cc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.1:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( dev-libs/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.1:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( dev-libs/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.40.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/okular-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=efd615b03ed2e2f5de9fa5476843d523
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.12.0 b/metadata/md5-cache/kde-apps/palapeli-17.12.0
deleted file mode 100644
index 0eb2c3af056b..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/palapeli/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/palapeli-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9affef98d0a3d0b7b22eaa0718d1533
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.12.1 b/metadata/md5-cache/kde-apps/palapeli-17.12.1
new file mode 100644
index 000000000000..44a79d05d0e0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/palapeli/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/palapeli-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/parley-17.12.0 b/metadata/md5-cache/kde-apps/parley-17.12.0
deleted file mode 100644
index 8c1357884234..000000000000
--- a/metadata/md5-cache/kde-apps/parley-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-17.12.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/libkeduvocdocument-17.12.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/parley-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2eebd157b847dc6509308281322f64fc
diff --git a/metadata/md5-cache/kde-apps/parley-17.12.1 b/metadata/md5-cache/kde-apps/parley-17.12.1
new file mode 100644
index 000000000000..9a3768c7cafe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-17.12.1:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/libkeduvocdocument-17.12.1:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/parley-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/picmi-17.12.0 b/metadata/md5-cache/kde-apps/picmi-17.12.0
deleted file mode 100644
index 5deaa445bf24..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/picmi-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdbc2ceada94f206dd21b467194c63ac
diff --git a/metadata/md5-cache/kde-apps/picmi-17.12.1 b/metadata/md5-cache/kde-apps/picmi-17.12.1
new file mode 100644
index 000000000000..0b2cfb462b3b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/picmi-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.0 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.0
deleted file mode 100644
index 9508643aaa0f..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=kde-apps/mailcommon-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/pim-data-exporter-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ec560e9bd982d4da8361d05c6f5cb92
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
new file mode 100644
index 000000000000..1bd78c8cfcf2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/pim-data-exporter-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3834b8b38f9cbe92cdf69b6f1913dc48
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.0 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.0
deleted file mode 100644
index f9286a453feb..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/libksieve-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-mime-17.12.0:5 >=kde-apps/calendarsupport-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kmailtransport-17.12.0:5 >=kde-apps/libksieve-17.12.0:5 >=kde-apps/pimcommon-17.12.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/pim-sieve-editor-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c62ace281fc947bbece0d3c4ff0a100a
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
new file mode 100644
index 000000000000..9c47818de5a1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/pim-sieve-editor-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.12.0 b/metadata/md5-cache/kde-apps/pimcommon-17.12.0
deleted file mode 100644
index 249c8d9ad987..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kimap-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.40.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-17.12.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kimap-17.12.0:5 >=kde-apps/kpimtextedit-17.12.0:5 >=kde-apps/libkdepim-17.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/pimcommon-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1436aa135039fd096a850f9fe0aa547b
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.12.1 b/metadata/md5-cache/kde-apps/pimcommon-17.12.1
new file mode 100644
index 000000000000..0c177e01bf9a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.40.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-17.12.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/pimcommon-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=94e9fa111db7f67cbf0ce70573a9c01b
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.0 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.0
deleted file mode 100644
index 09b017ccb830..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.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-17.12.0 >=kde-apps/ktp-approver-17.12.0 >=kde-apps/ktp-auth-handler-17.12.0 >=kde-apps/ktp-common-internals-17.12.0 >=kde-apps/ktp-contact-list-17.12.0 >=kde-apps/ktp-contact-runner-17.12.0 >=kde-apps/ktp-desktop-applets-17.12.0 >=kde-apps/ktp-filetransfer-handler-17.12.0 >=kde-apps/ktp-kded-module-17.12.0 >=kde-apps/ktp-send-file-17.12.0 >=kde-apps/ktp-text-ui-17.12.0 gstreamer? ( >=kde-apps/ktp-call-ui-17.12.0 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1615b0b2d699b0becaff58ddf6b0e4e8
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1
new file mode 100644
index 000000000000..3fda893b52bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.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-17.12.1 >=kde-apps/ktp-approver-17.12.1 >=kde-apps/ktp-auth-handler-17.12.1 >=kde-apps/ktp-common-internals-17.12.1 >=kde-apps/ktp-contact-list-17.12.1 >=kde-apps/ktp-contact-runner-17.12.1 >=kde-apps/ktp-desktop-applets-17.12.1 >=kde-apps/ktp-filetransfer-handler-17.12.1 >=kde-apps/ktp-kded-module-17.12.1 >=kde-apps/ktp-send-file-17.12.1 >=kde-apps/ktp-text-ui-17.12.1 gstreamer? ( >=kde-apps/ktp-call-ui-17.12.1 ) !kde-apps/plasma-telepathy-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/poxml-17.12.0 b/metadata/md5-cache/kde-apps/poxml-17.12.0
deleted file mode 100644
index 388b61708290..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/poxml-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e2ae667b3e7964ba2e2a5d688aba0da
diff --git a/metadata/md5-cache/kde-apps/poxml-17.12.1 b/metadata/md5-cache/kde-apps/poxml-17.12.1
new file mode 100644
index 000000000000..446bf21038d2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/poxml-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.12.0 b/metadata/md5-cache/kde-apps/print-manager-17.12.0
deleted file mode 100644
index dd4e8f6c08b4..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/print-manager-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c266c1b21150a263cb9313e2dd6df96
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.12.1 b/metadata/md5-cache/kde-apps/print-manager-17.12.1
new file mode 100644
index 000000000000..2d384f763341
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/print-manager-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/rocs-17.12.0 b/metadata/md5-cache/kde-apps/rocs-17.12.0
deleted file mode 100644
index 2598dd337c35..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-17.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/rocs-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be5313b5817f506772c39b438cc325e9
diff --git a/metadata/md5-cache/kde-apps/rocs-17.12.1 b/metadata/md5-cache/kde-apps/rocs-17.12.1
new file mode 100644
index 000000000000..86b69873c7d5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-17.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/rocs-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.0 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.0
deleted file mode 100644
index f7f71d85cc63..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet extension for signond
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/signon-kwallet-extension-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61b8bd8a81b373357256132c5757f264
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
new file mode 100644
index 000000000000..4dbfb699ba4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet extension for signond
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/signon-kwallet-extension-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.12.0 b/metadata/md5-cache/kde-apps/spectacle-17.12.0
deleted file mode 100644
index df4d0973d758..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.0:5= ) share? ( dev-libs/purpose:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.0:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/spectacle-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=191475f5863d70d17d355f94753fd44c
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.12.1 b/metadata/md5-cache/kde-apps/spectacle-17.12.1
new file mode 100644
index 000000000000..5b827baca0b3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.1:5= ) share? ( dev-libs/purpose:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screenshot capture utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kipi share debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.1:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/spectacle-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faf8d8aecbde37d17322fe6bafbb6fb3
diff --git a/metadata/md5-cache/kde-apps/step-17.12.0 b/metadata/md5-cache/kde-apps/step-17.12.0
deleted file mode 100644
index 14eb3dcf1866..000000000000
--- a/metadata/md5-cache/kde-apps/step-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interactive physics simulator
-EAPI=6
-HOMEPAGE=https://edu.kde.org/step
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/step-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd5b17f0e7c524d886a1ff6a70ab373c
diff --git a/metadata/md5-cache/kde-apps/step-17.12.1 b/metadata/md5-cache/kde-apps/step-17.12.1
new file mode 100644
index 000000000000..7df98d37de5e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interactive physics simulator
+EAPI=6
+HOMEPAGE=https://edu.kde.org/step
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/step-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e39a220c3b8e0421d9f1ac4eeffce482
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.12.0 b/metadata/md5-cache/kde-apps/svgpart-17.12.0
deleted file mode 100644
index 03019e9db622..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/svgpart-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=504b2180d97c980ad75766d98ada92df
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.12.1 b/metadata/md5-cache/kde-apps/svgpart-17.12.1
new file mode 100644
index 000000000000..6dc75fb86ed9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/svgpart-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.12.0 b/metadata/md5-cache/kde-apps/sweeper-17.12.0
deleted file mode 100644
index bfabb2d83e75..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/sweeper-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cbfac9bad9af8d045d61c7d09144933c
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.12.1 b/metadata/md5-cache/kde-apps/sweeper-17.12.1
new file mode 100644
index 000000000000..2a014ab96dc5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/sweeper-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/syndication-17.12.0 b/metadata/md5-cache/kde-apps/syndication-17.12.0
deleted file mode 100644
index fbc6ac2672e8..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/syndication-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0621e72963fe30b1d95fd2679db34766
diff --git a/metadata/md5-cache/kde-apps/syndication-17.12.1 b/metadata/md5-cache/kde-apps/syndication-17.12.1
new file mode 100644
index 000000000000..7d93aa659a7a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/syndication-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/syndication-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.12.0 b/metadata/md5-cache/kde-apps/thumbnailers-17.12.0
deleted file mode 100644
index 274e31d0e48a..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.0:5 >=kde-apps/libkexiv2-17.12.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.0:5 >=kde-apps/libkexiv2-17.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/kdegraphics-thumbnailers-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca26da3e3b5a36255e072a2385928c1c
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.12.1 b/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
new file mode 100644
index 000000000000..c3aeddc90f14
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.1:5 >=kde-apps/libkexiv2-17.12.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.1:5 >=kde-apps/libkexiv2-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdegraphics-thumbnailers-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.12.0 b/metadata/md5-cache/kde-apps/umbrello-17.12.0
deleted file mode 100644
index e52ae8e02c7c..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE UML Modeller
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/umbrello-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd08b51d474f9def93f5bc7961ce86f1
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.12.1 b/metadata/md5-cache/kde-apps/umbrello-17.12.1
new file mode 100644
index 000000000000..00121f0d4759
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE UML Modeller
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/umbrello-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.0 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.0
deleted file mode 100644
index 97e779f38d65..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.0/src/zeroconf-ioslave-17.12.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eee46dfe7f72d534f05b7b43b2ba8efd
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
new file mode 100644
index 000000000000..673ba37532a2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/zeroconf-ioslave-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 130c67c009b1..330d9404db97 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1 b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
index f48c51c6032f..ee63c7335317 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare
 DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme ) git? ( dev-libs/libgit2 ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A DropDrawers clone. Multiple information organizer
 EAPI=6
-HOMEPAGE=http://basket.kde.org/ https://github.com/basket-notepads/basket
+HOMEPAGE=https://github.com/basket-notepads/basket
 IUSE=crypt git test debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/8de0345d99f3eb08d9406bd07e88b31afe46f315.tar.gz -> basket-2.49a_p20170225.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0188c08bd65c4132ca93f2ce8decd397
+_md5_=a1e42e14451e65ad074f27ec2c94f6c5
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1 b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
deleted file mode 100644
index 059bf9a30fb4..000000000000
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr x11-libs/libxcb sys-devel/gettext x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=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=http://kde-apps.org/content/show.php?action=content&content=114856
-IUSE=test debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-3.0.0~beta1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21820abe71ff8db1dfbde11ac033ed78
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index a47ac14431e8..96162d9f8b2d 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/font-alias-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
index 875f92f1a6e8..76c79048df66 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=dca4eba8e336862b9cde716f3b3aec9e
+_md5_=96378354bc95181069dc4a3051d9b80c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7fbdb40d98b8..1d35caaff849 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/panini-0.71.104 b/metadata/md5-cache/media-gfx/panini-0.71.104
deleted file mode 100644
index 61a4006d3433..000000000000
--- a/metadata/md5-cache/media-gfx/panini-0.71.104
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtopengl:4 virtual/glu sys-libs/zlib app-arch/unzip
-DESCRIPTION=OpenGL-based panoramic image viewer
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pvqt/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtopengl:4 virtual/glu sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/pvqt/Panini-0.71.104-src.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6ddd4a5bad564bf7ff5cca06bf29d900
diff --git a/metadata/md5-cache/media-gfx/panini-0.72.0 b/metadata/md5-cache/media-gfx/panini-0.72.0
new file mode 100644
index 000000000000..3afe39096126
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/panini-0.72.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 sys-libs/zlib virtual/glu app-arch/unzip
+DESCRIPTION=OpenGL-based panoramic image viewer
+EAPI=6
+HOMEPAGE=https://github.com/lazarus-pkgs/panini
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 sys-libs/zlib virtual/glu
+SLOT=0
+SRC_URI=https://github.com/lazarus-pkgs/panini/archive/v0.72.0.tar.gz -> panini-0.72.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5d4f216c8e382a04befc230096435b0a
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1 b/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
index 7e644fbfe20a..4fde2219a36a 100644
--- a/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
+++ b/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 exiv2? ( media-gfx/exiv2:= ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) raw? ( media-libs/libraw:= ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Simple but powerful Qt-based image viewer
 EAPI=6
-HOMEPAGE=http://photoqt.org/
+HOMEPAGE=https://photoqt.org/
 IUSE=exiv2 graphicsmagick raw
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 exiv2? ( media-gfx/exiv2:= ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) raw? ( media-libs/libraw:= )
 SLOT=0
-SRC_URI=http://photoqt.org/pkgs/photoqt-1.5.1.tar.gz
+SRC_URI=https://photoqt.org/pkgs/photoqt-1.5.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01858df5a58d20d79bfefacd811b7e37
+_md5_=bb8d40145b7e18d0382caad7bccc0bfe
diff --git a/metadata/md5-cache/media-gfx/qvv-4.02 b/metadata/md5-cache/media-gfx/qvv-4.02
deleted file mode 100644
index 0cf34ccbbb78..000000000000
--- a/metadata/md5-cache/media-gfx/qvv-4.02
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=QVV Image Viewer and Browser
-EAPI=2
-HOMEPAGE=http://cade.datamax.bg/qvv/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://cade.datamax.bg/qvv/qvv-4.02.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=976566f5cabb1c37f8f9dca512dd564b
diff --git a/metadata/md5-cache/media-gfx/qvv-4.04 b/metadata/md5-cache/media-gfx/qvv-4.04
new file mode 100644
index 000000000000..bf2ad33c43ee
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qvv-4.04
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+DESCRIPTION=QVV Image Viewer and Browser
+EAPI=6
+HOMEPAGE=http://cade.datamax.bg/qvv/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/cade-vs/qvv/archive/4.04.tar.gz -> qvv-4.04.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=34175413111d577020bf9b526c6dbf86
diff --git a/metadata/md5-cache/media-gfx/xfig-3.2.6a b/metadata/md5-cache/media-gfx/xfig-3.2.6a
index 5fb81d73ab03..b2d96a55a32e 100644
--- a/metadata/md5-cache/media-gfx/xfig-3.2.6a
+++ b/metadata/md5-cache/media-gfx/xfig-3.2.6a
@@ -4,9 +4,9 @@ DESCRIPTION=A menu-driven tool to draw and manipulate objects interactively in a
 EAPI=6
 HOMEPAGE=http://mcj.sourceforge.net/
 IUSE=jpeg nls postscript
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libXaw x11-libs/libXp x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/xfig-full-3.2.6a.tar.xz
-_md5_=d809a0806e0367e23b720e027a2ba76a
+_md5_=97bd0b1d0847739ab086dbc5829f2090
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 563b6ed55b23..49ba8f390a83 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/libffado-2.4.0 b/metadata/md5-cache/media-libs/libffado-2.4.0
new file mode 100644
index 000000000000..3f3fa7bf0780
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libffado-2.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-cpp/libxmlpp:2.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(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[dbus,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-misc/xdg-utils ) virtual/pkgconfig dev-util/scons virtual/pkgconfig
+DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
+EAPI=6
+HOMEPAGE=http://www.ffado.org
+IUSE=debug qt5 test-programs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-cpp/libxmlpp:2.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(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[dbus,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-misc/xdg-utils ) !<media-sound/jack-audio-connection-kit-0.122.0:0 !<media-sound/jack-audio-connection-kit-1.9.9:2
+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	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=45b7d5f4194bfdc141478d241f7677fa
diff --git a/metadata/md5-cache/media-libs/libxspf-1.2.0 b/metadata/md5-cache/media-libs/libxspf-1.2.0
index 42bf627a9729..88368b946f62 100644
--- a/metadata/md5-cache/media-libs/libxspf-1.2.0
+++ b/metadata/md5-cache/media-libs/libxspf-1.2.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2 >=dev-libs/uriparser-0.7.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 media-gfx/graphviz dev-qt/qthelp:4 ) test? ( >=dev-util/cpptest-1.1 )
+DEPEND=>=dev-libs/expat-2 >=dev-libs/uriparser-0.7.5 virtual/pkgconfig test? ( >=dev-util/cpptest-1.1 )
 DESCRIPTION=Playlist handling library
-EAPI=4
+EAPI=6
 HOMEPAGE=http://libspiff.sourceforge.net/
-IUSE=doc static-libs test
+IUSE=static-libs test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD LGPL-2.1
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/uriparser-0.7.5
 SLOT=0
 SRC_URI=mirror://sourceforge/libspiff/libxspf-1.2.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e99785d4ef3140ab6ca8226c49f3ff7
+_eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1e68bd165cfd602c89b6c9f1c478a808
diff --git a/metadata/md5-cache/media-libs/osl-1.8.12 b/metadata/md5-cache/media-libs/osl-1.8.12
index fbc6c76133d4..30be1da5aa30 100644
--- a/metadata/md5-cache/media-libs/osl-1.8.12
+++ b/metadata/md5-cache/media-libs/osl-1.8.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/openexr-2.2.0 >=media-libs/openimageio-1.7.0 dev-libs/pugixml sys-libs/zlib:= partio? ( media-libs/partio ) >=dev-libs/boost-1.62 sys-devel/llvm[clang] sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=media-libs/openexr-2.2.0 >=media-libs/openimageio-1.7.0 dev-libs/pugixml sys-libs/zlib:= partio? ( media-libs/partio ) >=dev-libs/boost-1.62 sys-devel/clang sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Advanced shading language for production GI renderers
 EAPI=6
 HOMEPAGE=http://opensource.imageworks.com/?p=osl
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.8.12.tar.gz -> osl-1.8.12.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb6ca33b07258eaf8392ecd7972d3811
+_md5_=912dd154f00fb454edb90b3bab7ab827
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 4549d4fb0a2b..eb734c9fb0f9 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/wspr-2.00-r2 b/metadata/md5-cache/media-radio/wspr-2.00-r2
deleted file mode 100644
index a2b9badbbaaf..000000000000
--- a/metadata/md5-cache/media-radio/wspr-2.00-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Weak Signal Propagation Reporter
-EAPI=5
-HOMEPAGE=http://www.physics.princeton.edu/pulsar/K1JT/wspr.html
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.physics.princeton.edu/pulsar/K1JT/wspr-2.00.r1714.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c305b6b5d35b28922696610e8a3b3f89
diff --git a/metadata/md5-cache/media-radio/wspr-3.01 b/metadata/md5-cache/media-radio/wspr-3.01
deleted file mode 100644
index 7ba489776f7a..000000000000
--- a/metadata/md5-cache/media-radio/wspr-3.01
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Weak Signal Propagation Reporter
-EAPI=5
-HOMEPAGE=http://www.physics.princeton.edu/pulsar/K1JT/wspr.html
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomjbe/distfiles/wspr-3.01.r2792.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cde21c2ae3df9ef934642331d80b1adf
diff --git a/metadata/md5-cache/media-radio/wspr-3.01-r1 b/metadata/md5-cache/media-radio/wspr-3.01-r1
deleted file mode 100644
index 891f98796512..000000000000
--- a/metadata/md5-cache/media-radio/wspr-3.01-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Weak Signal Propagation Reporter
-EAPI=5
-HOMEPAGE=http://www.physics.princeton.edu/pulsar/K1JT/wspr.html
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomjbe/distfiles/wspr-3.01.r2792.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=acc74ef73fc7d7beb77139378aa2021e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 96c30cec2aa3..f7f138d215e5 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/drumstick-0.5.0 b/metadata/md5-cache/media-sound/drumstick-0.5.0
deleted file mode 100644
index 9f7fbcd6d0ae..000000000000
--- a/metadata/md5-cache/media-sound/drumstick-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/alsa-lib dev-qt/qtgui:4 dev-qt/qtsvg:4 x11-misc/shared-mime-info dbus? ( dev-qt/qtdbus:4 ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Qt4/C++ wrapper for ALSA sequencer
-EAPI=6
-HOMEPAGE=http://drumstick.sourceforge.net/
-IUSE=dbus doc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib dev-qt/qtgui:4 dev-qt/qtsvg:4 x11-misc/shared-mime-info dbus? ( dev-qt/qtdbus:4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/drumstick/drumstick-0.5.0.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4543c9a656bfad086a33cb0f6d2e6949
diff --git a/metadata/md5-cache/media-sound/drumstick-1.0.2 b/metadata/md5-cache/media-sound/drumstick-1.0.2
deleted file mode 100644
index b0c5a46cfbc7..000000000000
--- a/metadata/md5-cache/media-sound/drumstick-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/pkgconfig x11-misc/shared-mime-info doc? ( app-doc/doxygen app-text/docbook-xsl-stylesheets dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
-DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
-EAPI=6
-HOMEPAGE=http://drumstick.sourceforge.net/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib
-SLOT=0
-SRC_URI=mirror://sourceforge/drumstick/drumstick-1.0.2.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b9a41b1a47727bcbadfd2712240876b
diff --git a/metadata/md5-cache/media-sound/drumstick-1.1.0 b/metadata/md5-cache/media-sound/drumstick-1.1.0
index 75b39b1e5582..f736a5d8f1fd 100644
--- a/metadata/md5-cache/media-sound/drumstick-1.1.0
+++ b/metadata/md5-cache/media-sound/drumstick-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
 EAPI=6
 HOMEPAGE=http://drumstick.sourceforge.net/
 IUSE=doc fluidsynth pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtsvg-5.7:5 >=dev-qt/qtwidgets-5.7:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) pulseaudio? ( media-sound/pulseaudio )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-1.1.0.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6aba57ea024a9a27718c7b17956dcbbb
+_md5_=24a12a80beabdf23e04e515ac7886a89
diff --git a/metadata/md5-cache/media-sound/musique-1.5 b/metadata/md5-cache/media-sound/musique-1.5
index bc02039a78d4..3a6256d1cb55 100644
--- a/metadata/md5-cache/media-sound/musique-1.5
+++ b/metadata/md5-cache/media-sound/musique-1.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst postrm preinst prepare
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/phonon[qt5(+)] media-libs/taglib >=sys-apps/sed-4
 DESCRIPTION=Qt music player
 EAPI=6
-HOMEPAGE=http://flavio.tordini.org/musique
+HOMEPAGE=https://flavio.tordini.org/musique
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/phonon[qt5(+)] media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/flaviotordini/musique/archive/1.5.tar.gz -> musique-1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3ae893fe4ad77faa080f7eb656bc0d6
+_md5_=7e542a7bc3bc6c1ca40eb3b18573b1c2
diff --git a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402 b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
new file mode 100644
index 000000000000..e7880c7a7843
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/taglib sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Simple Qt4 ID3v2 tag editor
+EAPI=6
+HOMEPAGE=https://github.com/DOOMer/qtagger
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/taglib
+SLOT=0
+SRC_URI=https://github.com/DOOMer/qtagger/archive/0e74fe022ddbb689f7bae0460a21be303114029b.tar.gz -> qtagger-1.0.1_p20150402.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12c9f3f81b79e272b4536c1c0d4f052f
diff --git a/metadata/md5-cache/media-sound/traverso-0.49.3 b/metadata/md5-cache/media-sound/traverso-0.49.3
deleted file mode 100644
index cd319053a898..000000000000
--- a/metadata/md5-cache/media-sound/traverso-0.49.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
-DESCRIPTION=Professional Audio Tools for GNU/Linux
-EAPI=6
-HOMEPAGE=http://traverso-daw.org/
-IUSE=alsa debug jack lame lv2 mad pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 )
-SLOT=0
-SRC_URI=http://traverso-daw.org/traverso-0.49.3.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=389ce9a5cc2b6c1ce95176bbed1596be
diff --git a/metadata/md5-cache/media-sound/traverso-0.49.5 b/metadata/md5-cache/media-sound/traverso-0.49.5
new file mode 100644
index 000000000000..1f77b3f2f59e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/traverso-0.49.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Professional Audio Tools for GNU/Linux
+EAPI=6
+HOMEPAGE=https://traverso-daw.org/
+IUSE=alsa debug jack lame lv2 mad pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 )
+SLOT=0
+SRC_URI=https://traverso-daw.org/traverso-0.49.5.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=18da91472ae1eafb62983eb9e40918b7
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 34a4f6d54930..21892dd7a279 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/blind-1.1 b/metadata/md5-cache/media-video/blind-1.1
new file mode 100644
index 000000000000..a7beb451a148
--- /dev/null
+++ b/metadata/md5-cache/media-video/blind-1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=a collection of command line video editing utilities
+EAPI=6
+HOMEPAGE=https://tools.suckless.org/blind/
+KEYWORDS=~amd64
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/blind-1.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=92a5fb163eff0241a9da76ca4801e9b3
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
index d8b4246a3091..d66de2951912 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 m
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.3.9.tar.gz -> simplescreenrecorder-0.3.9.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9372f65fca7635ff130334c3ed57eba
+_md5_=68880901dde3e1ad044a478dfc6ca134
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ef64accbb6db..1508358d558b 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1 b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1
deleted file mode 100644
index f7f6348e84d6..000000000000
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( dev-qt/qthelp:4 dev-python/markdown2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Check websites for broken links
-EAPI=6
-HOMEPAGE=https://github.com/linkcheck/linkchecker
-IUSE=gnome sqlite X python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) X? ( dev-python/PyQt4[X,help,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linkcheck/linkchecker/archive/v9.3.1.tar.gz -> linkchecker-9.3.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2860e9ed3e5d182427ebcbb4f0a62327
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1 b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
new file mode 100644
index 000000000000..a90f2376fe6f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=X? ( dev-qt/qthelp:4 dev-python/markdown2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Check websites for broken links
+EAPI=6
+HOMEPAGE=https://github.com/linkcheck/linkchecker
+IUSE=gnome sqlite X python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) X? ( dev-python/PyQt4[X,help,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linkcheck/linkchecker/archive/v9.3.1.tar.gz -> linkchecker-9.3.1.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4bf7f837c288f0507ed5a6d9ba3b5c4d
diff --git a/metadata/md5-cache/net-analyzer/netcat-110.20180111 b/metadata/md5-cache/net-analyzer/netcat-110.20180111
new file mode 100644
index 000000000000..e5a231a55fe9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netcat-110.20180111
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=the network swiss army knife
+EAPI=5
+HOMEPAGE=http://nc110.sourceforge.net/
+IUSE=ipv6 static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris
+LICENSE=netcat
+SLOT=0
+SRC_URI=mirror://sourceforge/nc110/nc110.20180111.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=d3ff08c121ae1efc4ee377c04b94cea6
diff --git a/metadata/md5-cache/net-analyzer/prometheus-1.8.2 b/metadata/md5-cache/net-analyzer/prometheus-1.8.2
deleted file mode 100644
index edcec98569d8..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-1.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v1.8.2.tar.gz -> prometheus-1.8.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=514b720affab631bb875bb404d92c30a
diff --git a/metadata/md5-cache/net-analyzer/prometheus-2.0.0 b/metadata/md5-cache/net-analyzer/prometheus-2.0.0
deleted file mode 100644
index 16e9ec512c64..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v2.0.0.tar.gz -> prometheus-2.0.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d4aed176a4a8ae59f1d023d09e5c1ad4
diff --git a/metadata/md5-cache/net-analyzer/prometheus-2.0.0-r1 b/metadata/md5-cache/net-analyzer/prometheus-2.0.0-r1
new file mode 100644
index 000000000000..22fa1f8107d1
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-2.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.8
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.0.0.tar.gz -> prometheus-2.0.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3899b1084a983f6ab6702df86ece3584
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 0c4e70eb16dc..496e4ff53d87 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.32-r2 b/metadata/md5-cache/net-dns/avahi-0.6.32-r2
index 008a3679826e..4e96d8991b1f 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.32-r2
+++ b/metadata/md5-cache/net-dns/avahi-0.6.32-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm || ( python_targets_
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.6.32.tar.gz -> avahi-0.6.32.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0e27d7fa90c7f0df025826e414fb96b8
+_md5_=9123b7d4edabe99d3f4bcf5d24cd5f10
diff --git a/metadata/md5-cache/net-dns/avahi-0.7 b/metadata/md5-cache/net-dns/avahi-0.7
index a1e9ce2a5371..f7637da42130 100644
--- a/metadata/md5-cache/net-dns/avahi-0.7
+++ b/metadata/md5-cache/net-dns/avahi-0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.7.tar.gz -> avahi-0.7.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=720b89d209743c4f0cc0322fea1bb27c
+_md5_=fac749ad7eb3da4668888f9f73a15982
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.4 b/metadata/md5-cache/net-dns/libidn2-2.0.4
index aad151e85cd4..61ce90df57de 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.0.4
+++ b/metadata/md5-cache/net-dns/libidn2-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn2-2.0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2eb0ea0a07f7a7e2ecab6beaef2f8489
+_md5_=72b2cdffb6550a5a357ac84caa94e4ce
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 25440bece542..a0663fe945ce 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/pure-ftpd-1.0.45-r1 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r1
deleted file mode 100644
index 394699994f05..000000000000
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
-DESCRIPTION=Fast, production-quality, standard-conformant FTP server
-EAPI=6
-HOMEPAGE=http://www.pureftpd.org/
-IUSE=anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
-REQUIRED_USE=implicittls? ( ssl )
-SLOT=0
-SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.45.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.45.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de5f6e1aa8427d005106e4803d6ea0c8
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r2 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r2
new file mode 100644
index 000000000000..4ee8ae9065b4
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
+DESCRIPTION=Fast, production-quality, standard-conformant FTP server
+EAPI=6
+HOMEPAGE=http://www.pureftpd.org/
+IUSE=anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
+REQUIRED_USE=implicittls? ( ssl )
+SLOT=0
+SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.45.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.45.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=60d6a3c6dfd5e7dbde264843b84d82ad
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.46 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.46
deleted file mode 100644
index ae417e277dd5..000000000000
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
-DESCRIPTION=Fast, production-quality, standard-conformant FTP server
-EAPI=6
-HOMEPAGE=http://www.pureftpd.org/
-IUSE=anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
-REQUIRED_USE=implicittls? ( ssl )
-SLOT=0
-SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.46.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.46.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b47d0b12333a62e3cfba14c91de0aaf1
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.47-r1 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.47-r1
new file mode 100644
index 000000000000..6a3b18e2d7e7
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.47-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
+DESCRIPTION=Fast, production-quality, standard-conformant FTP server
+EAPI=6
+HOMEPAGE=http://www.pureftpd.org/
+IUSE=anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
+REQUIRED_USE=implicittls? ( ssl )
+SLOT=0
+SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=724c563425a36ef43c6cc6a46903a88e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 8d47bf9a63ac..76ddcc22a787 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/skypeforlinux-8.13.0.2 b/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2
new file mode 100644
index 000000000000..6c52e0cbdbf5
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=6
+HOMEPAGE=https://www.skype.com/
+IUSE=pax_kernel abi_x86_64
+KEYWORDS=~amd64 -*
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.13.0.2-1.x86_64.rpm
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8523b4dae203741adc033ffdefb59aee
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 20b3cdc9a98c..28463be966d0 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/ccnet-6.1.4 b/metadata/md5-cache/net-libs/ccnet-6.1.4
new file mode 100644
index 000000000000..bd4216625ae5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/ccnet-6.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_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/glib-2.16.0:2 >=dev-libs/libevent-2.0 dev-libs/openssl:0= dev-db/sqlite:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Ccnet is a framework for writing networked applications in C
+EAPI=6
+HOMEPAGE=https://github.com/haiwen/ccnet http://seafile.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+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(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_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/glib-2.16.0:2 >=dev-libs/libevent-2.0 dev-libs/openssl:0= dev-db/sqlite:3
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/haiwen/ccnet/archive/v6.1.4.tar.gz -> ccnet-6.1.4.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67
+_md5_=dea44a9f949276570e40c46ed603ba35
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.15 b/metadata/md5-cache/net-libs/gnutls-3.5.15
index 1650fa78ca23..0da5e9c4ef10 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.15
@@ -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 ~sparc-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 ~sparc-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 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.15.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b6fb07127efe8036ad6a0bd1cc0462e4
+_md5_=677392874acccf5411a4d5acca650a2c
diff --git a/metadata/md5-cache/net-libs/libbtbb-2015.10.1 b/metadata/md5-cache/net-libs/libbtbb-2015.10.1
deleted file mode 100644
index 271aacf27c6a..000000000000
--- a/metadata/md5-cache/net-libs/libbtbb-2015.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=pcap? ( net-libs/libpcap ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= !>net-analyzer/wireshark-1.98 ) wireshark-plugins? ( dev-libs/glib virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A library to decode Bluetooth baseband packets
-EAPI=5
-HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=+pcap +wireshark-plugins
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=pcap? ( net-libs/libpcap ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= !>net-analyzer/wireshark-1.98 )
-SLOT=0/2015.10.1
-SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2015-10-R1.tar.gz -> libbtbb-2015-10-R1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05e3408c2c1f27d7771209f18b244719
diff --git a/metadata/md5-cache/net-libs/libnsl-0 b/metadata/md5-cache/net-libs/libnsl-0
index 5974943a4861..9dc0972f9132 100644
--- a/metadata/md5-cache/net-libs/libnsl-0
+++ b/metadata/md5-cache/net-libs/libnsl-0
@@ -3,8 +3,8 @@ DEPEND=elibc_glibc? ( <sys-libs/glibc-2.26 )
 DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/libnsl
-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=LGPL-2.1+
 RDEPEND=elibc_glibc? ( <sys-libs/glibc-2.26 )
 SLOT=0/1
-_md5_=1cbddd72ea06d5368bc1c874b06130eb
+_md5_=d148399fe6a04dbaa7c2cf525dc52fec
diff --git a/metadata/md5-cache/net-libs/libssh2-1.7.0 b/metadata/md5-cache/net-libs/libssh2-1.7.0
index cd925fef69c2..ec4845db179c 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.7.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=5
 HOMEPAGE=http://www.libssh2.org/
 IUSE=gcrypt libressl static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!gcrypt? ( !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(-)?] ) ) gcrypt? ( >=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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.7.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=658ffd708f3654799977a4c2dd8e8ffc
+_md5_=9eb66800be18808cf278cfa8bea64e26
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
new file mode 100644
index 000000000000..f933faa60f49
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=http://www.webkitgtk.org/
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.5.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3bd5fd18205f8be1cbf9ee2406224f4b
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b9e4659d4bf8..b8f8301be329 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/curl-7.57.0 b/metadata/md5-cache/net-misc/curl-7.57.0
index 317e5eab2cac..3e0e463e5510 100644
--- a/metadata/md5-cache/net-misc/curl-7.57.0
+++ b/metadata/md5-cache/net-misc/curl-7.57.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.57.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=23caab7c23b830ed95b24b69baec3ee9
+_md5_=9bfffb1f425328733b0c09bb73d572d0
diff --git a/metadata/md5-cache/net-misc/dropbear-2017.75 b/metadata/md5-cache/net-misc/dropbear-2017.75
new file mode 100644
index 000000000000..201aeb612463
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbear-2017.75
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) static? ( zlib? ( sys-libs/zlib[static-libs(+)] ) dev-libs/libtommath[static-libs(+)] )
+DESCRIPTION=small SSH 2 client/server designed for small memory environments
+EAPI=5
+HOMEPAGE=http://matt.ucc.asn.au/dropbear/dropbear.html
+IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
+REQUIRED_USE=pam? ( !static )
+SLOT=0
+SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=57850a7b86d499c027b39624a5f3a654
diff --git a/metadata/md5-cache/net-misc/electrum-2.7.15 b/metadata/md5-cache/net-misc/electrum-2.7.15
deleted file mode 100644
index ac39386ed9ec..000000000000
--- a/metadata/md5-cache/net-misc/electrum-2.7.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=5
-HOMEPAGE=https://electrum.org/
-IUSE=cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_vi l10n_zh-CN python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/ecdsa[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jsonrpclib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbkdf2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PySocks[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qrcode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/slowaes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tlslite[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] qrcode? ( media-gfx/zbar[python,v4l,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( dev-lang/python ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( cli ncurses qt4 ) cosign? ( qt4 ) email? ( qt4 ) greenaddress_it? ( qt4 ) qrcode? ( qt4 ) sync? ( qt4 ) trustedcoin_com? ( qt4 ) vkb? ( qt4 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://download.electrum.org/2.7.15/Electrum-2.7.15.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7dda377b5467c79a498a83a9679f307c
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.3 b/metadata/md5-cache/net-misc/electrum-3.0.3
deleted file mode 100644
index 59d334e1faba..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonrpclib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbkdf2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyaes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PySocks[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tlslite[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/protobuf-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/protobuf[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) virtual/python-dnspython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.0.3/Electrum-3.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0aad590986be3f03cc9ba46dd81aeef1
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.5 b/metadata/md5-cache/net-misc/electrum-3.0.5
index 494c7343c5f6..3c70bd03b751 100644
--- a/metadata/md5-cache/net-misc/electrum-3.0.5
+++ b/metadata/md5-cache/net-misc/electrum-3.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=User friendly Bitcoin client
 EAPI=6
 HOMEPAGE=https://electrum.org/
 IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonrpclib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbkdf2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyaes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PySocks[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tlslite[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/protobuf-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/protobuf[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) virtual/python-dnspython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.0.5/Electrum-3.0.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0aad590986be3f03cc9ba46dd81aeef1
+_md5_=ecc3003c4a6e7ca0b26bed85428e951f
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r3 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r3
index cff72aaa90f4..af0f42fc9dd9 100644
--- a/metadata/md5-cache/net-misc/openssh-7.5_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-7.5_p1-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !p
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.2/openssh-7.5p1+x509-10.2.diff.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6c2b7004999f59a5126bf4c2ed64cca8
+_md5_=f13ae20d72279cd5eb2c8f9f4142e206
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.2-r1 b/metadata/md5-cache/net-misc/rsync-3.1.2-r1
index 00463f641546..8feed0040922 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.2-r1
+++ b/metadata/md5-cache/net-misc/rsync-3.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=6
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6649bc2b7dd3699d6ac1a494e569db13
+_md5_=e7fc71f15c1e49a66d05866e7eae21a4
diff --git a/metadata/md5-cache/net-misc/seafile-6.1.4 b/metadata/md5-cache/net-misc/seafile-6.1.4
new file mode 100644
index 000000000000..2c8d08f6069e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-6.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] =net-libs/ccnet-6.1.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_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/glib-2.16.0:2 >=dev-libs/libevent-2.0 >=dev-libs/jansson-2.2.1 >=sys-libs/zlib-1.2.0 >=net-misc/curl-7.17 dev-libs/openssl:0= dev-db/sqlite:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=File syncing and sharing software with file encryption and group sharing
+EAPI=6
+HOMEPAGE=https://github.com/haiwen/seafile/ http://www.seafile.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+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(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] =net-libs/ccnet-6.1.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_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/glib-2.16.0:2 >=dev-libs/libevent-2.0 >=dev-libs/jansson-2.2.1 >=sys-libs/zlib-1.2.0 >=net-misc/curl-7.17 dev-libs/openssl:0= dev-db/sqlite:3
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile/archive/v6.1.4.tar.gz -> seafile-6.1.4.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67
+_md5_=b43f920c6abd14f7b97222f536fe548a
diff --git a/metadata/md5-cache/net-misc/seafile-client-6.1.4 b/metadata/md5-cache/net-misc/seafile-client-6.1.4
new file mode 100644
index 000000000000..daf94ae03464
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-client-6.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libsearpc =net-libs/ccnet-6.1.4 =net-misc/seafile-6.1.4 >=dev-libs/libevent-2.0 >=dev-libs/jansson-2.0 dev-libs/openssl:0= dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) ) dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Seafile desktop client
+EAPI=6
+HOMEPAGE=https://github.com/haiwen/seafile-client/ http://www.seafile.com/
+IUSE=shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=net-libs/libsearpc =net-libs/ccnet-6.1.4 =net-misc/seafile-6.1.4 >=dev-libs/libevent-2.0 >=dev-libs/jansson-2.0 dev-libs/openssl:0= dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile-client/archive/v6.1.4.tar.gz -> seafile-client-6.1.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d099408840a7df0cd803cafb7aa36c14
diff --git a/metadata/md5-cache/net-misc/unison-2.48.3 b/metadata/md5-cache/net-misc/unison-2.48.3
deleted file mode 100644
index a57e1cbf6691..000000000000
--- a/metadata/md5-cache/net-misc/unison-2.48.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?] gtk? ( >=dev-ml/lablgtk-2.2 ) test? ( || ( dev-util/ctags virtual/emacs ) )
-DESCRIPTION=Two-way cross-platform file synchronizer
-EAPI=5
-HOMEPAGE=http://www.cis.upenn.edu/~bcpierce/unison/
-IUSE=gtk doc static debug threads +ocamlopt test
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=gtk? ( >=dev-ml/lablgtk-2.2 || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) !net-misc/unison:0 app-eselect/eselect-unison
-SLOT=2.48
-SRC_URI=http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.3/unison-2.48.3.tar.gz doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.3/unison-2.48.3-manual.pdf http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.3/unison-2.48.3-manual.html )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=09b55a59ed4ee9eee6acb12f1a2f8530
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.12.23 b/metadata/md5-cache/net-misc/youtube-dl-2017.12.23
deleted file mode 100644
index ddb9fefbd05d..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.12.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.12.23/youtube-dl-2017.12.23.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc65130309857818b981580dd61fc4e3
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.01.07 b/metadata/md5-cache/net-misc/youtube-dl-2018.01.07
new file mode 100644
index 000000000000..edda1ad81728
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.01.07
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2018.01.07/youtube-dl-2018.01.07.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c95d17b3ee9606122fbffdd9f9be4467
diff --git a/metadata/md5-cache/perl-core/File-Path-2.130.0 b/metadata/md5-cache/perl-core/File-Path-2.130.0
index a9588c657f0f..577583016e94 100644
--- a/metadata/md5-cache/perl-core/File-Path-2.130.0
+++ b/metadata/md5-cache/perl-core/File-Path-2.130.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=File path and name utilities
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-Path/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.13.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=eb6581d312521ecf560b0a83bc5ac2ec
+_md5_=f12ba62e4d0dbfadd38930e428d41b86
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index b16561c44336..f51e83f6de55 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index b7cdfa0a2ed3..fdaf51332b8f 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/eagle-7.7.0 b/metadata/md5-cache/sci-electronics/eagle-7.7.0
new file mode 100644
index 000000000000..e34944e09e7b
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/eagle-7.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=CadSoft EAGLE schematic and printed circuit board (PCB) layout editor
+EAPI=6
+HOMEPAGE=http://www.cadsoft.de
+IUSE=doc
+KEYWORDS=~amd64 ~x86 -*
+LICENSE=cadsoft-2
+RDEPEND=sys-libs/glibc dev-libs/openssl:0 >=sys-libs/zlib-1.2.8-r1 >=media-libs/freetype-2.5.0.1 >=media-libs/fontconfig-2.10.92 x11-libs/libXext x11-libs/libX11 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXi-1.7.2 net-print/cups x11-libs/libxcb
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=x86? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-7.7.0.run ) amd64? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-7.7.0.run )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=54a5e867461a504da7ad10fe783762bf
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 0c838c7cb7a8..30b671845fb7 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-r1 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r1
deleted file mode 100644
index 487f6864b4be..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare
-DEPEND=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(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=5
-HOMEPAGE=http://catb.org/gpsd/
-IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-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
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afc626a8f2a187e5e1ac2b5c70cbecf0
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
new file mode 100644
index 000000000000..f32dac7b890c
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare
+DEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1
+DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
+EAPI=5
+HOMEPAGE=http://catb.org/gpsd/
+IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
+SLOT=0/23
+SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e66aeba0a5f9cff4396f83fab4f83936
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a26357818d21..f9705c2e86f3 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/fftw-9999 b/metadata/md5-cache/sci-libs/fftw-9999
index 1e88827c18e3..c26aba15c598 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-lang/perl ) dev-ml/ocamlbuild fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-lang/perl ) dev-ml/ocamlbuild doc? ( media-gfx/transfig ) fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=6
 HOMEPAGE=http://www.fftw.org/
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
 SLOT=3.0/3
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9640ad3f953b02cdb9b863f29df1849e
+_md5_=56bc5b748b634568f227795081289f05
diff --git a/metadata/md5-cache/sci-libs/indilib-1.3.1 b/metadata/md5-cache/sci-libs/indilib-1.3.1
deleted file mode 100644
index 8fcb1c292111..000000000000
--- a/metadata/md5-cache/sci-libs/indilib-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl sci-libs/cfitsio sci-libs/gsl sci-libs/libnova sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-kernel/linux-headers sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
-DESCRIPTION=INDI Astronomical Control Protocol library
-EAPI=6
-HOMEPAGE=http://www.indilib.org/
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=net-misc/curl sci-libs/cfitsio sci-libs/gsl sci-libs/libnova sys-libs/zlib virtual/jpeg:0 virtual/libusb:0
-SLOT=0/1
-SRC_URI=mirror://sourceforge/indi/indi-1.3.1.zip
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f612c086c7e2939452b172eabdff4bdf
diff --git a/metadata/md5-cache/sci-libs/indilib-1.6.0 b/metadata/md5-cache/sci-libs/indilib-1.6.0
new file mode 100644
index 000000000000..829a21f09c97
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/indilib-1.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib:= virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) sys-kernel/linux-headers test? ( dev-cpp/gmock dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DESCRIPTION=INDI Astronomical Control Protocol library
+EAPI=6
+HOMEPAGE=http://www.indilib.org/
+IUSE=ogg test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib:= virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora )
+SLOT=0/1
+SRC_URI=https://github.com/indilib/indi/releases/download/v1.6.0/libindi_1.6.0.tar.gz -> indilib-1.6.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=171fd3022f8de7f52d2e626806fbf1a6
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index fba8ed159be1..27142d24821e 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/vitables-2.1-r1 b/metadata/md5-cache/sci-misc/vitables-2.1-r1
deleted file mode 100644
index d415b61deb34..000000000000
--- a/metadata/md5-cache/sci-misc/vitables-2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytables[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx ) python_targets_python2_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 graphical tool for browsing / editing files in both PyTables and HDF5 formats
-EAPI=6
-HOMEPAGE=http://vitables.org/
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-python/pytables[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vitables/ViTables-2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7280bfb36782b184d2c0f9617f1f640
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 8672b9378387..3325ab0e733f 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.03 b/metadata/md5-cache/sci-physics/geant-4.10.03
deleted file mode 100644
index 497723676b89..000000000000
--- a/metadata/md5-cache/sci-physics/geant-4.10.03
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) inventor? ( media-libs/SoXt ) qt4? ( dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) zlib? ( sys-libs/zlib ) prefix? ( app-shells/tcsh ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Toolkit for simulation of passage of particles through matter
-EAPI=6
-HOMEPAGE=http://geant4.cern.ch/
-IUSE=+data dawn doc examples gdml geant3 inventor motif opengl raytracerx qt4 static-libs vrml zlib threads
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=geant4
-PDEPEND=data? ( ~sci-physics/geant-data-4.10.03 ) doc? ( ~app-doc/geant-docs-4.10.03 )
-RDEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) inventor? ( media-libs/SoXt ) qt4? ( dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) zlib? ( sys-libs/zlib )
-SLOT=4
-SRC_URI=http://geant4.cern.ch/support/source/geant4.10.03.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76444fc8a0334b86a22785176cd135c2
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.03-r1 b/metadata/md5-cache/sci-physics/geant-4.10.03-r1
new file mode 100644
index 000000000000..a438b1941956
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/geant-4.10.03-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) zlib? ( sys-libs/zlib ) prefix? ( app-shells/tcsh ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Toolkit for simulation of passage of particles through matter
+EAPI=6
+HOMEPAGE=http://geant4.cern.ch/
+IUSE=+data dawn doc examples gdml geant3 inventor motif opengl qt5 raytracerx static-libs threads vrml zlib
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=geant4
+PDEPEND=data? ( ~sci-physics/geant-data-4.10.03 ) doc? ( ~app-doc/geant-docs-4.10.03 )
+RDEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) zlib? ( sys-libs/zlib )
+SLOT=4
+SRC_URI=http://geant4.cern.ch/support/source/geant4.10.03.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e82a46ddfdd425cc92a149410df4dfcd
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index b0c134aacdc9..27942a199bdd 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.2.2 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
index e20df1f27c3d..ff0a66b00399 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
@@ -3,11 +3,11 @@ DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:
 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 svga wxwidgets X
+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
 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	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=49cce115908222e3cec1232d3a400316
+_md5_=00c4eea04926da739d097a5fd28707ca
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ae5285a76915..1aee7d9dab6e 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/baselayout-2.4.1-r2 b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
index 58d0c14e46f5..08ec422a9d5f 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 IUSE=build kernel_linux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=754c4f037f679572e19ad5fa1e7a8177
+_md5_=edd18a21faea0529687209d0ebf5f7a3
diff --git a/metadata/md5-cache/sys-apps/colorized-logs-2.1 b/metadata/md5-cache/sys-apps/colorized-logs-2.1
index 244aab8ae33b..9f568230ffe8 100644
--- a/metadata/md5-cache/sys-apps/colorized-logs-2.1
+++ b/metadata/md5-cache/sys-apps/colorized-logs-2.1
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Tools for logs with ANSI color
 EAPI=6
 HOMEPAGE=https://github.com/kilobyte/colorized-logs/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kilobyte/colorized-logs/archive/v2.1.tar.gz -> colorized-logs-2.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32e4ebcba5d730e70480ab37e08cf696
+_md5_=f6cf3f8cf8f5217b8551d061982239f8
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.0 b/metadata/md5-cache/sys-apps/fwupd-1.0.0
deleted file mode 100644
index b806c92c9109..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) elf? ( virtual/libelf:0= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=6
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc elf +man systemd test uefi uefi_labels python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) elf? ( virtual/libelf:0= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
-REQUIRED_USE=dell? ( uefi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.0.tar.gz -> fwupd-1.0.0.tar.gz
-_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc5c8d8ac8568608800ff1b17fe37f41
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.1 b/metadata/md5-cache/sys-apps/fwupd-1.0.1
deleted file mode 100644
index 98a6257946b0..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) elf? ( virtual/libelf:0= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=6
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc elf +man systemd test uefi uefi_labels python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) elf? ( virtual/libelf:0= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
-REQUIRED_USE=dell? ( uefi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.1.tar.gz -> fwupd-1.0.1.tar.gz
-_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cc5c8d8ac8568608800ff1b17fe37f41
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.3 b/metadata/md5-cache/sys-apps/fwupd-1.0.3
new file mode 100644
index 000000000000..8e229c289c46
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=6
+HOMEPAGE=https://fwupd.org
+IUSE=colorhug dell doc gpg +man systemd test uefi uefi_labels python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
+REQUIRED_USE=dell? ( uefi )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.3.tar.gz -> fwupd-1.0.3.tar.gz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=44bd5638cd0c2e09e03019e6e0c0261a
diff --git a/metadata/md5-cache/sys-apps/hwids-20170328 b/metadata/md5-cache/sys-apps/hwids-20170328
index 95945bc91007..363f8135066a 100644
--- a/metadata/md5-cache/sys-apps/hwids-20170328
+++ b/metadata/md5-cache/sys-apps/hwids-20170328
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/hwids
 IUSE=+net +pci +udev +usb
-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
+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
 LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20170328.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=29d0e1a7a4c23f03504cd8af3b5f8b2f
+_md5_=def9f50dc80fc5fad12e9bda234ca021
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4 b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
index d45819618603..2b48b4a8956d 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
+++ b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
@@ -4,9 +4,9 @@ DESCRIPTION=Linux Key Management Utilities
 EAPI=5
 HOMEPAGE=https://people.redhat.com/dhowells/keyutils/
 IUSE=static 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 ~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 LGPL-2.1
 SLOT=0
 SRC_URI=https://people.redhat.com/dhowells/keyutils/keyutils-1.5.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0c5368a4871c12c50a7efd084effd80b
+_md5_=11e87cdd6256f04b79e6f1adc5deec4d
diff --git a/metadata/md5-cache/sys-apps/kmod-24 b/metadata/md5-cache/sys-apps/kmod-24
index 8325f01237fd..2a9f0d422cc2 100644
--- a/metadata/md5-cache/sys-apps/kmod-24
+++ b/metadata/md5-cache/sys-apps/kmod-24
@@ -4,7 +4,7 @@ DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-24.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aefec48c64e4ef50b2627c69e9e704db
+_md5_=0d750340900a7b027a25e514cc5f8155
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.11 b/metadata/md5-cache/sys-apps/openrc-0.34.11
index 453e8a1fd051..96896bf2e89d 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.34.11
+++ b/metadata/md5-cache/sys-apps/openrc-0.34.11
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.34.11.tar.gz -> openrc-0.34.11.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e56481e42f62e7a42948b7cd4b1801a6
+_md5_=21a58d833b1b86ddd087827c058a5336
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.23 b/metadata/md5-cache/sys-apps/razercfg-0.23
deleted file mode 100644
index 8acbbfeb6116..000000000000
--- a/metadata/md5-cache/sys-apps/razercfg-0.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst 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(+)] pm-utils? ( sys-power/pm-utils ) qt4? ( dev-python/PyQt4 ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
-DESCRIPTION=Utility for advanced configuration of Razer mice (DeathAdder, Krait, Lachesis)
-EAPI=5
-HOMEPAGE=http://bues.ch/cms/hacking/razercfg.html
-IUSE=+pm-utils qt4 python_targets_python2_7
-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(+)] pm-utils? ( sys-power/pm-utils ) qt4? ( dev-python/PyQt4 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://bues.ch/razercfg/razercfg-0.23.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b26b4a68e6e8ddb0762cd87a5ff88b37
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.39 b/metadata/md5-cache/sys-apps/razercfg-0.39
deleted file mode 100644
index 59a0b292f237..000000000000
--- a/metadata/md5-cache/sys-apps/razercfg-0.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=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(+)?] virtual/pkgconfig dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
-DESCRIPTION=Utility for advanced configuration of Razer mice
-EAPI=6
-HOMEPAGE=http://bues.ch/cms/hacking/razercfg.html
-IUSE=+pm-utils qt4 systemd +udev python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] qt4? ( >=dev-python/pyside-1.2.1[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(+)?] ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) pm-utils? ( sys-power/pm-utils ) virtual/libusb:1
-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=http://bues.ch/razercfg/razercfg-0.39.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e3bf621a20126d3abbff0d0cfc30887
diff --git a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016 b/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016
deleted file mode 100644
index e5ae391299d0..000000000000
--- a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/os-headers
-DESCRIPTION=Preloads files into the page cache to accelerate program loading
-EAPI=0
-HOMEPAGE=http://www.orbis-terrarum.net
-IUSE=doc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/readahead-list-1.20060421.1016.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de834f1e47e852f0dab208cd224d2d44
diff --git a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r1 b/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r1
deleted file mode 100644
index bd923fe44a1a..000000000000
--- a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/os-headers
-DESCRIPTION=Preloads files into the page cache to accelerate program loading
-EAPI=0
-HOMEPAGE=http://www.orbis-terrarum.net
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/readahead-list-1.20060421.1016.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d434d425d57388210b95d3d946b5b311
diff --git a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r2 b/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r2
deleted file mode 100644
index 1bc000388285..000000000000
--- a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=virtual/os-headers
-DESCRIPTION=Preloads files into the page cache to accelerate program loading
-EAPI=6
-HOMEPAGE=http://www.orbis-terrarum.net
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/readahead-list-1.20060421.1016.tar.bz2
-_md5_=4f4db75cfdf917dfa524f910a008e721
diff --git a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r3 b/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r3
index 3ff59c80c9c9..b122c522c11f 100644
--- a/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r3
+++ b/metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install postinst
 DEPEND=virtual/os-headers
 DESCRIPTION=Preloads files into the page cache to accelerate program loading
 EAPI=6
-HOMEPAGE=http://www.orbis-terrarum.net
+HOMEPAGE=https://github.com/robbat2/readahead-list
 IUSE=doc
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/readahead-list-1.20060421.1016.tar.bz2
-_md5_=48c2271a0a27616087404ac711681600
+_md5_=58567cb9f17d79203b513ad2f9fbcc24
diff --git a/metadata/md5-cache/sys-apps/s390-tools-1.36.1 b/metadata/md5-cache/sys-apps/s390-tools-1.36.1
index 71ee1063f24c..dfed2b13f76b 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-1.36.1
+++ b/metadata/md5-cache/sys-apps/s390-tools-1.36.1
@@ -4,10 +4,10 @@ DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device
 EAPI=5
 HOMEPAGE=http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
 IUSE=fuse ncurses pfm snmp zlib
-KEYWORDS=-* ~s390
+KEYWORDS=-* s390
 LICENSE=GPL-2
 RDEPEND=fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-1.36.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=3710d3fd296d495a1ef817ba1879ab12
+_md5_=1d0f110f4a835fbadeadc5ff115ba861
diff --git a/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1 b/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1
new file mode 100644
index 000000000000..696792e7be3e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s390-tools-1.36.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib ) >=sys-apps/util-linux-2.30 dev-util/indent app-admin/genromfs virtual/pkgconfig
+DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device drivers
+EAPI=5
+HOMEPAGE=http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
+IUSE=fuse ncurses pfm snmp zlib
+KEYWORDS=-* s390
+LICENSE=GPL-2
+RDEPEND=fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib ) >=sys-apps/util-linux-2.30
+SLOT=0
+SRC_URI=http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-1.36.1.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=2b51ed7f62b2a3e890285245cdf1ebd1
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.2.0 b/metadata/md5-cache/sys-apps/s390-tools-2.2.0
new file mode 100644
index 000000000000..7acdf04dde7c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib ) dev-util/indent app-admin/genromfs virtual/pkgconfig
+DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device drivers
+EAPI=5
+HOMEPAGE=https://www.ibm.com/developerworks/linux/linux390/s390-tools.html
+IUSE=fuse ncurses pfm snmp zlib
+KEYWORDS=-* ~s390
+LICENSE=GPL-2 MIT
+RDEPEND=fuse? ( sys-fs/fuse:= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.2.0.tar.gz -> s390-tools-2.2.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=9cb35816477a1a9dd66cfce2e94e0b17
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r4 b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
index 82cf155652a3..a9560dd5e736 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r4
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3a2ccbc59d7030a7c83b724790a0cdaf
+_md5_=25fbfa75cbe6c6b7da1bd59c8a69d63d
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.12 b/metadata/md5-cache/sys-apps/sandbox-2.12
index 5b271b682cd9..ca6e028ac905 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.12
+++ b/metadata/md5-cache/sys-apps/sandbox-2.12
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f8d22b77fee93402f91b14fec392dff4
+_md5_=1c183a7ddd2fdde622772bb3461de120
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
index 9a4120f0ebc9..488444263062 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A code-searching tool similar to ack, but faster
 EAPI=6
 HOMEPAGE=https://github.com/ggreer/the_silver_searcher
 IUSE=lzma test zlib
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/2.1.0.tar.gz -> the_silver_searcher-2.1.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a2465d0727e864cf408bb9fa4d7f46fe
+_md5_=fab771281601d47efb6b6d8fa9c41ee5
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.30.2 b/metadata/md5-cache/sys-apps/util-linux-2.30.2
index 9eec56a60dfd..0922478bf39d 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.30.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.30.2
@@ -4,11 +4,11 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.30/util-linux-2.30.2.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c19137fc3c811b39d809be867395c957
+_md5_=75dc42128fbebb8dcba609f788412927
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 9712fc0f6db6..644512ce4f16 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/pambase-20150213-r1 b/metadata/md5-cache/sys-auth/pambase-20150213-r1
index aa1534ef8513..c76117cbf6d7 100644
--- a/metadata/md5-cache/sys-auth/pambase-20150213-r1
+++ b/metadata/md5-cache/sys-auth/pambase-20150213-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PAM base configuration files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( sys-auth/consolekit[pam] ) cracklib? ( sys-libs/pam[cracklib] ) elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) sys-auth/pam_krb5 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( sys-auth/pam_passwdqc ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( sys-apps/systemd[pam] )
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vapier/dist/pambase-20150213.tar.xz
-_md5_=524b61c5075c053d8c2064170ba3802e
+_md5_=9bb3fb230d664785daa20883f2047616
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index eb053246c832..d07d8bd22a99 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/heat-8.0.5 b/metadata/md5-cache/sys-cluster/heat-8.0.5
deleted file mode 100644
index 12d1a4125e21..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-8.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
-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-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/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/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.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/cryptography-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/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-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/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-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-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.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-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.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/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-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-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-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-cinderclient-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/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.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-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-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/python-novaclient-6.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-novaclient-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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.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.12.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-1.12.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/routes-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/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[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.0[python_targets_python2_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 >=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.0[python_targets_python2_7(-)?,python_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.9.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/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/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/heat/heat-8.0.5.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-8.0.5
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09d29f911bb2cfc3f9e51befa6b909db
diff --git a/metadata/md5-cache/sys-cluster/heat-8.0.6 b/metadata/md5-cache/sys-cluster/heat-8.0.6
index bf7098ae661a..6dbf5e3ec0f3 100644
--- a/metadata/md5-cache/sys-cluster/heat-8.0.6
+++ b/metadata/md5-cache/sys-cluster/heat-8.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration eng
 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
+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/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/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.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/cryptography-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/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-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/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-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-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.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-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.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/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-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-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-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-cinderclient-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/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.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-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-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/python-novaclient-6.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-novaclient-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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.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.12.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-1.12.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/routes-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/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[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.0[python_targets_python2_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 >=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.0[python_targets_python2_7(-)?,python_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.9.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/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/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/heat/heat-8.0.6.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-8.0.6
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aa68dcf4165788b8e904737e5fdc47d
+_md5_=627054cde1808dd07816aa2f63d63c26
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.1 b/metadata/md5-cache/sys-cluster/heat-9.0.1
deleted file mode 100644
index eb9d0e6097d4..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-9.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
-EAPI=6
-HOMEPAGE=https://launchpad.net/heat
-IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstacksdk-0.9.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zunclient-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.1 https://tarballs.openstack.org/heat/heat-9.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70ca5657faa26782d428b63aad9b1eaf
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.2 b/metadata/md5-cache/sys-cluster/heat-9.0.2
index fddeb31eaa0b..bb00dc448e2b 100644
--- a/metadata/md5-cache/sys-cluster/heat-9.0.2
+++ b/metadata/md5-cache/sys-cluster/heat-9.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration eng
 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
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstacksdk-0.9.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-9.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zunclient-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.2 https://tarballs.openstack.org/heat/heat-9.0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36e727f1f57a149d4ea8dbbebe7fa9c6
+_md5_=07ccedbb18b82b6f9def28c1f7ad4134
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.6
new file mode 100644
index 000000000000..26831f705d4b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=010afc94b1b18e3734e4de2943afecff
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 8d06ce64b169..4421ce7bb2d8 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.69-r4 b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
index 387979d1232d..904a4b893e78 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69-r4
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.69:2.5 >=sys-devel/autoconf-wrapper-13
 SLOT=2.69
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b26f7774769f50c019ed2f0ef756dbff
+_md5_=912d500e408c9cc22f74b7c3725a7767
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r1 b/metadata/md5-cache/sys-devel/automake-1.15.1-r1
index acb31ce94ac9..7883611e3909 100644
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.15.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:*
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.15
 SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a478e88ede19265c569b7ff10d814bef
+_md5_=a6d2fc3950c9fb2239703cbb309b9d76
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index 23b34bfff9f8..3fef57fce851 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
 RESTRICT=strip
 SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	b818258ab006ded1bea3c3d24e013b8a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=73b1d6adcadd34b6a8566b65d67b13dd
+_md5_=2c051e9cf5eb44aa3fdb596e4e1c7c83
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
index 4ed91ab7a32c..849d87dc512b 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.7.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.8.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	b818258ab006ded1bea3c3d24e013b8a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d57a9d54753f16fb05e0ccbfb47101d7
+_md5_=8b617c83460b0f4d7d4b401964f7e6fd
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
index 7578855e27d5..c857cfc1b9db 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -4,11 +4,12 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=6.4.0
-SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	b818258ab006ded1bea3c3d24e013b8a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=50e729d769b9484e5e6c59c28d187226
+_md5_=2a53738027857f42fd76e2ce3d4ad3b6
diff --git a/metadata/md5-cache/sys-devel/gcc-7.2.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.2.0-r1
index 8e41fa44512a..58ca6e794afc 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.2.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.2.0-r1
@@ -4,6 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
@@ -11,4 +12,4 @@ RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.2.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	b818258ab006ded1bea3c3d24e013b8a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=aef90c992147fe34ae93bb130c5cd5da
+_md5_=ff8f2926e26d1aa4a4d1ad0074723605
diff --git a/metadata/md5-cache/sys-devel/gdb-7.12.1 b/metadata/md5-cache/sys-devel/gdb-7.12.1
index a7392b2b4432..b6025fbc3170 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.12.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU debugger
 EAPI=5
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=+client lzma multitarget nls +python +server test vanilla xml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=-alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=server? ( !dev-util/gdbserver ) client? ( >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) || ( client server )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-7.12.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c068c147592569bef1f87ca46c42139a
+_md5_=9d985aa1fa6160874cf81cd246915db5
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r2 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
index e0135a4d504e..70ec365b9d89 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 app-arch/xz-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
+DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4 app-arch/xz-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
 DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
+RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=89ebcf333516c5773ded91c6c0559e71
+_md5_=4f23913a77871b628590e5efacb67228
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
index cca62b2eeb00..cbde7a87d6fa 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 app-arch/xz-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
+DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4 app-arch/xz-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
 DESCRIPTION=A shared library tool for developers
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
+RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=0c3af51686e3b5ab531ddd95698b0707
+_md5_=fb0d107d729b5b77f7e5b5b00efb054f
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
index 02c055030d49..dfa55cf5765d 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 app-arch/xz-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
+DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4 app-arch/xz-utils >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
 DESCRIPTION=A shared library tool for developers
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
-RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
+RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=0663ad8f1790d54f05c1108af9d871e4
+_md5_=bb40d83754c861e0ec8621f8ef8e7388
diff --git a/metadata/md5-cache/sys-devel/libtool-9999 b/metadata/md5-cache/sys-devel/libtool-9999
index ce400707c7e5..4ee11ec77572 100644
--- a/metadata/md5-cache/sys-devel/libtool-9999
+++ b/metadata/md5-cache/sys-devel/libtool-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 app-arch/xz-utils sys-apps/help2man >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4 app-arch/xz-utils sys-apps/help2man >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A shared library tool for developers
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
 LICENSE=GPL-2
-RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
+RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=a8b63fb9979c77aed3d0e0cf6a96e187
+_md5_=8e645dba5ef4be935b57b9f5a0972610
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 690ec3935871..2b370b2a86c4 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180108-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20180108-r1
index 062cf2238cc3..604c2c96eb4c 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20180108-r1
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180108-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Intel IA32/IA64 microcode update data
 EAPI=6
 HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27431
 IUSE=initramfs +split-ucode
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=intel-ucode
 RDEPEND=!<sys-apps/microcode-ctl-1.17-r2
 REQUIRED_USE=|| ( initramfs split-ucode )
 SLOT=0
 SRC_URI=http://downloadmirror.intel.com/27431/eng/microcode-20180108.tgz
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e2a25c5bf9f650ef0c636afff4ef43b5
+_md5_=31c3343d8c02cd4689055ba6575d4a0c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index ee16a0c5383c..63abb6fc2dfc 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.13
new file mode 100644
index 000000000000..00881ac40bfb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.13
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.13
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-18.base.tar.xz mirror://gentoo/genpatches-4.14-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-18.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=82a80176cbcf1bc897687eb6ecf792ab
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109
index 1fc38be3e33b..3b98ca17abd4 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.109
@@ -10,6 +10,6 @@ PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.4.109
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-111.base.tar.xz mirror://gentoo/genpatches-4.4-111.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-111.experimental.tar.xz ) )
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-112.base.tar.xz mirror://gentoo/genpatches-4.4-112.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-112.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a0b1653465fa9795333b022de21be2aa
+_md5_=22809cadd49c81b7e3bd8dd168478e6c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
index 75422569c36b..32d4a4e00a19 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
@@ -10,6 +10,6 @@ PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.4.110
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-111.base.tar.xz mirror://gentoo/genpatches-4.4-111.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-111.experimental.tar.xz ) )
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-113.base.tar.xz mirror://gentoo/genpatches-4.4-113.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-113.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a0b1653465fa9795333b022de21be2aa
+_md5_=f824d424b91098aeebc6e17c1312d743
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111
new file mode 100644
index 000000000000..79cb375a39ff
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.111
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.111
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-114.base.tar.xz mirror://gentoo/genpatches-4.4-114.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-114.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=3c318e6b6724ed97c2023d9686583ed6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76
new file mode 100644
index 000000000000..b2e719033cb2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.76
@@ -0,0 +1,15 @@
+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 (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 linux-firmware
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.76
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-78.base.tar.xz mirror://gentoo/genpatches-4.9-78.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-78.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2f4dfc1d0b3063a1867d3f347cf71f7a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
index dea7f351837d..959853cd95b2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.4.111
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-114.base.tar.xz mirror://gentoo/genpatches-4.4-114.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-114.experimental.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=785a1bb7fcbbc9e2b9ed06cc7b5f9412
+_md5_=999010ba532c83e422c207d57ce958ed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76
index 323a2b433e7a..ff12510bba64 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76
@@ -4,11 +4,11 @@ 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.9.76
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-78.base.tar.xz mirror://gentoo/genpatches-4.9-78.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-78.experimental.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bc1c38a0f39df18c2b8d0230b772ea55
+_md5_=3b42739b272873aaaddd051c4a82233f
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1 b/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
index 7637357ab1ca..74edf10bf578 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Linux firmware files
 EAPI=6
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
 RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78.tar.gz -> linux-firmware-20180103.tar.gz mirror://gentoo/microcode_amd_fam17h.tar.gz https://dev.gentoo.org/~whissi/dist/linux-firmware/microcode_amd_fam17h.tar.gz
 _eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=431ed786e8eaa0f673ebd1b14d8b48c1
+_md5_=79584baf58d89c2b6a5916882447ff9e
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
index b042328d5203..869314b4fcc6 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=5
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~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=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1688bd86ddb9ab5d3d06f859caf9d3a8
+_md5_=99eeb3f406f259f2a499492afe2dda02
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index fa18bece2a03..995501248790 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/libcap-ng-0.7.8 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.8
index 3e5bd44b7648..c5b368fd361a 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.8
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.7.8
@@ -4,7 +4,7 @@ DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=5
 HOMEPAGE=https://people.redhat.com/sgrubb/libcap-ng/
 IUSE=python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.8.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=60fb30c4db6018ce75f496dea01321c7
+_md5_=5bb8a6fde19293fdfcdf8ec74bc526d3
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.3.2 b/metadata/md5-cache/sys-libs/libseccomp-2.3.2
index 5de3ab2d519e..c2e0e575c6a4 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.3.2
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.3.2
@@ -4,9 +4,9 @@ DESCRIPTION=high level interface to Linux seccomp filter
 EAPI=5
 HOMEPAGE=https://github.com/seccomp/libseccomp
 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=-* amd64 arm ~arm64 ~mips ppc ppc64 ~s390 x86
+KEYWORDS=-* amd64 arm arm64 ~mips ppc ppc64 s390 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.3.2/libseccomp-2.3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c6a661bf98dc1702e48266ca6b74fd19
+_md5_=b53c1af8bd58bd9201e6bb6fc9f314fa
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.3.3 b/metadata/md5-cache/sys-libs/libseccomp-2.3.3
new file mode 100644
index 000000000000..96fa6e0c9f9e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.3.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-kernel/linux-headers-4.3
+DESCRIPTION=high level interface to Linux seccomp filter
+EAPI=5
+HOMEPAGE=https://github.com/seccomp/libseccomp
+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=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.3.3/libseccomp-2.3.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8b5028bfbb57241ff64de45cd2a8ba2b
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 47afcf4b549a..53caf6bf4dd7 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/libelf-0 b/metadata/md5-cache/virtual/libelf-0
deleted file mode 100644
index 83dedd0bd1c2..000000000000
--- a/metadata/md5-cache/virtual/libelf-0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libelf.so.0 provider (dev-libs/libelf)
-EAPI=6
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=>=dev-libs/libelf-0.8.13-r2:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/0
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f892b41560b04cac0a2ce79e324d60fd
diff --git a/metadata/md5-cache/virtual/libelf-1 b/metadata/md5-cache/virtual/libelf-1
deleted file mode 100644
index 2d71d83d7790..000000000000
--- a/metadata/md5-cache/virtual/libelf-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libelf.so.1 provider (dev-libs/elfutils)
-EAPI=6
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-RDEPEND=|| ( >=dev-libs/elfutils-0.155-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-freebsd/freebsd-lib-9.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=20e92c2b41a02cca7ad0b6039883b66e
diff --git a/metadata/md5-cache/virtual/libelf-2 b/metadata/md5-cache/virtual/libelf-2
new file mode 100644
index 000000000000..02483ea6a0ac
--- /dev/null
+++ b/metadata/md5-cache/virtual/libelf-2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libelf.so.0 provider dev-libs/libelf
+EAPI=6
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=>=dev-libs/libelf-0.8.13-r2:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/0
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e160ecce2854d03710108f0392a9af13
diff --git a/metadata/md5-cache/virtual/libelf-3 b/metadata/md5-cache/virtual/libelf-3
new file mode 100644
index 000000000000..447079087bff
--- /dev/null
+++ b/metadata/md5-cache/virtual/libelf-3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libelf.so.1 provider dev-libs/elfutils
+EAPI=6
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+RDEPEND=|| ( >=dev-libs/elfutils-0.155-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-freebsd/freebsd-lib-9.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1b84b2e9e9e7e36b2afd74d1e57fde0e
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.5-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.5-r1
index 97e870f87d16..deb98fdcc89d 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.5-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.5-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/CPAN-Meta-2.150.5 ) dev-lang/perl:= >=virtual/perl-CPAN-Meta-YAML-0.11.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Parse-CPAN-Meta-1.441.400
 SLOT=0
-_md5_=138ddd45efcf71a062b252bff993c970
+_md5_=0c51de1a0fc11de49abbdd5a57b58829
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r2 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r2
index 58646df911e2..ff09fe842c34 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r2
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-YAML
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/CPAN-Meta-YAML-0.18.0 ) dev-lang/perl:= !<perl-core/CPAN-Meta-YAML-0.18.0 !>perl-core/CPAN-Meta-YAML-0.18.0-r999
 SLOT=0
-_md5_=6801e27015e49407d8f533d83063111b
+_md5_=b6c326c96fc3224df5687acf90d32c0a
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.160.0-r1 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.160.0-r1
index fb807faa8acb..803f22bbad7c 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.160.0-r1
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.160.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Data-Dumper-2.160.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.160.0 !>perl-core/Data-Dumper-2.160.0-r999
 SLOT=0
-_md5_=3326514a08827b8bb5d7a7517f475904
+_md5_=738936996b2f2418a9e3e029911afa05
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.225-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.225-r2
index dfd073d168f0..9053d4edf5aa 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.225-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.225-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-CBuilder
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/ExtUtils-CBuilder-0.280.225 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.225 !>perl-core/ExtUtils-CBuilder-0.280.225-r999
 SLOT=0
-_md5_=6801e27015e49407d8f533d83063111b
+_md5_=b6c326c96fc3224df5687acf90d32c0a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.100.200_rc-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.100.200_rc-r2
index 746f183fab6e..1d1363c2e646 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.100.200_rc-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.100.200_rc-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/ExtUtils-MakeMaker-7.100.200_rc ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.100.200_rc !>perl-core/ExtUtils-MakeMaker-7.100.200_rc-r999
 SLOT=0
-_md5_=6aeff98ff232bf3570231a995c2a62d5
+_md5_=70b0d8e1542e29c495bda8f203df7f05
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.310.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.310.0-r1
index d382d61178c8..b1d2dcac4c85 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.310.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.310.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/ExtUtils-ParseXS-3.310.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.310.0 !>perl-core/ExtUtils-ParseXS-3.310.0-r999
 SLOT=0
-_md5_=b7361db78f18bffcd7f1b4a3da526f3d
+_md5_=04bd735d0763a27399af93b800095696
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.130.0 b/metadata/md5-cache/virtual/perl-File-Path-2.130.0
index a6baf8d6827f..cc015897d795 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.130.0
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.130.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/File-Path-2.130.0 dev-lang/perl:= !<perl-core/File-Path-2.130.0 !>perl-core/File-Path-2.130.0-r999
 SLOT=0
-_md5_=e56e120c1f8c5654318c1c37554d369a
+_md5_=57205c549757f09cb970510ed7d70bb6
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.630.100_rc-r2 b/metadata/md5-cache/virtual/perl-File-Spec-3.630.100_rc-r2
index b71df805ff07..b06de58704a6 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.630.100_rc-r2
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.630.100_rc-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/File-Spec-3.630.100_rc ) dev-lang/perl:= !<perl-core/File-Spec-3.630.100_rc !>perl-core/File-Spec-3.630.100_rc-r999
 SLOT=0
-_md5_=6aeff98ff232bf3570231a995c2a62d5
+_md5_=70b0d8e1542e29c495bda8f203df7f05
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.480.0-r1 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.480.0-r1
index 79ce41ddd75c..ff72f9391af7 100644
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.480.0-r1
+++ b/metadata/md5-cache/virtual/perl-Getopt-Long-2.480.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Getopt-Long
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Getopt-Long-2.480.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.480.0 !>perl-core/Getopt-Long-2.480.0-r999
 SLOT=0
-_md5_=3326514a08827b8bb5d7a7517f475904
+_md5_=738936996b2f2418a9e3e029911afa05
diff --git a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.31-r1 b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.31-r1
index 5103a2338a3c..cc2e6ea59c43 100644
--- a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.31-r1
+++ b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.31-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Metadata
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Module-Metadata-1.0.31 ) dev-lang/perl:= !<perl-core/Module-Metadata-1.0.31 !>perl-core/Module-Metadata-1.0.31-r999
 SLOT=0
-_md5_=b7361db78f18bffcd7f1b4a3da526f3d
+_md5_=04bd735d0763a27399af93b800095696
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2
index 463d95eccb49..7a518cde3a41 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/Parse-CPAN-Meta-1.441.700.100_rc ) dev-lang/perl:= !<perl-core/Parse-CPAN-Meta-1.441.700.100_rc !>perl-core/Parse-CPAN-Meta-1.441.700.100_rc-r999
 SLOT=0
-_md5_=6aeff98ff232bf3570231a995c2a62d5
+_md5_=70b0d8e1542e29c495bda8f203df7f05
diff --git a/metadata/md5-cache/virtual/perl-Perl-OSType-1.9.0-r1 b/metadata/md5-cache/virtual/perl-Perl-OSType-1.9.0-r1
index 12444f067d4f..ace7e482a42a 100644
--- a/metadata/md5-cache/virtual/perl-Perl-OSType-1.9.0-r1
+++ b/metadata/md5-cache/virtual/perl-Perl-OSType-1.9.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Perl-OSType
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/Perl-OSType-1.9.0 ) dev-lang/perl:= !<perl-core/Perl-OSType-1.9.0 !>perl-core/Perl-OSType-1.9.0-r999
 SLOT=0
-_md5_=b7361db78f18bffcd7f1b4a3da526f3d
+_md5_=04bd735d0763a27399af93b800095696
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.360.100_rc-r2 b/metadata/md5-cache/virtual/perl-Test-Harness-3.360.100_rc-r2
index 2e038bb1cf4a..645813d3b57d 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.360.100_rc-r2
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.360.100_rc-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/Test-Harness-3.360.100_rc ) dev-lang/perl:= !<perl-core/Test-Harness-3.360.100_rc !>perl-core/Test-Harness-3.360.100_rc-r999
 SLOT=0
-_md5_=6aeff98ff232bf3570231a995c2a62d5
+_md5_=70b0d8e1542e29c495bda8f203df7f05
diff --git a/metadata/md5-cache/virtual/perl-podlators-4.70.0-r1 b/metadata/md5-cache/virtual/perl-podlators-4.70.0-r1
index 25a650fa24f8..4c99c40cd8f3 100644
--- a/metadata/md5-cache/virtual/perl-podlators-4.70.0-r1
+++ b/metadata/md5-cache/virtual/perl-podlators-4.70.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for podlators
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/podlators-4.70.0 ) dev-lang/perl:= !<perl-core/podlators-4.70.0 !>perl-core/podlators-4.70.0-r999
 SLOT=0
-_md5_=3326514a08827b8bb5d7a7517f475904
+_md5_=738936996b2f2418a9e3e029911afa05
diff --git a/metadata/md5-cache/virtual/perl-version-0.991.600-r1 b/metadata/md5-cache/virtual/perl-version-0.991.600-r1
index 20021d2c6497..6454479ebe9e 100644
--- a/metadata/md5-cache/virtual/perl-version-0.991.600-r1
+++ b/metadata/md5-cache/virtual/perl-version-0.991.600-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/version-0.991.600 ) dev-lang/perl:= !<perl-core/version-0.991.600 !>perl-core/version-0.991.600-r999
 SLOT=0
-_md5_=b7361db78f18bffcd7f1b4a3da526f3d
+_md5_=04bd735d0763a27399af93b800095696
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index a0f10653dfcd..4dc6bf504c33 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-63.0.3239.108 b/metadata/md5-cache/www-client/chromium-63.0.3239.108
index 805cc75bf91d..438cfb3ba377 100644
--- a/metadata/md5-cache/www-client/chromium-63.0.3239.108
+++ b/metadata/md5-cache/www-client/chromium-63.0.3239.108
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.108.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30d94438b0331ed30217ae3aa3e6977b
+_md5_=11cabb10131a411f0a74be7cc95f0e09
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.71 b/metadata/md5-cache/www-client/chromium-64.0.3282.71
index 5f40604caaa4..9a30bd1c7c1f 100644
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.71
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.71
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.71.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66f7a1fed5badf25f3478f048f5dbfea
+_md5_=75200032f56cfbf5036f961fd7ee5b6c
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3298.3 b/metadata/md5-cache/www-client/chromium-65.0.3298.3
index 1f33b3f754c2..0583bbd790ef 100644
--- a/metadata/md5-cache/www-client/chromium-65.0.3298.3
+++ b/metadata/md5-cache/www-client/chromium-65.0.3298.3
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3298.3.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74cc14b62a1cfb9356a7dd7540cddcea
+_md5_=251e02a926fa966c86c9cbdc9f159827
diff --git a/metadata/md5-cache/www-client/opera-49.0.2725.64 b/metadata/md5-cache/www-client/opera-49.0.2725.64
deleted file mode 100644
index 76d8f90a54a0..000000000000
--- a/metadata/md5-cache/www-client/opera-49.0.2725.64
+++ /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/49.0.2725.64/linux/opera-stable_49.0.2725.64_amd64.deb http://download2.operacdn.com/pub/opera/desktop/49.0.2725.64/linux/opera-stable_49.0.2725.64_amd64.deb http://download3.operacdn.com/pub/opera/desktop/49.0.2725.64/linux/opera-stable_49.0.2725.64_amd64.deb http://download4.operacdn.com/pub/opera/desktop/49.0.2725.64/linux/opera-stable_49.0.2725.64_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33d594c0ed068eb4da2121866821040d
diff --git a/metadata/md5-cache/www-client/opera-50.0.2762.58 b/metadata/md5-cache/www-client/opera-50.0.2762.58
new file mode 100644
index 000000000000..9a155c17949e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-50.0.2762.58
@@ -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/50.0.2762.58/linux/opera-stable_50.0.2762.58_amd64.deb http://download2.operacdn.com/pub/opera/desktop/50.0.2762.58/linux/opera-stable_50.0.2762.58_amd64.deb http://download3.operacdn.com/pub/opera/desktop/50.0.2762.58/linux/opera-stable_50.0.2762.58_amd64.deb http://download4.operacdn.com/pub/opera/desktop/50.0.2762.58/linux/opera-stable_50.0.2762.58_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/opera-beta-50.0.2762.42 b/metadata/md5-cache/www-client/opera-beta-50.0.2762.42
deleted file mode 100644
index 99ab96535248..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-50.0.2762.42
+++ /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/50.0.2762.42/linux/opera-beta_50.0.2762.42_amd64.deb http://download2.operacdn.com/pub/opera-beta/50.0.2762.42/linux/opera-beta_50.0.2762.42_amd64.deb http://download3.operacdn.com/pub/opera-beta/50.0.2762.42/linux/opera-beta_50.0.2762.42_amd64.deb http://download4.operacdn.com/pub/opera-beta/50.0.2762.42/linux/opera-beta_50.0.2762.42_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6d32e775c69bfd0749142d0a327c22d
diff --git a/metadata/md5-cache/www-client/opera-beta-51.0.2830.2 b/metadata/md5-cache/www-client/opera-beta-51.0.2830.2
new file mode 100644
index 000000000000..e11416bb3da4
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-51.0.2830.2
@@ -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=amd64? ( http://download1.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb http://download2.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb http://download3.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb http://download4.operacdn.com/pub/opera-beta/51.0.2830.2/linux/opera-beta_51.0.2830.2_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index f20d8aa67055..071a51634594 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/gtkmathview-0.8.0-r3 b/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3
index 2b000ea74cb4..0ff0acd3bb74 100644
--- a/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3
+++ b/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.2.1:2 >=dev-libs/popt-1.7 >=dev-libs/libxml2-2.6.7:2 g
 SLOT=0
 SRC_URI=http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3a71f0bd1b33a700329b9a5a4bfbbb99
+_md5_=3333991fc4c7b02866de42590d9d607d
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.3 b/metadata/md5-cache/x11-libs/wxGTK-3.0.3
index 57282278af7d..9a950ac5a6e8 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.3
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3-docs-html.tar.bz2 )
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b312ef0304790edaa36f72464b719cac
+_md5_=c4d3c78f5b081f110509416abf8a71a0
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 97814bb36e22..f958624321b9 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/qxkb-0.4.6 b/metadata/md5-cache/x11-misc/qxkb-0.4.6
deleted file mode 100644
index a1f5572083d8..000000000000
--- a/metadata/md5-cache/x11-misc/qxkb-0.4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4 dev-qt/qtsvg:4 x11-libs/libxkbfile sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Qt4-based keyboard layout switcher
-EAPI=5
-HOMEPAGE=https://github.com/disels/qxkb
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtsvg:4 x11-libs/libxkbfile x11-apps/setxkbmap
-SLOT=0
-SRC_URI=https://github.com/disels/qxkb/archive/qxkb-0.4.6.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=28882ee7c5019eff754e1d067314a648
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.97 b/metadata/md5-cache/x11-misc/screengrab-1.97
index b12a7b63e1e6..5173d94befb1 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.97
+++ b/metadata/md5-cache/x11-misc/screengrab-1.97
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5 x11-libs/libxcb x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Qt application for getting screenshots
 EAPI=6
 HOMEPAGE=https://github.com/QtDesktop/screengrab/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5 x11-libs/libxcb x11-libs/libX11
+RDEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/QtDesktop/screengrab/archive/1.97.tar.gz -> screengrab-1.97.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9699b682a78875a5fe9c9c3025c7dcc6
+_md5_=b0e9de007cc45e88465ab124a42f29b2
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 6542c4df647e..e6aec55c6e43 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/terminator-1.91 b/metadata/md5-cache/x11-terms/terminator-1.91
new file mode 100644
index 000000000000..1c18b8cb9069
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/terminator-1.91
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Multiple GNOME terminals in one window
+EAPI=5
+HOMEPAGE=https://launchpad.net/terminator/
+IUSE=dbus +libnotify debug python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-3.16:3 >=dev-libs/glib-2.32:2 dev-libs/keybinder:3[introspection] dev-python/psutil x11-libs/vte:2.91[introspection] dbus? ( sys-apps/dbus ) dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/libnotify[introspection] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://launchpad.net/terminator/gtk3/1.91/+download/terminator-1.91.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abd31c94970656985fc3ef2f243e4ce9
diff --git a/metadata/md5-cache/x11-terms/xterm-328 b/metadata/md5-cache/x11-terms/xterm-328
deleted file mode 100644
index 8f9ab79c6390..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-328
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=5
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-328.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f09120854963262bc44019b1fef7feda
diff --git a/metadata/md5-cache/x11-terms/xterm-329 b/metadata/md5-cache/x11-terms/xterm-329
deleted file mode 100644
index 814ef0cbeea7..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-329
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=5
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-329.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f09120854963262bc44019b1fef7feda
diff --git a/metadata/md5-cache/x11-terms/xterm-331 b/metadata/md5-cache/x11-terms/xterm-331
new file mode 100644
index 000000000000..58466762ffd8
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-331
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
+DESCRIPTION=Terminal Emulator for X Windows
+EAPI=5
+HOMEPAGE=https://invisible-island.net/xterm/
+IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
+SLOT=0
+SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-331.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=afc4b828414ea72b528aa15647f9d91b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 043c6854a746..efcbedfb7855 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18679 BLAKE2B 5bd43b576965dc1f45da82f1afe37fa49a2eb07e9d5e4c0941c1b90f25f4218bf17f148235a2ec341964150680e225dfbb0525d344b68562e5e8edc681acad2e SHA512 f57a5ef7316f5f4f46b448cf9bf75256883ea888098b41c74f84b26ce00fc294dcc7a55602956716b676b9da249fadd47b8d626f6b985649799c2fa501effa8a
-TIMESTAMP 2018-01-11T08:09:31Z
+TIMESTAMP 2018-01-13T05:38:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpXG7tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpZm3FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDaBA//V9gvXm/C80Nlm4pYTMDFdtqqU5Qp2rizjnpLmrwh2/KLDtEf/au2jMcA
-o4Cr0DhiV9ouEwOdxqqj/QlNcLvIQG+vRNHORWgDIuTrW4oo5ZXqulTUzv8cRbTy
-bfNpPFBmPaVCp/LOUd3WL8g48RRZWvIHjer6swUDIWwZJikpPeFJKFvTOfga50V3
-SJq829QOh2EFE/tsIVwJ9cmpSdIMM6bgSj8nkdjZvGfmJxZcTAy5wu7FwyQCcB4l
-NSSZoMoud/ccbA2E5WcHuThEYAhhb1oQRsKz/LvhzlG/Ssw/i33UT1+M1QkjI2e/
-mRYzZyloNgHd6lf1NcWdwI8jig9urQ4+rpzw2/qLRyHTPbjP6VYsvge8SRlGutv7
-s86frgOWOQsVVqItfKSLLKf6F124A2mHx6dWmZBoa2FJVXCNuSeawxKMcp4olJ+j
-bH10nSdYs6xUuznNJLIgHYoS50HpPE3u581YsszV5ayEHhQWITDB78GuF0tr+BT5
-JKAXvAKbT2539m8eY5whxHgNly2xSm/C4ye12Vl0KdhnYFOoip70wFEmqP32maTv
-Svg1OMA+0L6aInE9Et0yNCwzGpywSQeUzh8QQRulXAOPWFQ0p9ztOEfs+ICNgy8v
-AFt4qY9oB7JLm3VhYQvqFbGmJJhhM6TFgXGCilnkroxwwUJCRVY=
-=Ma2L
+klAkZxAAq3jbGWoD5As3pId28v2GUsOPwHKPpnlp0fVqAVs2vqRuYRFKRloh1OEv
+OKrHx11EVNCmVPd6+LYvGLRPlxGc8y+K7zYZEFKtVDrV18jkRDKUcVRWd+Y/U35W
+wOjWiGWrrpkMWjBupTS+y3xcWN+lYLUS1dksPWC367q2Gaa5DHyhq8gEbd3Jk2H7
+AXIxqDne7xyxFj5UcQtCcZ8BaU2hpFrKg/M0Q5gnpFyGLEP01y8Kt39g7rcv3DdL
+/5VU+7hHKcBsOwY8rwo30rghwHcUP4oqXqF3YDCwrzEe5EiixX9LI3wS+mjE+CEz
+U1lWfF+Lsohy91oYCFvG70XPX7WxL+WNuPZBarzjEB4gF5+yczboKZanJU0BFvia
+Af4SVIRApPP5b9+ZYi83T9l9SI0buA6PBtsmRuabxj27lWMerBlVR49JoK95jUld
+ZsERzO2JuaUHpF6q+9eNf5pEaYIiUaWUH28JZMX58i3AQICf+qrEAJr0ZuSDu7Io
+xDesrhjJ2MjuGRsiBOfms94w++zrSOPHnLFU3KU5D5Nh4jg0HIVtov/RLJ2ryzRO
+gHRB4OnEYcfKzpXIf/JEH6JP3VkKxW3k4ygZRZ6d64KGXSuXBXhN85tzjf5tlQ7y
+IhuuppqrN85li7UbLxjxoYaBD5ECIGq/RHrBTv5fkPZ9cpo0Txw=
+=Jnnp
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b9a5d670b0ce..749c873f8b58 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 08:09:27 +0000
+Sat, 13 Jan 2018 05:38:53 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index fc4f13192f57..494720bb2081 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -4194,7 +4194,7 @@ developers and volunteer mentors.</description>
     <email>web-apps@gentoo.org</email>
     <name>Gentoo Webapps</name>
     <url>https://wiki.gentoo.org/wiki/Project:Webapps</url>
-    <description>The web-apps team maintains web applications, an eclass to facilitate writing ebuilds for these packages, and the &lt;span style="font-family: monospace; font-size: 95%;" class="tripleclick-separator"&gt;webapp-config&lt;/span&gt; tool.</description>
+    <description>The web-apps team maintains web applications, an eclass to facilitate writing ebuilds for these packages, and the &lt;span style="font-family: monospace; font-size: 95%; font-weight: bold;" class="tripleclick-separator"&gt;webapp-config&lt;/span&gt; tool.</description>
     <member>
       <email>blueness@gentoo.org</email>
       <name>Anthony G. Basile</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 8f99f55a661f..7dfec42d6bd8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 11 08:09:27 UTC 2018
+Sat Jan 13 05:38:53 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 57146b33f23f..b6785c170f5a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 08:15:01 +0000
+Sat, 13 Jan 2018 05:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index bd2cec8e2110..cd0c830f00d0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5792560c2b7a81a53e1420284b0a812165d980e8 1515655832 2018-01-11T07:30:32+00:00
+db30be30cd4053d0151fc99ac3926e6f595d7d95 1515817551 2018-01-13T04:25:51+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f38cad74d400..4747001536d1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1515657901 Thu 11 Jan 2018 08:05:01 AM UTC
+1515821701 Sat 13 Jan 2018 05:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b9a5d670b0ce..749c873f8b58 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 08:09:27 +0000
+Sat, 13 Jan 2018 05:38:53 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5673f1cd3c91..884da13749cf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 94af727d4f47..172d94af3c6b 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -3,9 +3,10 @@ AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5c
 AUX linkchecker-9.3-desktop.patch 1783 BLAKE2B 8735cdb6e486ad292cbbf397c59e57a33bd7fee4058250766deaf0c7039b76020e10aa7972a7e780726671c0346015a20ed502ac8a6a4172043d17d2e35fa313 SHA512 4100c7844548a7894157cf884ed3093e3cb4d11cad33bda605ce1328e7214fb40a229935716a1775978bfe96c87413b52fca4783d7a167027736a1284b8d39b0
 AUX linkchecker-9.3-requests-check.patch 1538 BLAKE2B a24a8471d5b42c07afaf17611860b10c001cfb2a2282219f70389bbdb18111901feefc2c73683f4661aa80311565d0bb4c0b2239140c944b617beb86df164988 SHA512 3ba20f160aa27a611d92ad5b6a31f134b64f52644ad1ac73d41dd7ea77fa3b5d743f3fd51cf5f6d4f3229ec27cfb0758d1d4c87dd14c95ab83c0af54236d5d96
 AUX linkchecker-9.3.1-build-fix.patch 450 BLAKE2B 176f2617c0e2285473d500b351a918d9a48ef631662f6ecbfe7abe8ac37a6a8fd0406838193f068c42a9baeb09d9630e70aa518f51e480dfc3dc0c8ae17d6e9a SHA512 47c30bb1e2724ec96ca0c5223dce4ab0c79e30752be799498e84ff5953f78d9495265f59635a337690d28e6d44740296d9771c342cee6a88b30fe46bf2c58952
+AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e08158e85c894721c640d8d1701e177e52a4bd780b0b195503bf0e8e3709175f1ec73c8f7e24dd578aa63846cfd17b851e47 SHA512 fbfd999cdb48628bb3ce14bca2f114e104a69c0355a00c9b81a543c5ac10a8bec0ab71dcbbefc81bc8f468a7e17a9a89dcd5d795ce565b9452131ac2ee6e5fe3
 DIST LinkChecker-9.3.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59
 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
 EBUILD linkchecker-9.3-r2.ebuild 2016 BLAKE2B 735b62d47111032c2a2e1530f542516588d17752381741124f52a22b83c55179119f3b7775effee058ff4ae01279f32ad74a49c298fc729d843b0b8799703631 SHA512 daba5c569f2be5f22df9a7c8330a47cdb8aade0329e90ac682aef133fa0b69e2315bb0aaa6470327595c4d9c61f586c65263279890c3f79d710fa9b3e962d3b5
-EBUILD linkchecker-9.3.1.ebuild 1907 BLAKE2B ded9b7c575996ad738102498ad0f2804b1953e46512113448c7fd61b541f8dd8d044ae815f7faa04f6820e3823f0309f6e7fa9a947629616f87e9b6f17718970 SHA512 6dbd7a7a64d5f7898ec1bd77be1e2c1cc804ae0b84e468e5b124271584d8e948ce57de9b6812f1965f48ffcc89c5b188c6a96d7b152b45ad5e0a3f44e32031b3
+EBUILD linkchecker-9.3.1-r1.ebuild 1942 BLAKE2B de9f519af202980a5d954d7a33301677594e4bcc183d0362b2ddef0eee830df433354d1000f827f68e0300034ab778bd56a3b7079a044cd46c6ee7d9dec1e994 SHA512 03d33e0203aeb0c36d39caab3456c599a281898acb3cb35e2a69723c39ae38bf2048f8e26643eb06b2b16443cdea3e9f26a1907190520537f79421af42643c88
 EBUILD linkchecker-9999.ebuild 1873 BLAKE2B d1afdc7f039b7eb2ffb83138e3d20ad7ed88c3d71d5c8e6cd482d578ab45b8860ef97fca67a8a5500f7a28cebfdc61c372cdbd3b30931ea460bcf0e7be3d85c0 SHA512 7857c356f300001bb66978ec65a006f19f334047723b152f62a83c9a219f69120c5e23f285d8884948f57ac5289767b48f551b513aa01569a340988bb1804670
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
new file mode 100644
index 000000000000..56c57fa37997
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
@@ -0,0 +1,46 @@
+From 9b12b5d66fa9b832f4d9e19a0b9dcb92607ee3e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
+Date: Mon, 2 Oct 2017 20:18:54 -0400
+Subject: [PATCH] workaround new limitation in requests
+
+newer requests do not expose the internal SSL socket object so we
+cannot verify certificates. there was work to allow custom
+verification routines which we could use, but this never finished:
+
+https://github.com/shazow/urllib3/pull/257
+
+so right now, just treat missing socket information as if the cert was
+missing.
+
+Closes: #76
+---
+ linkcheck/checker/httpurl.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
+index 161619c5..bde77c70 100644
+--- a/linkcheck/checker/httpurl.py
++++ b/linkcheck/checker/httpurl.py
+@@ -194,6 +194,10 @@ def _get_ssl_sock(self):
+         """Get raw SSL socket."""
+         assert self.scheme == u"https", self
+         raw_connection = self.url_connection.raw._connection
++        if not raw_connection:
++            # this happens with newer requests versions:
++            # https://github.com/linkcheck/linkchecker/issues/76
++            return None
+         if raw_connection.sock is None:
+             # sometimes the socket is not yet connected
+             # see https://github.com/kennethreitz/requests/issues/1966
+@@ -204,7 +208,10 @@ def _add_ssl_info(self):
+         """Add SSL cipher info."""
+         if self.scheme == u'https':
+             sock = self._get_ssl_sock()
+-            if hasattr(sock, 'cipher'):
++            if not sock:
++                log.debug(LOG_CHECK, "cannot extract SSL certificate from connection")
++                self.ssl_cert = None
++            elif hasattr(sock, 'cipher'):
+                 self.ssl_cert = sock.getpeercert()
+             else:
+                 # using pyopenssl
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
new file mode 100644
index 000000000000..109499f785bb
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit bash-completion-r1 distutils-r1 eutils multilib
+
+DESCRIPTION="Check websites for broken links"
+HOMEPAGE="https://github.com/linkcheck/linkchecker"
+SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
+IUSE="gnome sqlite X"
+
+RDEPEND="
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	X? (
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		)"
+DEPEND="
+	X? (
+		dev-qt/qthelp:4
+		dev-python/markdown2[${PYTHON_USEDEP}]
+		)"
+
+RESTRICT="test"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-9.2-unbundle.patch"
+		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
+		"${FILESDIR}/${PN}-9.3-desktop.patch"
+		"${FILESDIR}/${PN}-9.3.1-build-fix.patch"
+		"${FILESDIR}/${PN}-9.3.1-requests.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	DOCS=(
+		doc/upgrading.txt
+		doc/python3.txt
+		doc/changelog.txt
+		doc/development.txt
+	)
+	distutils-r1_python_install_all
+	if ! use X; then
+		delete_gui() {
+				rm -rf \
+					"${ED}"/usr/bin/linkchecker-gui* \
+					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+		}
+		python_foreach_impl delete_gui
+		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
+	fi
+
+	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
+
+	newicon doc/html/logo64x64.png ${PN}.png
+
+	docinto html
+	dodoc doc/html/*
+	newbashcomp config/linkchecker-completion ${PN}
+	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
+	optfeature "Virus scanning" app-antivirus/clamav
+	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
+}
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
deleted file mode 100644
index 512db84e331a..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils multilib
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://github.com/linkcheck/linkchecker"
-SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite X"
-
-RDEPEND="
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	<dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
-
-RESTRICT="test"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.2-unbundle.patch"
-		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-		"${FILESDIR}/${PN}-9.3-desktop.patch"
-		"${FILESDIR}/${PN}-9.3.1-build-fix.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-	fi
-
-	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
-
-	newicon doc/html/logo64x64.png ${PN}.png
-
-	docinto html
-	dodoc doc/html/*
-	newbashcomp config/linkchecker-completion ${PN}
-	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
-	optfeature "Virus scanning" app-antivirus/clamav
-	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
-}
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 28a69785ebeb..d82e6b1c44da 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -1,5 +1,7 @@
 DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee02bec2b06eb8e06c2cdf856af26f568be7caf287f248909f9b519f9dc77c78623337024d8c1afc770307187cac SHA512 56326fc7c40ea676173f150842367ea1782e700de682d790bb0f2c0df86e72a30f4c3ea0d937deb9d92f5eed47d2d4cb53edaca7dd23eb394a498b2f424bb2fe
+DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
 EBUILD netcat-110-r9.ebuild 1647 BLAKE2B 1a79623b55b08d09c18a60000821479e5b8f08328be2f0b35b69664fa16d7344c4ab9dd022f70f9844ef636eb6883c08ac91177f248416d15b24e0a23b8c4eb6 SHA512 c6f41fc3890d7c7da89fab4597c99260de1160e5982732ddd57c090e04aef788e51dcac724ce78d1cc660c7d0a3459844ccf92dcd6c80c117a40dd842dab42d5
+EBUILD netcat-110.20180111.ebuild 1301 BLAKE2B 7219c5111c4647100d0e9d8b2800c985f9cb36be4faaa1294564ca5209a1a86768626c54878bd263e386bed443a5c3dcfb22a4f1fad22c883e4255ba99fe08af SHA512 e61641fd5b18a3c283c3db0b8087eb6373f0b9e7380bd73235fdca4288f8e690bdd9bb42a94a0056d1ef9d56266a96627630c3f03f27290c167073e6519e90cf
 MISC metadata.xml 420 BLAKE2B 2ecb5d0734634fa00dbe4aecc8353dcad2a6d76bfb6ff22522b52ca2e67298a0923e46fd2d32c31f48262b06c6f46b02e4e065853c56efc793186132b2e92570 SHA512 f6d0b317880cf10065aa552d4653f3338c89fc36b2175d64b6b17bcdafbea03e0c02608904ffca7a934f2bdcc794758f4132b7cd279fc91530ab077eb2115ccf
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild
new file mode 100644
index 000000000000..760fe86cdf9d
--- /dev/null
+++ b/net-analyzer/netcat/netcat-110.20180111.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs flag-o-matic
+
+MY_P="nc${PV}"
+DESCRIPTION="the network swiss army knife"
+HOMEPAGE="http://nc110.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
+
+LICENSE="netcat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ipv6 static"
+
+S=${WORKDIR}/nc110
+
+src_prepare() {
+	sed -i \
+		-e '/#define HAVE_BIND/s:#define:#undef:' \
+		-e '/#define FD_SETSIZE 16/s:16:1024: #34250' \
+		netcat.c || die
+	[[ ${CHOST} == *-solaris* ]] && \
+		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c
+}
+
+src_configure() {
+	use ipv6 || sed -i '/#define INET6/d' generic.h
+	append-cppflags -DTELNET -DGAPING_SECURITY_HOLE
+}
+
+src_compile() {
+	local xlibs
+	[[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket"
+	emake \
+		LD="$(tc-getCC) ${LDFLAGS}" \
+		DFLAGS="${CPPFLAGS}" \
+		XFLAGS="${CFLAGS}" \
+		STATIC=$(usex static '-static' '') \
+		XLIBS="${xlibs}" \
+		nc
+}
+
+src_install() {
+	dobin nc
+	dodoc README* netcat.blurb
+	doman nc.1
+	docinto scripts
+	dodoc scripts/*
+}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index 9390f30b0bf5..2aae03d7e3fb 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,8 +1,5 @@
-AUX prometheus-3.initd 659 BLAKE2B 8f02de10267a5aeea4a902c75e65f8673f82a263bc81ea626e4a19c92d83601d69e1d0c1981149513747b1714029ffe2790fd33d4bd86914c5a691f229f612d4 SHA512 14321f0a0e39e4ed1b879ba956855046c21dff85770d3d269492a6d0b911af69ccbf047ec48b91c56bfb678da9390fb236ce165326dc2139b1255d448f2512fa
+AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
-AUX prometheus.initd 664 BLAKE2B a6a40447e7215846569ffba183c479def8913bf98dad15b6e075213ac06c09b2276ad2e0ed4e9ca28e3b8de66157cbc0a26b9cbbb596480133bd0594d3d66785 SHA512 95e2ac4969c26f2e91330b521223e94912d68832ef29429e68930479c29b24027c138011bd1f480546c14a07ae15800967e9ff114cdec3cabd0c15bdca489665
-DIST prometheus-1.8.2.tar.gz 5238057 BLAKE2B 33b53fab08df985ec459150166494d46552b7815d8b68d2f8a63023a12c1017197f7043327b4182935231c86b0fb492f3d05d477b97c7e7cd233fbdb0211f1b6 SHA512 ed52ab494ae565d4787b29cf1800605ac3bfdacee25e833704131d57bad9759a3e2585b96316ad754e6612324e68079d7f670004a86aa12c768a2e03542966d2
 DIST prometheus-2.0.0.tar.gz 5603884 BLAKE2B 0e2c7ee267f4f817fe84105b89fa2951c07212ca75bf540c67afe900c1df62641919f2ad9d2ce24932a946a0c3db8da6847184c56578ef9626db1f55c1ea3080 SHA512 9d23e10b3eb12755781b9edc5c32a0cb1e99055a8a905517619d992a174a8621ebc1e82999ce2412e7fc3e2e0af8a0dfe1eded8bcd2701a5aaaffce79c7fbcc5
-EBUILD prometheus-1.8.2.ebuild 1603 BLAKE2B cf1f071975df0a6b06d1a3196791e8ad0d3ea066c1a4514b3b3b9eeab03559127c728f409f8e4932030d66d5cfa4bd003a41c7ebb5ede4778b8dca4fdad08608 SHA512 4ee12d760b3138cb99e86052d0e32c2ad4ba47b42adf5f4582d3af32d48770f65d9baa7130065fd0af65860bddc501dcb87fa2814278050a38c154630119fdc6
-EBUILD prometheus-2.0.0.ebuild 2000 BLAKE2B 0008f75e521e628c90724b3b4d83ed3aad3960b624110b9081119eb8717dbfe3f054ee83cadac3bd1a09453a2738fe709ffd8102e73d62e88dca7a19264985d9 SHA512 35279a1fa0a51c6e677ded1e73374a046cb863a753e493608c04690c9a11be268b4b48a2204f61f44f8e02891334dafdc3264e52b1630d56d910e93210bfd420
+EBUILD prometheus-2.0.0-r1.ebuild 2000 BLAKE2B 13fbd2811ab3feefcb1018cdce480b0e1b663e42d631db5c27a003544399fdf99a3df1dd0ede40c8e552a47ab5a0e4f577121c5112c8e7ed43acd8d9892c7f81 SHA512 d08dd4d8056ea966a9b50e4faa21bd00804b8f6402ac8557f3a12a90451a6bda62731638488aaefb15de1250e360e10bbcd72c22f91f7f7a88f0645e4b7a2b77
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/net-analyzer/prometheus/files/prometheus-3.initd b/net-analyzer/prometheus/files/prometheus-3.initd
index 5f6d6fe14267..ae151ef91fbd 100644
--- a/net-analyzer/prometheus/files/prometheus-3.initd
+++ b/net-analyzer/prometheus/files/prometheus-3.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Prometheus monitoring system and time series database"
@@ -14,6 +14,15 @@ start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
 	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
 
+extra_started_commands="reload"
+
 depend() {
 	after net
 }
+
+reload() {
+        ebegin "Reloading ${SVCNAME}"
+        start-stop-daemon --signal HUP --pidfile "${pidfile}"
+        eend $? "Failed to stop ${SVCNAME}"
+}
+
diff --git a/net-analyzer/prometheus/files/prometheus.initd b/net-analyzer/prometheus/files/prometheus.initd
deleted file mode 100644
index 245dcc85ae6d..000000000000
--- a/net-analyzer/prometheus/files/prometheus.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus monitoring system and time series database"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/prometheus"
-command_args="${command_args:--config.file=/etc/prometheus/prometheus.yml -storage.local.path=/var/lib/prometheus/data}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus/prometheus-1.8.2.ebuild b/net-analyzer/prometheus/prometheus-1.8.2.ebuild
deleted file mode 100644
index 1006108b0996..000000000000
--- a/net-analyzer/prometheus/prometheus-1.8.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-EGIT_COMMIT="v${PV}"
-PROMETHEUS_COMMIT="5211b96"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.8
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
diff --git a/net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild b/net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..a51b71d9bb2e
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="0a74f98"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/net-analyzer/prometheus/prometheus-2.0.0.ebuild b/net-analyzer/prometheus/prometheus-2.0.0.ebuild
deleted file mode 100644
index f316f9e3f9c2..000000000000
--- a/net-analyzer/prometheus/prometheus-2.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="0a74f98"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index eee739f8247f..ffc0994cdd91 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 81e971b0d6b3..46bbbaaee6cf 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -8,6 +8,7 @@ AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 BLAKE2B 9ea5e9c26c3603517d
 AUX avahi-0.6.31-install-exec-hook.patch 507 BLAKE2B 06e1da7773299f903658a24d4bf412ed8e08c59e62786b6d91ec0b76d7bcf8c43748945a0779b880a54878f4dde0262277b8809a359daf2af42e4648c25c049a SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1
 AUX avahi-0.6.31-invalid_packet.patch 1073 BLAKE2B a6ae5008e20f620c2314616483cc97f0b41b9bbcfee1f84721c31fb960b8446151260f1fa0a18265cbdb6eb5314b490e1aca6592dc2bf9cd64e84ffb06c30ef4 SHA512 1582efd8c3474e7f675d86449974ae29db6ee28bd61642d37ae3efbe3903183e5f005051de400d28c116d791a6be00d90c61f3eb1d74e0650119269ca04dab4d
 AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 BLAKE2B 093a68402eee840ea72b9c09e1cfff5ba9c2c75df385dc483bca0381bdff4e5e01b6a64aff988448b71e5bb50e4dbcf28c96b10932be1964469ec8755a03f301 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7
+AUX avahi-0.6.32-mocqt4.patch 537 BLAKE2B f03ad497d4d94989a61b38e99cd74977760bd6046dc8c5bf5336062fd3327bbcae8df4c2d5c4d3c613f593ed7cd63075dc861b44aa627940228f6440a8365e37 SHA512 047d1083f9bcf24ded0a8dcffc508dc465f490da72108b9ca1b88bb217a10bcbb0678c8e5cea47869c7e33deb639edcfea2da6e3902d97b0817a67a8b7572890
 AUX avahi-0.6.32-openrc-0.21.7-fix-init-scripts.patch 918 BLAKE2B 3ed83f437b82bc98253df8a72dbd9e5a2d018e3b3e7711f04919b4926d6c8e8b0ec9531c9021453ae576cbb9919a8daaec85b721b5858355f9f6fd2fd609bffd SHA512 c62167c538af81362abba5a4012336f5d12aa20edc3cbb69f305ba89be90e4c62e1ce1613779d3ad0cbfba99e4ff46b803e4a26fe72cefefd628827a610318a3
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 BLAKE2B 900926dbe6a0716ef37d95bc37c0115d02e48d3cfdda26ce86dc020ae0ab3b5fedbe6f5a50631b17fb210621839ac25a1bd43bfdd95a908e248a226670153d95 SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517
 DIST avahi-0.6.31.tar.gz 1268686 BLAKE2B 959526c69855495948222709227c7c0d07653bb91f223d80e3d1b6ee16b03952015634984fe754c2c828f76035cd966131eeb047fe4c922493c129a77b14d2be SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858
@@ -16,7 +17,7 @@ DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc8682
 EBUILD avahi-0.6.31-r10.ebuild 6444 BLAKE2B deee480926a554f671ba7d6a3425ac1292b429581952c377f440fae12da2f0896037dbe885a8c7991b8c55329098d07c2fcbf87bca8a1bb2c1ef9427378003b2 SHA512 231567dcc74fbe09a4d18cc52074430b2f8c552c2e1212207af5879d6234f0067eebef495872c0c589d77f8fad177d05247f9927dc648963ee9f1e792335da81
 EBUILD avahi-0.6.31-r11.ebuild 6261 BLAKE2B a11de83cced8adec29e5a3df8ad09fc2dd16d8247dc2e72b208ddb3de86a695d8d164920e2f3e96086d5ead5b251a49c380f2a61764bbdb6b3500dd39e98c7d4 SHA512 0a0645d1c38fcde7d34dfdd38f21ab177cfac21bbc01def180ec9fb0f311ce0273565f425c096c6ee29ec20651818136da166d4c3b26d29c8d7f8473a0cd4ed1
 EBUILD avahi-0.6.32-r1.ebuild 5732 BLAKE2B 6b17c7e9d223e288e309ef3f51326bff5d3e895e12a1db585f0fe3a086ba0a80bfaccb0d9ef79b769200fe985be92826efb64eb071ca93c79d82a4addde91b98 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4
-EBUILD avahi-0.6.32-r2.ebuild 5855 BLAKE2B bf094e3aafa5e289cd9f36290b649c2d152598583d90c19f1cb92c5a5a8c3d0d40c238fa428ac3beb355a6c7e7ed8e8584c19c7af8fc4dfaafb8cb234fa65534 SHA512 44aef809779706e5f0e8c5e047b69a795a7d450a59e7fed174c2f7cb5043f6c9d547daff6699ee9e28e9af3ba02caa54a5293ec8ef11219c35bda4b9f3cfdb00
+EBUILD avahi-0.6.32-r2.ebuild 5971 BLAKE2B 97aa22378ee9791dddb866a097b4c1fe69152e90939d67b1a95c890488b297dcf80e2df1f4435af0d69f798c9fc7d6365329ff481b6f24af50dbe37dcf2fe1d5 SHA512 e25666354328ba52955b938d4cfd1d0ff661cd6c536fddfc8cfc84afdaaebdafc8091bd99d17d737e79242c45b858df23a3cfbed8cf0c5491bb70ff7ed192b93
 EBUILD avahi-0.6.32.ebuild 5584 BLAKE2B 48672b141bd86b76838acae05f4d6e3f4fffeb686e42e058b8b8c3c771568df7ca12bee6a215079729d585d6415c30146787e73aeb1b84abafbff5da00ec9b48 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0
-EBUILD avahi-0.7.ebuild 5075 BLAKE2B b4cf614d01a33cdb187679e982ed5a2618ece26072dd392c2339267ca9f30922b09bd90b6495e1e9528ab1837ae38160dd6c612bb82b968df1957f4445195146 SHA512 5d52a7ac1a9d7c5aa2626f42bfeb1195126f20a54cf4bcd2e48b2ef7efe037bd5d254e08d993f7a2c777ca5b35525228deecff307189890708b39e3b730161c5
+EBUILD avahi-0.7.ebuild 5191 BLAKE2B 21ee99f003cdd0801183bac280b1862e5e431cbea49bd5d5449675eb7119edc165b3c92ba65fc98f7e8a62d813d7c47e05268d4d2f0d0a78e4db8ad399e52c5a SHA512 2bb37573bb68d89b66c8d3369ccfd883b4f5238bd3a15ac74cb8b56fc1751000eafce0a3bca30d29ba5da193c5cdff25e743c0a59f5fac4e6aeb8716bad75b57
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.6.32-r2.ebuild b/net-dns/avahi/avahi-0.6.32-r2.ebuild
index 92aba59f400c..876f83bcf2d8 100644
--- a/net-dns/avahi/avahi-0.6.32-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.32-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"
@@ -112,6 +112,9 @@ src_prepare() {
 	# Update the init scripts for the new openrc, bug #594622
 	epatch "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch
 
+	# Don't pick up wrong moc based on qtchooser default, bug #587830
+	epatch "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
+
 	# Bug #525832
 	epatch_user
 
diff --git a/net-dns/avahi/avahi-0.7.ebuild b/net-dns/avahi/avahi-0.7.ebuild
index d77bb4af9a0d..bfb9882d4725 100644
--- a/net-dns/avahi/avahi-0.7.ebuild
+++ b/net-dns/avahi/avahi-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -96,6 +96,9 @@ src_prepare() {
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
 
+	# Don't pick up wrong moc based on qtchooser default, bug #587830
+	eapply "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
+
 	eapply_user
 
 	# Prevent .pyc files in DESTDIR
diff --git a/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch
new file mode 100644
index 000000000000..bba25e971630
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac	2018-01-11 23:00:47.503309612 +0100
++++ b/configure.ac	2018-01-11 23:10:04.373295395 +0100
+@@ -516,8 +516,7 @@
+         PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ])
+         AC_SUBST(QT4_CFLAGS)
+         AC_SUBST(QT4_LIBS)
+-	    QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
+-        AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX])
++        MOC_QT4="`$PKG_CONFIG --variable=moc_location QtCore`"
+         if test "$MOC_QT4" = no; then
+             AC_MSG_ERROR([Could not find QT4 moc])
+         fi
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 97949dc3423b..1759a383d5d1 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,3 +1,3 @@
 DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
-EBUILD libidn2-2.0.4.ebuild 1229 BLAKE2B 53fc195400ef4426da2a31b7b62a0f6304f64e51d42c1de90daef308dba11ea30ec6d4e88a8c9bfa6badad500edf0b597f159918aea84727e462925f9c69fe0e SHA512 c1f7d5073bb16b0488dc90a212e36b05abaf5685f2b4e0b7ce6c228626e247559766e81d71adb1362e00db7c4b77ca124bda30cbb0c6d33bf8f09c47018dc281
+EBUILD libidn2-2.0.4.ebuild 1225 BLAKE2B cf892b9ec857ba33fec9429c542a9966529e407d80616853c8eeb4f16f4d455b8055606db3977f26bee3c1d46bb89c83c0631fe72bae43bb460de149519ba6ba SHA512 1d60bacd4a970e7f64400df81b24dda49fe8f1aca36cb8b8412be5c905076661ff88e198346f2933b7e71bc55049ed9275ea227067c0cc89f7ead13f1e9306f6
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index c647d4fc56a3..465abcdfd360 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index defdaff10295..e4d83c711387 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index ffecac4c9e37..c3b915d099f6 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,12 +1,12 @@
 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
 AUX pure-ftpd-1.0.45-openssl-1.1.patch 1184 BLAKE2B 94750ec0312d42347d094b28ab283cf59ca7bb2bc6cbd879e2a76a9a6c7faa97f8fa99ebf8358c4b6d396af0e7c769730e5c0b8394e0bfbbe3eb322c726032bc SHA512 e6876cd2dd8551f7ad37ad52dfad142d19d7294c2ef226b394d1ea064ab89408b90ad84a7b560be0eb4ac955606f9aeb44b28009a712b681acceafa7410fb053
+AUX pure-ftpd-1.0.47-MAX_DATA_SIZE.patch 787 BLAKE2B bac7b7d788e2928c7c5a4f9af593b6841475d0850b1b3c09f6c6e3f7a575db13975fccfabbcb5813482c326f355dadcd33aa30184da9c098764480b95a9730ac SHA512 1124ba66f8c98935acf3f9bc11b7c90370e2e0dee05fa0c25ae517d198ef1bf47b7d93b3abbe79a3e98356588bd12a6f44584ff85a5fe241e2561c5805876624
 AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393
 AUX pure-ftpd.rc11 1990 BLAKE2B a0f4bccad43ae3f767188326ec1853c516165c0268e31756b573470bd9b49dea848c74e1b04a8241df873977938011aed2c5acc9084d1e1c2d0aa7ea0de44692 SHA512 39e076b3ecc511646e6e14884852313ba6126810841ed9667a53ac061232418e8e53e2cf9191b35d7655168680d961ee2edf67bff5e16b295f8a00752032e253
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.45.tar.bz2 497695 BLAKE2B c905675253d992757e44baf1fae42d8363789ce3eb4d71d6f0e5c994a63efd307af69fb81aadb1875f0f2da952c0b3c8fbbc79c9c5c0b22c2d2f82029b417f11 SHA512 bb22b6b88778e2586411318905aa165e590185f7a87ac30761d6250f4de22a1deec6be5441926eae28011d3a5a923bad2ac366e237cc96a4d7932e3dbc9a1f2a
-DIST pure-ftpd-1.0.46.tar.bz2 490337 BLAKE2B c0b1fcbf46343dd49fcc9ecec44807c9474ecaf29869f67bfebfd722e0fd9947e8c2e84d5123afcdf6d219d527700f317affd44f3610a6dec46a1cea7ab0a433 SHA512 e44c1842e6f101f4d7dd42617392f3d54ff58d68608f6a3bc5e612fc89bfd1da6935215a7e87c0d2bbd9fc9f0fa31a40ceb764fd67428dfdd8c5454e0d64e0ab
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
-EBUILD pure-ftpd-1.0.45-r1.ebuild 3896 BLAKE2B 5898ca67bad41a51f0c40cc49c5f56aefde1948be2ea24b2d0f948734e86742de28a68c37a04a8b4ae93d238da8c5bd91608528abba436f3dcc5c9b3a81134f9 SHA512 285cfa299ff0f5554b1b54163e4d0c9824f404c2eee76cb77831c6989b8bbc089f45b6c0acc969ac35bfc77065082d6a0288ec35c38427204edc0bcef7354176
-EBUILD pure-ftpd-1.0.46.ebuild 3867 BLAKE2B fbfedba995ca14f2c9e6b8e5ce1bba53631d5451c3be6d1ca18d237073c072da67899b79b53137fb6a4b8dd2047e8fbf42244a92699cd89f9f0da1af64b2d240 SHA512 baae36d4332ba3e44b913691fe90e382f55eeff34da12cbbf1d81361db5db8e0d1014329d915972010656131519071f1c983bf7177a59f2bed9ad04ed625859c
+EBUILD pure-ftpd-1.0.45-r2.ebuild 3944 BLAKE2B 6aae69a820f6bc379f0bcf42daf5a7047a4bc424a44b7018cd59d2b644329f3669d620a75e3eed9f7748a056ce667435f5babf7587268b7a969454a5cf14c306 SHA512 232589647aaba6adfec80a8cc024c5674f27968f4db3491711cb6cf00fd30515eb224b0a93de3bd618066c2e4025372d0cc906be9dc4159fb4c867ff92ba4af0
+EBUILD pure-ftpd-1.0.47-r1.ebuild 3915 BLAKE2B 0d216396715a08d42477a4b6fe8d846b08fcd941e704a870e8e9b4a4c8dc0f41f9ecfc52e148d2a954349fa77393b65c17bb8180c7a4ffa2e0cbb77055b1499e SHA512 85e3ff0ee728198655a72d85f363e13c806f2c5316c24e6434f7d52b643908b61289c5d38cc45f654797bc62d6e4420813764d0021ed57c5a8c800de1fc5272f
 EBUILD pure-ftpd-1.0.47.ebuild 3867 BLAKE2B 0c1930e2ddc0aa3efbbe1388d6017fcd5fe0e75b399819676c23c14b9b26eb4a9e2d124c086454fe522d56b2c75940e0fae6d6501ef26a82d8ae9d04c7289afa SHA512 02420399d83ba5e5d54fdca2b57dc87a28f23bd7a39f2ad28960feb30603a5b8ebc6614bae77fedc87a4a73f1ac3c75a5a878a815908a6440e0ed7a59df6d855
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch
new file mode 100644
index 000000000000..a9ad0a30b9b6
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch
@@ -0,0 +1,22 @@
+From 27a5c200f9643ce907118aad169279b3a66a9e8a Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Sat, 4 Nov 2017 20:46:16 +0100
+Subject: [PATCH] Increase MAX_DATA_SIZE due to Argon2id requirements
+
+---
+ src/ftpd.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ftpd.h b/src/ftpd.h
+index 1beeab8..5bb1f6b 100644
+--- a/src/ftpd.h
++++ b/src/ftpd.h
+@@ -557,7 +557,7 @@ Your platform has a very large PATH_MAX, we should not trust it.
+ 
+ #ifndef MAX_DATA_SIZE
+ # ifdef HAVE_LIBSODIUM
+-#  define MAX_DATA_SIZE (40 * 1024 * 1024)
++#  define MAX_DATA_SIZE (70 * 1024 * 1024)
+ # elif defined(WITH_LDAP) || defined(WITH_MYSQL) || defined(WITH_PGSQL)
+ #  define MAX_DATA_SIZE (16 * 1024 * 1024)       /* Max memory usage - SQL/LDAP need more */
+ # else
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild
deleted file mode 100644
index 7dcc0d9aee3d..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	charconv? ( virtual/libiconv )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libsodium:=
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.28-pam.patch
-	"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with charconv rfc2640)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-		if use charconv ; then
-			ewarn "Charset conversion is an *experimental* feature!"
-			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-		fi
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
new file mode 100644
index 000000000000..d448d8f15cd2
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+
+DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="http://www.pureftpd.org/"
+SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+
+REQUIRED_USE="implicittls? ( ssl )"
+
+DEPEND="caps? ( sys-libs/libcap )
+	charconv? ( virtual/libiconv )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sysquota? ( sys-fs/quota[-rpc] )
+	xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+	dev-libs/libsodium:=
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.28-pam.patch"
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+	"${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
+)
+
+src_configure() {
+	# adjust max user length to something more appropriate
+	# for virtual hosts. See bug #62472 for details.
+	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
+		-i "${S}/src/ftpd.h" || die "sed failed"
+
+	# Those features are only configurable like this, see bug #179375.
+	use anondel && append-cppflags -DANON_CAN_DELETE
+	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren && append-cppflags -DANON_CAN_RENAME
+	use anonres && append-cppflags -DANON_CAN_RESUME
+	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
+
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
+	local myeconfargs=(
+		--enable-largefile
+		--with-altlog
+		--with-cookie
+		--with-diraliases
+		--with-extauth
+		--with-ftpwho
+		--with-language=${PUREFTPD_LANG:=english}
+		--with-peruserlimits
+		--with-privsep
+		--with-puredb
+		--with-quotas
+		--with-ratios
+		--with-throttling
+		--with-uploadscript
+		--with-virtualhosts
+		$(use_with charconv rfc2640)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with pam)
+		$(use_with paranoidmsg)
+		$(use_with postgres pgsql)
+		$(use_with ssl tls)
+		$(use_with implicittls)
+		$(use_with vchroot virtualchroot)
+		$(use_with sysquota sysquotas)
+		$(usex caps '' '--without-capabilities')
+		$(usex noiplog '--without-iplogging' '')
+		$(usex xinetd '' '--without-inetd')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
+
+	default
+
+	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
+	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
+
+	if use implicittls ; then
+		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
+			|| die "Adjusting default server port for implicittls usage failed!"
+	fi
+
+	keepdir /var/lib/run/${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		insopts -m 0600
+		doins pureftpd-ldap.conf
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog
+		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
+		elog
+		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+		ewarn
+		if use charconv ; then
+			ewarn "Charset conversion is an *experimental* feature!"
+			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+		fi
+	fi
+}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild
deleted file mode 100644
index 0666f54ec764..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	charconv? ( virtual/libiconv )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libsodium:=
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.28-pam.patch
-)
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with charconv rfc2640)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-		if use charconv ; then
-			ewarn "Charset conversion is an *experimental* feature!"
-			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-		fi
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
new file mode 100644
index 000000000000..412951b81a3a
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="http://www.pureftpd.org/"
+SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+
+REQUIRED_USE="implicittls? ( ssl )"
+
+DEPEND="caps? ( sys-libs/libcap )
+	charconv? ( virtual/libiconv )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sysquota? ( sys-fs/quota[-rpc] )
+	xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+	dev-libs/libsodium:=
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.28-pam.patch"
+	"${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
+)
+
+src_configure() {
+	# adjust max user length to something more appropriate
+	# for virtual hosts. See bug #62472 for details.
+	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
+		-i "${S}/src/ftpd.h" || die "sed failed"
+
+	# Those features are only configurable like this, see bug #179375.
+	use anondel && append-cppflags -DANON_CAN_DELETE
+	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren && append-cppflags -DANON_CAN_RENAME
+	use anonres && append-cppflags -DANON_CAN_RESUME
+	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
+
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
+	local myeconfargs=(
+		--enable-largefile
+		--with-altlog
+		--with-cookie
+		--with-diraliases
+		--with-extauth
+		--with-ftpwho
+		--with-language=${PUREFTPD_LANG:=english}
+		--with-peruserlimits
+		--with-privsep
+		--with-puredb
+		--with-quotas
+		--with-ratios
+		--with-throttling
+		--with-uploadscript
+		--with-virtualhosts
+		$(use_with charconv rfc2640)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with pam)
+		$(use_with paranoidmsg)
+		$(use_with postgres pgsql)
+		$(use_with ssl tls)
+		$(use_with implicittls)
+		$(use_with vchroot virtualchroot)
+		$(use_with sysquota sysquotas)
+		$(usex caps '' '--without-capabilities')
+		$(usex noiplog '--without-iplogging' '')
+		$(usex xinetd '' '--without-inetd')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
+
+	default
+
+	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
+	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
+
+	if use implicittls ; then
+		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
+			|| die "Adjusting default server port for implicittls usage failed!"
+	fi
+
+	keepdir /var/lib/run/${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		insopts -m 0600
+		doins pureftpd-ldap.conf
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog
+		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
+		elog
+		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+		ewarn
+		if use charconv ; then
+			ewarn "Charset conversion is an *experimental* feature!"
+			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+		fi
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 6ff1b8d624da..40e1042859cf 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 098a0fa1dd96..c4ddd70ee891 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,5 @@
 DIST skypeforlinux_8.11.0.4-1.x86_64.rpm 94517788 BLAKE2B 5cec1184c566822dab55a2e01424400d46c9894fe77c0031c59063359c50b017f485ee1505db961fa4dacce9c1bd2634bbabd88b6b03925c4cff80d7a7d9b408 SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e
+DIST skypeforlinux_8.13.0.2-1.x86_64.rpm 102816632 BLAKE2B 402b95a4dfaebf93200f46fb226d907fe99bb42141f629750ec34c97bae576b79953178c21cfb5309e20867a227577998887e063b9aa2a7e4aacfd0c747911e6 SHA512 2628cb5be1d95b838afd2bc51f200e7c2591e5620c45019ff179fb2f8a480dea0f643676ab0cfea5946a1a5d79d0e181b1b1e4c8f7bade60ffe176e5cb8b3795
 EBUILD skypeforlinux-8.11.0.4.ebuild 3688 BLAKE2B 322fcfdb6cdcd715a7d32d35b6fcd3b590642b830bdf92e61ec0ff3de430018c666a2266162f94225285e5d293918c36b810d12d7886c966e68adc8c4282cafd SHA512 75c9b9adf6c9451639528faba26ecb120b6c672772dddf7392d9a2d13786f78018d46e7f2b0fad14a8d3c73c946a750e54c482c32b6d8df3ebd7a5bc71356a0a
+EBUILD skypeforlinux-8.13.0.2.ebuild 3688 BLAKE2B 96d57b74a1999954486ec4705e34a91e231ad68a831a587d774bd796be37a24b93fb3383449eb71fc0c7c52064f3d2959d3111084de7c415912dd5596c6504e9 SHA512 30be913632466485e4ea45c8dd0e3954a742c99a23dfc965ebfdd662832d1462940a79c1de212891b8616bcd4bd6f4eced3a7e265c9170efdb4c3d163614fdbb
 MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild
new file mode 100644
index 000000000000..e7683f76434b
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
+		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${D}"/opt || die
+
+	into /opt
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${P} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	# compat symlink for the autostart desktop file
+	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	if use pax_kernel; then
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c864634d7707..afd491738028 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccnet/Manifest b/net-libs/ccnet/Manifest
index e931bb4472eb..d19a5d0a8a61 100644
--- a/net-libs/ccnet/Manifest
+++ b/net-libs/ccnet/Manifest
@@ -1,7 +1,9 @@
 DIST ccnet-6.0.7.tar.gz 179356 BLAKE2B cc7a3fb70013e575845c8fd638847f1fd9670b0ea1997d208fd89f917f1c4c60ed86064c31db118bf5969dda27bc055d5e3abf0bb1ad63bc00ad49ba5819dda6 SHA512 66df998bb544ad614479d853820e3ee3119c2b08087d82a2a0633202c860447a7ac79f3639e587d531c2443def3cd58bf9ccdb2fed350c8bd7005737fb3d85fd
 DIST ccnet-6.1.0.tar.gz 179362 BLAKE2B a7c10433a3af69456f15df75c02d92e203628f7f4d64a9f57849cc80e8d0913fccc7767b58e161551a2105cbffd79074144237fbacba5663972eadea661131d1 SHA512 0053d342cf9256a37ca2ebf774794c791cb08caa7d608035c1b307a271e11719da1d4c272870ab51ad1cd8d8c0a84d22959b513865ddf98b4691cba35bc93018
 DIST ccnet-6.1.3.tar.gz 179321 BLAKE2B 23f6877ee9e3d80d4413e7b059688d83f99e21f3b665abaf41389366cf99fcb841e730535808e6874f4c1ba09818f637bbf222858ebb1ec3473cd40b6b03d0b0 SHA512 1700237749dd250798b6bd3ea2d74bd09f72e3f5502520d413671c247eeeae05f92947a4a4429035f8ab6414c9c67353939025de046b00941956b6854f4cfcc3
+DIST ccnet-6.1.4.tar.gz 179357 BLAKE2B 5f0a83ef15f43394655c68d2b2a13ca91e0df93fb661f598814d8f0c4a31eddb26d0b8a0f0679d9c3babf7200f8ce1bb75818e0a6d445f41527358b4c6102d2c SHA512 99ec3f41ad1e6c06455ca1622b6e5219d76ce85014523db6bfd15cbbd9b54fd4027f87906fc47bd7bafcbabc9febdbccb6839c5b8fa10133ddb461dca4f46ce0
 EBUILD ccnet-6.0.7.ebuild 873 BLAKE2B 679326c2ced8f7b7b246f56b6c27b09352e4a49108d722236c951637f31856e2fe38b85da6869a236fea6857618bcf07a2b797a7fd73c6e028b931679a77d090 SHA512 6ebabe35a41860198c5f32a01c59ef0505b78238747dcbe705570d42b42dcd61cf89a4faee2036b7e04b7294eaad88aa471135abba20739745352fd4d2b8f593
 EBUILD ccnet-6.1.0.ebuild 873 BLAKE2B 679326c2ced8f7b7b246f56b6c27b09352e4a49108d722236c951637f31856e2fe38b85da6869a236fea6857618bcf07a2b797a7fd73c6e028b931679a77d090 SHA512 6ebabe35a41860198c5f32a01c59ef0505b78238747dcbe705570d42b42dcd61cf89a4faee2036b7e04b7294eaad88aa471135abba20739745352fd4d2b8f593
 EBUILD ccnet-6.1.3.ebuild 1009 BLAKE2B 60ac3868b2b59dbf88a6baf296323e63f9c0146a5f34b337332c295662eab76678e556c436f2289ee8f37f830d67cb9af72beb2a3c3f55e3e956dfa03b0ab3aa SHA512 93985895949b2eacde0c1e73713627b9d46f43584293c2a0c51712302c444d7324331fa07c638dfb4be7df0614b776a99bd15df6d0465e1f7ecd2b60b643e58c
+EBUILD ccnet-6.1.4.ebuild 1009 BLAKE2B 60ac3868b2b59dbf88a6baf296323e63f9c0146a5f34b337332c295662eab76678e556c436f2289ee8f37f830d67cb9af72beb2a3c3f55e3e956dfa03b0ab3aa SHA512 93985895949b2eacde0c1e73713627b9d46f43584293c2a0c51712302c444d7324331fa07c638dfb4be7df0614b776a99bd15df6d0465e1f7ecd2b60b643e58c
 MISC metadata.xml 414 BLAKE2B 4a36924c507e6d008c32aa08bd7216b525c9b987229cb9158393d3b0abbca75ecafbf9ff9f7b687afa53b73d41a32588960f7abd9bd365b795f87cb064d79a93 SHA512 d3687845c8d2b3f8bed69df446341ebcea3fa151bf956d2c87c4aeca43c4a5af29cec35e9dc894b7f95d97e2f144324e78cb0d68d62c08c7db3c86f3587b045f
diff --git a/net-libs/ccnet/ccnet-6.1.4.ebuild b/net-libs/ccnet/ccnet-6.1.4.ebuild
new file mode 100644
index 000000000000..111ba4108381
--- /dev/null
+++ b/net-libs/ccnet/ccnet-6.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="Ccnet is a framework for writing networked applications in C"
+HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.16.0:2
+	>=dev-libs/libevent-2.0
+	dev-libs/openssl:0=
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d57e8b09a45f..425bc4122f2a 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,7 +2,7 @@ DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855c
 DIST gnutls-3.5.16.tar.xz 7559812 BLAKE2B 5b2fded412823b3f947c000f71bb816e2e248c8f740c2e678ec1e8289dd0b4af73a4f4ab46012c7430aa2a5c57dc7fed532eb1666c13328ec90ed159d1ee48a8 SHA512 451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07
 DIST gnutls-3.6.0.tar.xz 8024972 BLAKE2B 754ec0c097430ef0d5c8c998b94e85c53ac6d34ec0e8b47c83c55f5e6235f783013572040998eb4a163e46ff569827c7c20c81f4e02a129b65e8b0c5d6d59f99 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03
 DIST gnutls-3.6.1.tar.xz 8064408 BLAKE2B 1a573f476261532d516ec7a2c4640cbf8aaaebbbdd129ccfeb1b88d3a66f919ff0eed142a91df19ca9c2f69f90c8c65b965c5659024d54db03606aae811bbc14 SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23
-EBUILD gnutls-3.5.15.ebuild 4252 BLAKE2B 60a9de7237b9a43a3da0e7c6198a429a3838507284ca3621a5f524238b543222f0e282cba2e2a42978c58152144c57f440a39c98ee4a0f1589bfc76d65ee2cea SHA512 629ce1db8fa7ac2a527c297ee905501ce5a6003776f76b8f588e63d8bbfe2699bf2154d9e2cf885e7ea9db3318bef10d74cec651cc2ee944c8e6fb7b801c4bf5
+EBUILD gnutls-3.5.15.ebuild 4248 BLAKE2B 412742096c0cf5327dac3ac77ffe90fd0495afe8ddda47080ef27d61779c70182cc7f03adeb4d3e52c3b00c7a4476b98951bae6a6d5a967ca3507c08f952e634 SHA512 5625f06936ec207c097a49b30caa5c9a32e9c03b1ab7bc757682eda6100205fa90d4fa10b668e80b7d106804529f174cd4e854dc424cbeec022b6713d27f2cfc
 EBUILD gnutls-3.5.16.ebuild 4261 BLAKE2B 5ac1b43fa40442f63ab6a3af56ee283b343e11029bf001a61ae567da37b1b86032eae96cefd9410faf35d5e598e3827535d4e6e980e9d94cdd3cbbd59969b25f SHA512 fe0b4b2a9fd99971ec631eacd7e66f45b23b4bd50c14fe5bd45e065cfd0c587eba19c9d25abba894ae7cb36199ea75e4af17b6d41e968f971a4b8cc115fa95e3
 EBUILD gnutls-3.6.0.ebuild 3878 BLAKE2B 0cebd0411d0d453de815977333a51635b63a53e4fa64a27fc8b570285a48555f19a2f0be451dc228e82d02af9c812a57716a07105767104b59f4838a0f5e3f3a SHA512 ea857f52bce797a16893eea5bc18ac2a79d12203abf0e477307f2e6676b1c8d54b9e1f8540640d617ae605fd7cf8e9a4915d51985cd8296c84b7e67843ed7bce
 EBUILD gnutls-3.6.1.ebuild 3878 BLAKE2B 0cebd0411d0d453de815977333a51635b63a53e4fa64a27fc8b570285a48555f19a2f0be451dc228e82d02af9c812a57716a07105767104b59f4838a0f5e3f3a SHA512 ea857f52bce797a16893eea5bc18ac2a79d12203abf0e477307f2e6676b1c8d54b9e1f8540640d617ae605fd7cf8e9a4915d51985cd8296c84b7e67843ed7bce
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index 3d5cbc760e0f..ea87930e307c 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.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 ~sparc-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 ~sparc-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/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 27302fd0915d..97ec2d003cb5 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,6 +1,4 @@
-DIST libbtbb-2015-10-R1.tar.gz 221859 BLAKE2B ee24849f85b4ec1d0eac0c6779bb30074e7544dd07eea4591db5503322f4ce238bd5817900665def51b36b533d360ca7b0d2cf1464643d4a25a897fb1fb5fa86 SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac
 DIST libbtbb-2017-03-R2.tar.gz 303689 BLAKE2B d36cf5329fb31cd50f64e3a9b625ebca8bf198794073480baa4f64935f4bef183e4c11f0844cd31df943da98c778bdea807fbd91676c23a3a2f830af5e7a185f SHA512 bb7b58a33198fd64fba5f0254cfbb71120c70476d594a7aaf82c77f770d1a6e89b4571f42d3d15c1d93d5246c9145c33ba8724a5ee5ad84e96f748d9f32275b5
-EBUILD libbtbb-2015.10.1.ebuild 2879 BLAKE2B 693012ecf8f623204fcd2953d671b95974d6b8f08a460f2edce2b059f1d7966c59d05eb229e6683cdb53e147d3cb57fbcb8d17f2ef0a2c7d39b001eba5b866f3 SHA512 6f54ec710561eec1af908e4670da73167c8d431d7013fcb5588eca6f250375cec0127a40dcb3fefa5a3c1be1900367340a40ce7e8d1865bb59f7344bdc22108d
 EBUILD libbtbb-2017.03.2.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
 EBUILD libbtbb-9999.ebuild 3653 BLAKE2B f289661bdb77b5544333de760fa1de2a93f66ccf9e9c3a1c552d9ff033cb8d2d09d55648f228a6f50d2bdf650f7a95e7357ed79a4f273534effea09b3aa163bd SHA512 ab2bce27d74c21af2bf5a1702c1d650756ed6fd1968d4ac8d575e6f9e28867f4e71fcf940154d9d35482a13d1eb4b04bcd4dea48ebe73487fbddf18b650b0e08
-MISC metadata.xml 666 BLAKE2B a2e483887deb29bef2484dd83bfa648f3d105ebbcd2b3a8f26435b60629486005550533e4aeb0a25ce20352c6517c7b5f591f6a450a65daf819f4e3f623cc233 SHA512 3e434050568c93d1e79859985ca8600313e1e19df7075a86f6a94408b058117c96a78199e7c2b97519a91e0199f7b001d4bf0e7245dba06b3d214255b0748ea4
+MISC metadata.xml 568 BLAKE2B 508af89d4b95fa71c32b5a610e1630938dc8bf7b83a98b5af981de1a3a70ec0775d694ba5e5514f83e9abdbcb229500080fc31225de40bb65ad347cb273f44a5 SHA512 a4425e207724117d83fcd21f2ed5f9bd52a945597c19ee253c1c55b1e62f0f3d14d71c546cf2e2d6c7ad7b48b0e88ef3d46fc2a172f86cb00c710ed87946430e
diff --git a/net-libs/libbtbb/libbtbb-2015.10.1.ebuild b/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
deleted file mode 100644
index 7734344c353f..000000000000
--- a/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+pcap +wireshark-plugins"
-
-RDEPEND="
-	pcap? ( net-libs/libpcap )
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-		!>net-analyzer/wireshark-1.98
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-		-DDISABLE_PYTHON=true
-		-DPACKAGE_MANAGER=true
-		$(cmake-utils_use pcap PCAPDUMP)
-		$(cmake-utils_use pcap USE_PCAP)
-	)
-	cmake-utils_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake-utils_src_configure
-		done
-	fi
-}
-
-src_compile(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
-		done
-	fi
-}
-
-src_test(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
-		done
-	fi
-}
-
-src_install(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index f8987771de3f..810dd5222c3e 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="extras">Install pcapdump and btaptap tools</flag>
-		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
 	</use>
 	<upstream>
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index ece277c73502..3f662a0d0572 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,6 +1,6 @@
 DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055f8f590b6814b2d40f1daaf381ec9d9710e0bbb894489d251788a135550848714e8b015bf237cf41d72feabf0 SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
-EBUILD libnsl-0.ebuild 516 BLAKE2B e496cefb713654a47e1c720951be52711f7a4ad97293921f8fa9d6af55a6f96f673d716150cea5b9898c57c484ecc0655a70f5914f7636feacbf4d8a0a56c6a0 SHA512 d6a1e4f39b5d09e37a4d9b4ad5d122a84f187515e8ce762d4220b05632d7cd7b7923006db68af7fb41c4e2af885614e1d1c8525172a299669894fb5ab0b77e1f
+EBUILD libnsl-0.ebuild 513 BLAKE2B f0a52dade80a235cbee14c1191d15da82f08a86ae649c4fee6099af8ea20f0eddf9087b420d8e162b3818537a61db2ef8626e4d3d00843fa13948e69b379ecd9 SHA512 6b692a95a11c03c567c35c781bd5a71e9da74cacb11c62471d246c7ef232e06e4b716bceb368c094f395a7afefc0061388ff37dec6640d2b52b399dc3035dcd2
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
 EBUILD libnsl-1.2.0.ebuild 886 BLAKE2B f57d67db05d0aa41f5aea6db34bfcb28d013a0729638c8c023c93aa6cb4e46a8ad7bfe27a53245ea3e2a73cdf6cc3b239677ef93e539d536e28e143209b92e86 SHA512 573c7b004f9c87349a590eb9723d129bfa5b310bf06608011ab06e91b5d50fb20ed6029d31782f11f829307ba35e21d91e96d9354884dad465e910450aed8dc5
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-0.ebuild b/net-libs/libnsl/libnsl-0.ebuild
index 37bd022979c2..eeebf1d587cf 100644
--- a/net-libs/libnsl/libnsl-0.ebuild
+++ b/net-libs/libnsl/libnsl-0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 
 SLOT="0/1"
 LICENSE="LGPL-2.1+"
-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=""
 
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 9d0d84b4a3bc..77a5f8872b96 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,7 +2,7 @@ AUX libssh2-1.8.0-libgcrypt-prefix.patch 1026 BLAKE2B da1ba552aafecb1b950bc8d5d4
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 DIST libssh2-1.7.0.tar.gz 811714 BLAKE2B 488f6b9ea2bf072aba17e8d70136e9bf64b38a4cb6cb572fcdf0253ec5d9afa479c75858b42299e2be39589b9454ccfdd5f7c4a2e355e8e8b5037b2b637a8a4c SHA512 0f9dfd83196129568c00383e2e4fea29b3d8c4f3b1690f550a6748d1db68cc437b4ed083f5d3d4646365fdc839819619aea96eeaef5ab072c7023d13f08b5153
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
-EBUILD libssh2-1.7.0.ebuild 1210 BLAKE2B cdddf4b8ed193788df0129598198a626053e53a47e7d13910ce4ba5eaf9587f5c3d6abbbd087fbbc939687b7a96ebc9ee7f6425ff807836cda5d59c963084f8c SHA512 feed1680c4b5909b5bacbc12e30a43e9e0e15279643ca118f76a8216c7ec29a25475fb5c6e2f76a37c87d243135c66ad8c9b42a96634628acf2eb28c97462615
+EBUILD libssh2-1.7.0.ebuild 1207 BLAKE2B 9264ee9e47f5b1c75c3accba750393a5b565434a7730e024b58c71fbe46e819ee0a6f5fcad89e7e46b0126258b96763e2bdf1b02006104186befba96201eab96 SHA512 431d44ee1ee15c4a17dca5c0f93e3fcb38d1f2847b6ce096cfd5f65252fe8135dfa6a0ff81df1c7661250ff749410053ff496b4792ad223070dbc6decc61bf46
 EBUILD libssh2-1.8.0-r1.ebuild 1288 BLAKE2B 4db050dec0f5a23329cdd0d7714464b61c9880b196f15277b50df616194d0cdde0065d396bbbb38ed88600afdfb42140909a2158c7d2244686b77ffe78e8671a SHA512 ea7e26409aea9709824b276095ab2269b916a6df69619bf979d61752d8340bc55fdfa8119a953d8e559cfb5c8af2d96cf26f1e9bcc449132c9981a507a1780b8
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B c0bba5c19c03822bc3734f2504bef8239e330be3570af8a29abacd90cf1149e2b575156d4d2cd0f9dc3a571abf8c9008fcaaf0587a86c74cb92b9cfeff8671d3 SHA512 ee0431b63ddf905e1efe49eac35a48c7e956a8a3bc03ec48de73f076a226699ae3eba22b1b0798f458d414ff46cc2f29815b0cbed96609021050e510290ea9f1
 MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd
diff --git a/net-libs/libssh2/libssh2-1.7.0.ebuild b/net-libs/libssh2/libssh2-1.7.0.ebuild
index 2bc942b4d5fa..65ef8f62b812 100644
--- a/net-libs/libssh2/libssh2-1.7.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl static-libs test zlib"
 
 DEPEND="
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4cea44bc40c7..e836271ff4d4 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -10,8 +10,10 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3
 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
 DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
+DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
 EBUILD webkit-gtk-2.18.4.ebuild 8282 BLAKE2B 2074b46db74e014544724ee1e2cd5f56f232c77d1f8e254378485acec7cf423fc5de60a737b669428b38451b7cfc7f44b745acbf9f68444e9ab72af43af245b2 SHA512 442d5e8b7ed6aed95366620cf61ea335d504db7cf06d5faf791bd77a1ad0cbb8e0bad556d85bedb2c6aca50523def4fdb7a413d15621e87552e5b321c8614386
+EBUILD webkit-gtk-2.18.5.ebuild 8283 BLAKE2B f6c4dfa1fe775a0862f56b300ede8b95cbb6c52f87f3861fa11da8e167929d1658490baef349eaf2313782f191ac8e4111bd03ec090048d230ed9d292cfa1b4c SHA512 d5f1a6c4e45972fc0bee76fd9380924c219b0a7a10048098ca3902638cbebf0a404545ba9822d63e3e19dd601b0fee0a19e0cfc4ae5bde5e530bf34c1dc0bd66
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 BLAKE2B f54135230b3e5d12303f131bec732e2163c32a58c8571d566810f6563b285c11b253d5e46b80752a1e15a3f6c8462aaa3e856ea1c52b1bb9032d80f1e1b3f021 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 BLAKE2B 9ee92280f93c2aa1107aab98faabf9c3298b0b70b9e5c30fdfd6c8d9cb3f7c9ab5362248c19a9d0d6ed49ec81ca4e6f0b5510413e16dbdace7941f051d0872ca SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca
 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
new file mode 100644
index 000000000000..8bf4a9f17cb2
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index dc2bdfca41cf..8460872eaf9c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b39c196a3144..55d5a7bb05c3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,5 +3,5 @@ AUX curl-7.55.1-fix-build.patch 604 BLAKE2B bf8967460ddab3f0626c93a48d345aa1451d
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
-EBUILD curl-7.57.0.ebuild 7185 BLAKE2B 54952d43501164092fe180abc4604e8919d1fb0f6466bc9ab2b2043b4ab38fe68ecd4fea9d924fea24f687b2548b55dfdb33803478e33f0a7fddeab261f5aad8 SHA512 603b5745fec1cb1eece68f579fdb3b19b83c9e1973e09a933e6a78ed90216ecb400e8a92ef9dc8420de6c08f9eebc5298e74ccd3fb578703f77521ec0c348aef
+EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8
 MISC metadata.xml 837 BLAKE2B 1f3436d7a90c4807a7399367c051aa644604daa46f9090f3cf4b12b4159a5f34d566e660288da7849ec7e8a51661fc71109ae3370d1b87e41842ca3713f7f076 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0
diff --git a/net-misc/curl/curl-7.57.0.ebuild b/net-misc/curl/curl-7.57.0.ebuild
index b41e8b8dd991..e2b69c36295f 100644
--- a/net-misc/curl/curl-7.57.0.ebuild
+++ b/net-misc/curl/curl-7.57.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 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="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index cad29cb849ca..dd8d770a0087 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -2,5 +2,7 @@ AUX dropbear-0.46-dbscp.patch 500 BLAKE2B 268b3a065ff9a9d52659c969195a712e8bfcbc
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea7888cc1687ea2793275134b3224118164ef81583f55dbec53d6322be53eaa7a7324216133919722390d0e2dfbd929f07 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
+DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
+EBUILD dropbear-2017.75.ebuild 2489 BLAKE2B 2094e7d2f7b618a069cbf60cefe44da2a28c20fd89e97adad8f3c064c7b45f84a1167e434742d2867816640c4807fa2752b2412ac86227cd1d6a4432d392fd34 SHA512 10ebe3595920705fbedd1e79a10f6ca0a804e92feb9ec37e82a4666934e9b04fa6d6b7c154adebbb78339a4e82af120aecbfa7d655beda33b46384faa07da0bf
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
new file mode 100644
index 000000000000..44611e4e4595
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2017.75.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+	dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+		STATIC=$(usex static 1 0)
+	)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+	sed -i \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		options.h || die
+	sed -i \
+		-e '/pam_start/s:sshd:dropbear:' \
+		svr-authpam.c || die
+	restore_config options.h
+}
+
+src_configure() {
+	# XXX: Need to add libtomcrypt to the tree and re-enable this.
+	#	--disable-bundled-libtom
+	econf \
+		$(use_enable zlib) \
+		$(use_enable pam) \
+		$(use_enable !bsdpty openpty) \
+		$(use_enable shadow) \
+		$(use_enable syslog)
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README TODO SMALL MULTI
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}"
+	fi
+	save_config options.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 3e2204080fdb..1c99c0e15994 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,9 +1,5 @@
 AUX 2.7.15-no-user-root.patch 704 BLAKE2B d7353f8338be379cd31f42cc29c4346930c191b3157084df658eebc0d1e4202d9711d8694b6b6ba65285f0de1e83ab55188d9d79a2e6a45c919c1dcb64003b91 SHA512 3bce2f6b0605e708107097b8bb033681c901afc535c1921712d3b2db172cc296b50cc4a833b0d21c9718fc094d37d9d9b3c2e9abb65d6f96449ae91635d3101c
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST Electrum-2.7.15.tar.gz 1967697 BLAKE2B 94a189fb1b950dc2691cfa92143d68052f615e534fb9d3d7feed92a39bb717199b227d0e265715e86c3ed9b8ccd743fa77f2691dfc5b47073b03f80152185565 SHA512 2f4f5181dcf0b98ce34348c296e50383b677db1fd14fa0052a0168a7c880d18d04ebb9a91dbb7316e09adeda275cc87b5457c8f0925b3635a1c769c81f31165c
-DIST Electrum-3.0.3.tar.gz 2590410 BLAKE2B 676422bc14ce597a2b4903ea4d7e3dcec1bd23424d678aa1c248e824a1656a60afaef284c8ba22242da3cfdbe4421dba04f4aeef42ca507043988067a340d0b9 SHA512 6628b6621e3502bb9782ec7ce0fd11a657c10dfaab6a5c4de4e4bae5bc1207fa55f642a92fcca08e1f342e0ecf8dd0c72134db7020e03df2ed6f81b27c49aa30
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-EBUILD electrum-2.7.15.ebuild 4097 BLAKE2B 47368e67b82f77c16a37492dc766695cbdc8da78e98052262a9213febcad4b6ed5d958b126566f118951b1b4fc26f37874052417d5fa92cb16000b37e24fadeb SHA512 1a147ff600c857c1b4743d19b4bfdab6d474d2d31a0b97b6f4692ed639514cb8965200c41e5e6666eb119e3f7af35f6d47aeb4408489d4ef83929ceaa433ad8f
-EBUILD electrum-3.0.3.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
-EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
+EBUILD electrum-3.0.5.ebuild 4256 BLAKE2B 6f8b98f75accac0d16401175ec13acbe355ae328b69b06a04d0e55e0ccfa95c34d4804a8239bed611188af59c54a346077701defd827aed4b525ee42ad2628d4 SHA512 09d6270945126e63ea0c8385ec4fb4726d7b029e12543fcf6466c1384bebb38ab87d5462e926f1928971423099cb49fa0cb9433c52b4230fff474eb29750a877
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
deleted file mode 100644
index ef6c1839e594..000000000000
--- a/net-misc/electrum/electrum-2.7.15.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt4 )
-	cosign? ( qt4 )
-	email? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/slowaes[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-no-user-root.patch"
-
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt4      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt4; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex cosign        '' cosigner_pool   ) \
-		hw_wallet \
-		ledger \
-		$(usex email         '' email_requests  ) \
-		$(usex greenaddress_it '' greenaddress_instant)  \
-		keepkey \
-		$(usex sync          '' labels          )  \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin   )  \
-		$(usex vkb           '' virtualkeyboard )  \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-3.0.3.ebuild b/net-misc/electrum/electrum-3.0.3.ebuild
deleted file mode 100644
index 2b62832e8ba6..000000000000
--- a/net-misc/electrum/electrum-3.0.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		revealer \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index 2b62832e8ba6..47ccf45aef4d 100644
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
 
 my_langs_to_l10n() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b4a02f11b122..3868fb040023 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -25,7 +25,7 @@ DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f5
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r3.ebuild 11069 BLAKE2B 0efa1ef57d36fa9f0065f47e6fb5eecf1a15d860123232df4e6c6d5ac2a9539e3698b31b055219f35cd1104485db9befe120395db87fdfd31f9fa8d715b4243e SHA512 9ff09f013015a94c2c47ac8e4206b3039eea861b4c5597fdc4fe4766081057e337ca121a7b32456f4ac842a5ffcbb3a8246c2710aaa68c195a8fe4b39c4f4a1d
+EBUILD openssh-7.5_p1-r3.ebuild 11127 BLAKE2B aed57a04ffa504758827af9269c747617598677fc3ec2a2c587b559f7874b9f1d0a0269a32ff7fe4fb454271f62cc7931a68bf537db9bee4e4cdf7925d040046 SHA512 2fb7096c8b6a44d9abd89c8312d506a5ce711a7be049d1fc227d155fc80e138b1118110c9f5491d92a1ebda310207d75eaf80069d122ea4d4dde4002fa96b66c
 EBUILD openssh-7.6_p1-r1.ebuild 11184 BLAKE2B c864783cdb2798c4b51986f08ab959117e57965f60a6d718caf508928a154344b5e2934db619dab7fc698b7c1411b8b79db01bb4076246662db5b1d034ffab58 SHA512 5ee9beacb3acf9d9b195e02ab10b390432ada244fb4c9e97a0cb1f04a8fe902c6816e0e1a6807bce8401c9827bc220a508fcdfd6650d43885a4e699c08e30884
 EBUILD openssh-7.6_p1.ebuild 11183 BLAKE2B 1d83808228655f59f0c44f65c6b61901f1b650b59447e15382c72e5477238d0fda4a669f8982afb295604e4a72e71fb7eed98d373e4ea6403c1cc585024ef9b5 SHA512 3b779a728ab8f1b0f8d2973be0c2534c0572b33b17f4e51e407c92502d33c23eece1e35ea118aa374422f8a8c5aea27adf86f863f19c01f199981b639146046d
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index 1f173bc6211f..a3c62aa567f5 100644
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -132,7 +132,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
 	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
 	epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
-	epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252
 	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
 	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
 	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 20c128492971..a75b89f6be56 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -10,7 +10,7 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
-EBUILD rsync-3.1.2-r1.ebuild 2869 BLAKE2B 039b1290b3e5ae9ea76f2d0ae1f8a7f31cb5044a456feeac3a81f450ef6482a145d98b3b9ba611baee40de96fdd266b09ade4a010d5f1aa4769f3add743f3bf2 SHA512 3ebd1ea8837837474c7bd3a791e4b9961470cb52eef482ea2c0b19250bfac98f7b92467299f3c415a56ff5575aef7d9939d09b5b7ad6cf4d461d6ae2a9fb643b
+EBUILD rsync-3.1.2-r1.ebuild 2868 BLAKE2B 43895a478b5e451a202c61a9103f0bc0b66c067e8dc52fdb868b7149c651cc85cccd8b2b5564e87097becad079ee806361b4cca53456ab46c09d219b900be589 SHA512 4c0311a250f2ad01016918b0b0c5bd4eaa09953d913e9ee66da53b081d7941312903d3b068ec48710f5ead6f659b0315fe422c729277650c34238106c8afac4a
 EBUILD rsync-3.1.2-r2.ebuild 3080 BLAKE2B a78563994b1bcefa55bb71b3ecd66224be4f6d46177f80fcb3597bcfa0944313b7aa4a37c05ee1801a5fca293978cd8fc51c15a8d4b0da2aa9c2d6c32498a605 SHA512 1627518be854536ba26be38dd98cfb2f563ff855625742cbcd6d401252d42f17e2830188dd2de6de3e07404979de922a63b69bb71874773b7cb36c92014a327f
 EBUILD rsync-3.1.2.ebuild 2840 BLAKE2B 2ee399fcfa6ed8b11b2446178653d3ae55a4bd2f920f4ca5430f397741f9161ce6ccfd472030e7f008225fa28f9886d92751767be5b2213a5f0706207f9c448a SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
index 4778a67feccb..84bd042e0aae 100644
--- a/net-misc/rsync/rsync-3.1.2-r1.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 99a2c41c21ac..fe027afbd473 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -2,7 +2,9 @@ AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2a
 DIST seafile-client-6.0.7.tar.gz 2192384 BLAKE2B 89bd8821b2b5a10ddb94d48ea43f796622acab24db7982ae7006c32117f4dd4fe63839643c308e3e1dc97c47be813248ae3164caded4c1551fed3f86aa6dd83f SHA512 4baa15d454a9c937c9ae944b2bcc6b549fc41a1558e40578a273497ccb120a9131580f2b5db047ce6d7e0503105bd0fa5312e823ab475241fb07f5ba0021224f
 DIST seafile-client-6.1.0.tar.gz 2246388 BLAKE2B f57e89e9ae9364e8712e2f3a464cf2204b72a3ed141a7562a54c5c6f678497053b37ba64ca3de84e114a596a76fd1391ee8f98574627536abf8aee5271c7c154 SHA512 c6e3191afcaa833876c24690566be36ccc94e7a333c94f78df9201f23a3eed37397641e237e63b70cdc413ed6dc5683737d2eefa5c2c628b5e207bef1176b0d5
 DIST seafile-client-6.1.3.tar.gz 2358459 BLAKE2B 75bd2a98de25c135060e5c14ac984a98dc0d6da903b675cc456b1bb52475c5a60a2c2b78be5665aa80a4c05d3fc8f2cf5e016e28ba25feb8e957a1d8d9d93ad1 SHA512 be5426ef472ac7e788e164f601c4c2b2ca91e305b15dac7eddf9874af5639141bf845e36c5385c4af1d2f6df4c7af6554497bd107cbccb35f8c904694705497d
+DIST seafile-client-6.1.4.tar.gz 2210086 BLAKE2B 35b118c28ab8cc011e6ebf6ff7532f7078d4acb7251e7cfadf3e1b4e7d4507b09f5beefca1fdb2ba9daafcb118981af743b80698662cf4ed73b15781c0282c87 SHA512 582b630d6da28c06ef8c3841268d3e8cbfd7dbd8fc8f78fb77e20d86f6fb97ee72f5a1cac722cd1cb5874d9ad6e687e4d03097971230f92c90ce6b02da90c243
 EBUILD seafile-client-6.0.7.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
 EBUILD seafile-client-6.1.0.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
 EBUILD seafile-client-6.1.3.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
+EBUILD seafile-client-6.1.4.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
 MISC metadata.xml 515 BLAKE2B 3392b5f9ca2c3ad648b045eb8896f417fdab9ab8591b11fe1634272f0738fb5114b22a1b46bf5c618de53d6d7594ba748682210201b9843a55a52b1d37ff2a99 SHA512 80554cfef46d79142fa4a00b3f84ea3ba55ddad45d9b0bb08f76302581e9268f51e16e7ac20de15241fdf1d8765fc515c49a41a14bedea0dae3844e7f7f4ecb6
diff --git a/net-misc/seafile-client/seafile-client-6.1.4.ebuild b/net-misc/seafile-client/seafile-client-6.1.4.ebuild
new file mode 100644
index 000000000000..69b7bcb82bb7
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-6.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+
+RDEPEND="net-libs/libsearpc
+	=net-libs/ccnet-${PV}
+	=net-misc/seafile-${PV}
+	>=dev-libs/libevent-2.0
+	>=dev-libs/jansson-2.0
+	dev-libs/openssl:0=
+	dev-db/sqlite:3
+
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-select-qt5.patch"
+	cmake-utils_src_prepare
+	if use shibboleth ; then
+		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
+			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index a9483ab0bbe0..54b8a899c3c7 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,9 @@
 DIST seafile-6.0.7.tar.gz 823384 BLAKE2B eedb4e4333d01bc6e5a7d18bc0035aa921a00d2c2fadc151dc34971dbb0191c7220607e91422a5b75d957f037d90aa814faffdf3f7cd4dbc5bee5d17a49c1c92 SHA512 ec33fbb6b925d4be9b89140d75287115e09f570654946aff994eb50d2ca46e233005b8e0e917682822806d0b5fd70cb9b8a728bb0fd09d124adaadaf3efc849a
 DIST seafile-6.1.0.tar.gz 823289 BLAKE2B 446606192eac43b5c0b56a322452e0573b1f9f80d66167fa67a99dc236f0e7f2d8d167129a01f70d138208afca467779ffab6f911f7f0bc99a4c730c0181c3ba SHA512 ccf2c66288093da7a00c24d019a1d765c6072485584d045b0d7acec4faee3448f52448113976eaf63950b1feda2c08d8ebda274f3178ca8ca6c643a822dde3fa
 DIST seafile-6.1.3.tar.gz 823078 BLAKE2B 320f237db2d4c6f1bc7928627c404a1fcdc55a381d62a572e31a086e06abc35cae6ae848d28771e0882911a51477322436c8da58fc7948af201f731ea88b27c7 SHA512 c8c046952d5c8910f0ba444cdcaa2659260d328ba6449099777850e7d04f494186c56a2fd00e43fd20372c817d977e1a2fe36be040521ca92742c48d83d0b777
+DIST seafile-6.1.4.tar.gz 824276 BLAKE2B c21d01640128d52a9ee0ff05454107d84535942d5f5117de507e1898367fb9cd6adcaa15054a86ca3abbf9f5e69810cf26ac75d9f12b1439811d88aa5b87603f SHA512 5efcb3122877f9091f76b0946ba66104baf626bc1be9bc0eb980e26aa07ffdbe5ee74ea6780043796603d0f2bfe7ea2800718085acdae6f07268275a8f54269f
 EBUILD seafile-6.0.7.ebuild 955 BLAKE2B 53f8c76e2b79df08a64fc82b0fbd347c924e8e71b546ed749e8b1d56173f7497dc3555cbe7df59b92b30118a32ad27598e6aad3325909090d1eec94da01e7057 SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba
 EBUILD seafile-6.1.0.ebuild 955 BLAKE2B 53f8c76e2b79df08a64fc82b0fbd347c924e8e71b546ed749e8b1d56173f7497dc3555cbe7df59b92b30118a32ad27598e6aad3325909090d1eec94da01e7057 SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba
 EBUILD seafile-6.1.3.ebuild 1126 BLAKE2B 91321048dba6b1de7317e93cb57976d4c808e2ed5216a3cad08518e53612360ec567b2055a63a34dfd0d56e95c105750d27f3912a3d90c76e7fa214086234e9b SHA512 c8f564ca319459320d0059e81e94e728aef02e92f5d780a0f63928dcb845aaf53f93d0d05af6e9b8950390d65ed341c7f1e1760d2eaa2b9c7e0a0df59edb7947
+EBUILD seafile-6.1.4.ebuild 1126 BLAKE2B 91321048dba6b1de7317e93cb57976d4c808e2ed5216a3cad08518e53612360ec567b2055a63a34dfd0d56e95c105750d27f3912a3d90c76e7fa214086234e9b SHA512 c8f564ca319459320d0059e81e94e728aef02e92f5d780a0f63928dcb845aaf53f93d0d05af6e9b8950390d65ed341c7f1e1760d2eaa2b9c7e0a0df59edb7947
 MISC metadata.xml 416 BLAKE2B 72bb9c35eb247e292093a6fc05fc13228080139c50b1b3468fad25d08accd6bdc0a5c0bcbe27e058d123d9b289f6af01d9bde66843583faa7ab59b38f2018bc3 SHA512 e4d42b41560e43e00c0892649631a8f9a2114c95a2dda910b30bb4784c110a46f7effd1af0f09fcefcc7cf9287d5da8dfc51b69dfefc3e7d328387a842a6b000
diff --git a/net-misc/seafile/seafile-6.1.4.ebuild b/net-misc/seafile/seafile-6.1.4.ebuild
new file mode 100644
index 000000000000..8c268d75d841
--- /dev/null
+++ b/net-misc/seafile/seafile-6.1.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_USEDEP}]
+	=net-libs/ccnet-${PV}[${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.16.0:2
+	>=dev-libs/libevent-2.0
+	>=dev-libs/jansson-2.2.1
+	>=sys-libs/zlib-1.2.0
+	>=net-misc/curl-7.17
+	dev-libs/openssl:0=
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"usr/bin
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 7194b4c4f377..ea6ccb78d0ea 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,10 +1,6 @@
 AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394
-DIST unison-2.48.3-manual.html 278156 BLAKE2B 3534d497f2813b70644c1c6d9d24310dee5101c31f3066e9c51e9ac16dd9f2b4651d6bf07f13490534f5243ee4ff54549be668be22f9dc0d8fa7d48feee7844e SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502
-DIST unison-2.48.3-manual.pdf 516703 BLAKE2B 79a502c2b6897c39600c73e172a9405027449f3bf1d89b34f31ba2df0271add2075296634fec1b2137ab4c4e27653b707f6f68c5130e4cc61d29370de06e4292 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977
-DIST unison-2.48.3.tar.gz 1172646 BLAKE2B 5f44154920395ef0458972ccd85a4831f2cd491ba6853c081ede6b849922cbd15c1d02ea289d48fb9777eaec451919b090d734c7b7b262a18efec2828b182275 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
-EBUILD unison-2.48.3.ebuild 2194 BLAKE2B 590546036daed25edc337019f84901be17551218068f65a789f8f2fe5dd044cf2f4513a73a72ed74bf9d1d65d6d9860d747e7948be923014a88d526cbd49bd2f SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7
 EBUILD unison-2.48.4.ebuild 2339 BLAKE2B 18690805b5ca16fe8e5ecf7906c464459d3a04a8858592a6fe32d40c616a66b3af38e98f13970dca2200d657ff6cf4627e0420008588c4c5192017934cc39e4b SHA512 daf666874caaa8e991136e7ac67281c75d3572e39c4aebdd6422941411dc59f6b5c339c99660339e284984df5b785c3de47b2fbf1e2d450a0b60144d67b787ef
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/net-misc/unison/unison-2.48.3.ebuild b/net-misc/unison/unison-2.48.3.ebuild
deleted file mode 100644
index 19d3bb695fb9..000000000000
--- a/net-misc/unison/unison-2.48.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt test"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
-	gtk? ( >=dev-ml/lablgtk-2.2 )
-	test? ( || ( dev-util/ctags virtual/emacs ) )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
-	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-	!net-misc/unison:0
-	app-eselect/eselect-unison"
-
-#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
-
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-	doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-		http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
-
-src_compile() {
-	local myconf
-
-	if use threads; then
-		myconf="$myconf THREADS=true"
-	fi
-
-	if use static; then
-		myconf="$myconf STATIC=true"
-	fi
-
-	if use debug; then
-		myconf="$myconf DEBUGGING=true"
-	fi
-
-	if use gtk; then
-		myconf="$myconf UISTYLE=gtk2"
-	else
-		myconf="$myconf UISTYLE=text"
-	fi
-
-	use ocamlopt || myconf="$myconf NATIVE=false"
-
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
-	emake selftest
-}
-
-src_install () {
-	# install manually, since it's just too much
-	# work to force the Makefile to do the right thing.
-	newbin unison unison-${SLOT}
-	dodoc BUGS.txt CONTRIB INSTALL NEWS \
-		  README ROADMAP.txt TODO.txt
-
-	if use doc; then
-		dohtml "${DISTDIR}/${P}-manual.html"
-		dodoc "${DISTDIR}/${P}-manual.pdf"
-	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-pkg_postinst() {
-	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
-	elog "in your profile files to access exactly this version over ssh."
-	elog "Or you can use 'eselect unison' to set the version."
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index bd1cb8f0fcfb..4e6d99e7f485 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2017.12.23.tar.gz 2859430 BLAKE2B 55d30e77e1689b221d554ea0fd6327b42043c9410f74ce35f87956dfbf3da986b254657ca4c71cd4c7bf8bbddb2477cdbd96caebd0d52803b14e5466ac43988a SHA512 f8aa96e2cc328453abaaa84b9a0c0f28ea929a9c3877128d398ec5eb080b187bd01bcfc07ed590e84d1f58af00f0cbb219b4ac3f01045486c0472c6d707e4d9c
 DIST youtube-dl-2017.12.31.tar.gz 2872519 BLAKE2B cbf06f545f580d4bb3c5f58ea9a38291cdb358114787a93a1889e3c07c17fb2a832b7a25fecb6f92cdba8731fc32b9eed5ae4f5a52d0d6a103c3d3d4ef6b9ba5 SHA512 c6cd663627d2291c0eb6e1d711772f6640555d19f34533e1784cba4e6c983522db6dc3e44140dfcdad900db12024548bd5b16f89e60a5531538d7dcb36a8cd93
+DIST youtube-dl-2018.01.07.tar.gz 2877870 BLAKE2B 8def952710c4500e251641b4ca458ba4810c84435c504ca44569211d3d762efe4a5086f12bf9edee0944b5894697e5be359abead41282f637bab83addbbf67cc SHA512 ac5f603eb61b367fb26c07213f8350b1a305bad41a4d6beaa65f1568e6365e666818c67be35ce118de495bbdc980c9eb599b9273e7bb79f2e40dd23732d9a6fd
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
-EBUILD youtube-dl-2017.12.23.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
 EBUILD youtube-dl-2017.12.31.ebuild 3286 BLAKE2B e846a48522924ae983a0b5b078b42523a2dccf22d23340e52348507f8718d01965a1a97c7a0c5ab10caaee1133536f8932d327d08eddf8f8982958aa84c29456 SHA512 67e4d6e79fd04259bf95d30ecb051527d0c864002b80f28734f37cd38ad9728743334b2fc786c652582c9ff9d79bde6f46507e68de41e84decefb87db8e8e0d0
+EBUILD youtube-dl-2018.01.07.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.12.23.ebuild b/net-misc/youtube-dl/youtube-dl-2017.12.23.ebuild
deleted file mode 100644
index b94326c98c67..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2017.12.23.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
-			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
-			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
-			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube pornhub redtube tnaflix xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/completions
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.01.07.ebuild b/net-misc/youtube-dl/youtube-dl-2018.01.07.ebuild
new file mode 100644
index 000000000000..db51a779b025
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.01.07.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav tube8 vporn
+			watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+}
diff --git a/perl-core/File-Path/File-Path-2.130.0.ebuild b/perl-core/File-Path/File-Path-2.130.0.ebuild
index 47dbb9dd4675..3935e881f728 100644
--- a/perl-core/File-Path/File-Path-2.130.0.ebuild
+++ b/perl-core/File-Path/File-Path-2.130.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="File path and name utilities"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
diff --git a/perl-core/File-Path/Manifest b/perl-core/File-Path/Manifest
index d97bf59a6597..b8637160ec95 100644
--- a/perl-core/File-Path/Manifest
+++ b/perl-core/File-Path/Manifest
@@ -1,3 +1,3 @@
 DIST File-Path-2.13.tar.gz 31094 BLAKE2B 5dba747c6c269dcebf833537f7d9ad5f72dd08dfa8446c98a5bce2ea933f83d7a664a1fb49fe79505d0ca13a11741bef18dcf74df571fd3f8c3bd88b777c5aae SHA512 9684737947bd46a3a4a1bd5f04b712d69cb08c3c6a2801c1017d2a796946162d8121bc614408cbdbb4749d2cdacfd5279ee4db11797e3053efef1d1ec7012562
-EBUILD File-Path-2.130.0.ebuild 491 BLAKE2B 673d0046e0e95bc0d518827d49e2804ae6e59b99606f91390a0cdaa89a9395ad1daebe32a19d28a637f46a9d47c0244c758b310d7528daa28634cc1768e83ea7 SHA512 50ef003714ccedf0bc45251ffd243fafc87c98c477e9a204cb6716213ddfdf1bd80e9e870a879eb628db3581d870e99460dfb2f337ece63ca50274c6144db0ae
+EBUILD File-Path-2.130.0.ebuild 488 BLAKE2B 267c5be1f569356f9890a45f9cc409815eb54a7cc830d895ac8bd91bfd6c59ebcab9cf7296e1b9a64d5b6cf1ee109b61c1fef43f940a8b2c86cf8e68f50777f4 SHA512 2e55f7c0f909c2742607d68a6cbda575e06833652f7f3fa48a7e748574128cbd2baff8864c82c5b584c2b47de356c8149a87318785f3c5e1339302c14f44a8b2
 MISC metadata.xml 390 BLAKE2B 2b39dc5085e9a51a5b412c525a4fbfd72a940cb84463ba731e07539791dd3ae842910b59cf70df301025044b7d8b34ea5feadd0b813d6857c10711062182285a SHA512 2da682f46b894808bf34ce21807ba65a0ef725a1336593a1070c7a738c1ee495c6c5884d28c5c4a9dae649b55410c8874a9dc080d6143f09fb9ea7a53acd35e9
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 86aab92075c2..4f6d35c56ef8 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 62942713087b..e35729907e94 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 9e862a931d0e..15e8006cfb00 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -72,7 +72,7 @@ net-libs/glib-networking libproxy
 net-libs/neon pkcs11
 
 # app-text/texlive[extra]
-app-doc/doxygen latex
+app-doc/doxygen latex doc
 
 # x11-misc/colord
 x11-libs/gtk+ colord
@@ -118,7 +118,7 @@ media-video/mplayer nas
 net-misc/ntp openntpd
 
 # fails to build, need to investigate why
-net-libs/webkit-gtk introspection
+net-libs/webkit-gtk geolocation introspection
 
 # virtual/mysql
 sci-mathematics/glpk mysql
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 21ac3139080e..b3ccb65fb06a 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,8 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (07 Oct 2012)
 # V8 upstream said they won't support x32, bug #423815
 # Masked packages containing V8.
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# ...and their reverse dependencies.
+dev-python/bokeh
+dev-python/blaze
+<dev-python/dask-0.15.1
+dev-ruby/autoprefixer-rails
+dev-ruby/coffee-rails
+dev-ruby/coffee-script
+dev-ruby/execjs
+dev-ruby/turbolinks
+dev-ruby/uglifier
 net-libs/nodejs
 www-client/chromium
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 0d9f33f624b8..0a0981b770c3 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,7 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# This file requires >=portage-2.1.1
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Those packages require net-libs/nodejs.
+dev-python/nbdime webtools
+dev-ruby/ammeter test
+dev-ruby/jsobfu test
+dev-ruby/rails asset-pipeline
+dev-ruby/sprockets test
+dev-ruby/tilt test
+media-libs/elementary javascript
+net-analyzer/netdata nodejs
 
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # The QML (V4) and JSC JITs do not work on x32.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 3573fd0df325..ffe49921481c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Requires USE=sdl that is masked in this profile.
+media-video/mjpegtools sdlgfx
+
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Those require USE=doc that is masked in this profile.
+dev-python/python-glanceclient test
+dev-python/python-neutronclient test
+
 # NeddySeagoon <neddysegoon@gentoo.org> 24 Aug 2017
 # Support for g15daemon  still needs -9999 packages on all arches 
 media-sound/mumble g15
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 0dc3cf8e9c60..6c23a4598d8b 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Requires dependency flags that are masked in this profile.
+media-libs/sdl-mixer midi
+
 # Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
 # Moved from use.mask since they are flags local to one package.
 sys-kernel/mips-sources -ip27 -ip28 -ip30
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index 3eca6ee51047..c68b05ffdbbd 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Requires USE=qt5 that is masked in this profile.
+media-video/vlc skins
+
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not keyworded
 # uuid: Needs sys-apps/util-linux which is not keyworded
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 14dfa34efae5..264ae931a2f1 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> (13 Jan 2018)
+# Depends on last-rited sci-visualization/xds-viewer
+sci-chemistry/xds-bin X
+
 # Mart Raudsepp <leio@gentoo.org> (10 Jan 2018)
 # Failing tests, with extra deps that aren't keyworded due to that
 >=gnome-base/gnome-settings-daemon-3.24 test
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 1f363fbf97f2..36c55aea30d4 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (07 Dec 2016)
@@ -72,7 +72,7 @@ www-client/links livecd
 
 # needs udev
 kde-frameworks/kdelibs udisks upower
-media-libs/mesa gbm dri3
+media-libs/mesa gbm dri3 d3d9
 x11-base/xorg-drivers video_cards_radeonsi
 x11-drivers/xf86-video-ati glamor
 
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index c4367eb84875..303f8b5b4ca2 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -14,6 +14,7 @@ sys-fs/udev
 
 # dev-libs/elfutils needs a port to musl, bug #602126
 dev-libs/elfutils
+>virtual/libelf-2
 
 # packages that unconditionally depend on dev-libs/elfutils
 <net-firewall/fwbuilder-5.3.7
diff --git a/profiles/default/linux/musl/use.mask b/profiles/default/linux/musl/use.mask
index 4e935628268a..4ce1d685054c 100644
--- a/profiles/default/linux/musl/use.mask
+++ b/profiles/default/linux/musl/use.mask
@@ -4,3 +4,9 @@
 -elibc_musl
 elibc_uclibc
 elibc_glibc
+
+# video cards that work on musl
+-video_cards_cirrus
+-video_cards_i915
+-video_cards_intel
+-video_cards_virtualbox
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index da2e709730f9..f5208eadab27 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -11,6 +11,7 @@ sys-fs/udev
 
 # Working on it, bug #470884
 dev-libs/elfutils
+>virtual/libelf-2
 
 # packages that unconditionally depend on dev-libs/elfutils
 <net-firewall/fwbuilder-5.3.7
diff --git a/profiles/default/linux/uclibc/package.use.mask b/profiles/default/linux/uclibc/package.use.mask
index 5c7b9a9d7a68..d50e095b0281 100644
--- a/profiles/default/linux/uclibc/package.use.mask
+++ b/profiles/default/linux/uclibc/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Those require USE=java that is masked in this profile.
+app-emulation/virtualbox vboxwebsrv
+app-office/libreoffice libreoffice_extensions_wiki-publisher
+
 # Thomas Deutschmann <whissi@gentoo.org> (21 Jan 2017)
 # Mask due Gnome3 not going to be stabilized on this arch
 # due to uclibc
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults b/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
deleted file mode 100644
index 22044de87632..000000000000
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults
+++ /dev/null
@@ -1,17 +0,0 @@
-# This profile is supporting >=linux-2.6.16[a] and <linux-2.6.32[b].
-
-# a. https://sourceware.org/ml/libc-announce/2012/msg00001.html
-# lowest version supported by glibc-2.17 to glibc-2.19.
-
-# b. https://sourceware.org/ml/libc-alpha/2014-09/msg00088.html
-# lowest version supported by glibc-2.20 onwards.
-
-
-# utimensat is missing or not reliable until linux-2.6.32.
-# needed by python-3.
-ac_cv_func_utimensat=no
-# pipe2 requires >=linux-2.6.27.  Needed by python-3.
-ac_cv_func_pipe2=no
-
-# >=python-3 is masked.
-PYTHON_TARGETS="-python3_5"
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
new file mode 100644
index 000000000000..510e5e21b3ce
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
@@ -0,0 +1,18 @@
+# This profile is supporting >=linux-2.6.16[a] and <linux-2.6.32[b].
+
+# a. https://sourceware.org/ml/libc-announce/2012/msg00001.html
+# lowest version supported by glibc-2.17 to glibc-2.19.
+
+# b. https://sourceware.org/ml/libc-alpha/2014-09/msg00088.html
+# lowest version supported by glibc-2.20 onwards.
+
+
+# utimensat is missing or not reliable until linux-2.6.32.
+# needed by python-3.
+ac_cv_func_utimensat=no
+# pipe2 requires >=linux-2.6.27.  Needed by python-3.
+ac_cv_func_pipe2=no
+
+# >=python-3 is masked.
+PYTHON_TARGETS="-python3_*"
+PYTHON_SINGLE_TARGET=python2_7
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
index 0aa01a72efb0..0aa01a72efb0 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
index 9b37b1386380..9b37b1386380 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent b/profiles/features/prefix/standalone/kernel-2.6.16+/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/parent
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index e537cc0fa319..e537cc0fa319 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
new file mode 100644
index 000000000000..2a1686418a8f
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -0,0 +1,7 @@
+# >=python-3 is masked
+python_single_target_python3_6
+python_single_target_python3_5
+python_single_target_python3_4
+python_targets_python3_6
+python_targets_python3_5
+python_targets_python3_4
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
index 666a526176df..666a526176df 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
index 9f79b4f81de0..9f79b4f81de0 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask
diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent b/profiles/features/prefix/standalone/kernel-2.6.32+/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/package.use.mask
new file mode 100644
index 000000000000..0a7da57f7a4d
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Requires USE=guile that is masked in this profile.
+net-libs/gnutls test-full
diff --git a/profiles/package.mask b/profiles/package.mask
index 29618600d3f0..0774af71193e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,118 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+app-backup/qt4-fsarchiver
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+media-gfx/pictureflow
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+app-mobilephone/past
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+x11-misc/ptbatterysystemtray
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+x11-misc/launchy
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+x11-misc/wmiface
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+x11-misc/appmenu-qt
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Depends on dead Qt4, needs porting to Qt5.
+# Masked for removal in 30 days.
+sci-chemistry/xdsgui
+sci-visualization/xds-viewer
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+dev-db/dbmodel
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+media-sound/mp3diags
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+x11-misc/touchfreeze
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Use sci-geosciences/gpsbabel[gui] instead.
+# Masked for removal in 30 days.
+sci-geosciences/gebabbel
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+app-editors/lfhex
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+app-text/tuxcards
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+app-text/yagf
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+net-ftp/qshare
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+net-ftp/scythia
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+app-dicts/qvortaro
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
+# Dead upstream, depends on dead Qt4, no port to Qt5.
+# Masked for removal in 30 days.
+net-dns/cagibi
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+dev-util/beediff
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+net-misc/netfleet
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
+# Dead upstream, EAPI 2, depends on dead Qt4. kde-apps/filelight
+# is a possible alternative. Masked for removal in 30 days.
+sys-apps/qdiskusage
+
 # Kent Fredric <kentnl@gentoo.org> (10 Jan 2018)
 # Dead upstream, Broken since 2009.
 # Bug #644146. Removal in 30 days
@@ -294,9 +406,10 @@ dev-vcs/monotone
 app-misc/tasque
 
 # Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
+# Sebastian Pipping <sping@gentoo.org> (12 Jan 2018)
 # Needs a major version bump and relies on lots of dead libs (#624160).
 # Removal in a month.
-x11-terms/terminator
+<x11-terms/terminator-1.91
 
 # Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
 # Requires dead gnome2 python bindings (#629180) and old gstreamer, also all
@@ -626,12 +739,6 @@ net-misc/cocaine-core
 # Masked for removal on 2018-01-12
 app-arch/defluff
 
-# Thomas Beierlein <tomjbe@gentoo.org> (10 Dec 2017)
-# Development stopped, nasty build system.
-# Functionality superseded by media-radio/wsjtx.
-# Masked for removal in 30 days.
-media-radio/wspr
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
 # Depends on dead Qt4, upstream porting inquiry pending. Bug #631788
 games-kids/crayon-physics
@@ -775,12 +882,6 @@ sys-kernel/hardened-sources
 # Alternatives: app-arch/libarchive, app-arch/unar
 app-arch/unrar-gpl
 
-# Michał Górny <mgorny@gentoo.org> (20 Aug 2017)
-# Pre-release of a new incompatible version that breaks the only reverse
-# dependency in Gentoo. Masked until 2.0.0 proper is released, or
-# dev-cpp/libjson-rpc-cpp is fixed, whichever happens first.
->=dev-cpp/catch-2
-
 # Sébastien Fabbro <bicatali@gentoo.org> (19 Aug 2017)
 # ipython-6 is python-3 only and causes circular dependencies
 # Unset python_targets_python2_7 for ipykernel and ipyparallel if needed.
diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent b/profiles/prefix/linux-standalone/amd64/legacy/parent
index a0af85877726..f8002c688eb9 100644
--- a/profiles/prefix/linux-standalone/amd64/legacy/parent
+++ b/profiles/prefix/linux-standalone/amd64/legacy/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/prefix/standalone/beyond-kernel-2.6.16
+../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent b/profiles/prefix/linux-standalone/x86/legacy/parent
index a0af85877726..f8002c688eb9 100644
--- a/profiles/prefix/linux-standalone/x86/legacy/parent
+++ b/profiles/prefix/linux-standalone/x86/legacy/parent
@@ -1,2 +1,2 @@
 ..
-../../../../features/prefix/standalone/beyond-kernel-2.6.16
+../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index 8aaf881e171c..bfd1649459c2 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (27 May 2017)
@@ -23,4 +23,3 @@ dev-java/gcj-jdk
 # The following packages require pdftk and are therefore
 # masked in the 17.0 profiles.
 app-office/auto-multiple-choice
-<app-office/impressive-0.11.2
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3a42b782f05d..5daa8a2d2f70 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -113,6 +113,7 @@ app-admin/puppet-agent:experimental - Add patches for things in testing
 app-admin/puppet-agent:puppetdb - Adds puppetdb support
 app-admin/puppetserver:puppetdb - Adds support for connecting to puppetdb
 app-admin/pwgen:livecd - Install init script for root password scrambling on boot
+app-admin/rsyslog:curl - Enable http_request() function in RainerScript (requires net-misc/curl)
 app-admin/rsyslog:dbi - Build the general database output module (requires dev-db/libdbi)
 app-admin/rsyslog:elasticsearch - Build the Elasticsearch output module (requires net-misc/curl)
 app-admin/rsyslog:gcrypt - Add support for encrypted log files using dev-libs/libgcrypt
@@ -5933,7 +5934,6 @@ net-libs/ldns:gost - Enable GOST support
 net-libs/libbitcoinconsensus:asm - Enable assembly for optimization
 net-libs/libbitcoinconsensus:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
 net-libs/libbtbb:extras - Install pcapdump and btaptap tools
-net-libs/libbtbb:pcap - Add support for network packet capture via net-libs/libpcap
 net-libs/libbtbb:wireshark-plugins - Build the wireshark plugins for bluetooth baseband sniffing
 net-libs/libeXosip:srv - enable support for SRV records DNS queries
 net-libs/libesmtp:ntlm - Enable support for NTLM authentication
@@ -7643,6 +7643,7 @@ sci-visualization/gnuplot:bitmap - Enable dot-matrix printers and pbm terminal
 sci-visualization/gnuplot:compat - Enable backwards compatibility with version 4 syntax
 sci-visualization/gnuplot:gd - Add support for media-libs/gd. Needed for GIF, JPEG, and PNG image output.
 sci-visualization/gnuplot:libcerf - Enable special functions from sci-libs/libcerf
+sci-visualization/gnuplot:regis - Enable ReGIS terminal
 sci-visualization/gwyddion:fits - Enable FITS image import via sci-libs/cfitsio
 sci-visualization/gwyddion:sourceview - Enable support for x11-libs/gtksourceview
 sci-visualization/labplot:cantor - Enable support for different open-source computer algebra systems via kde-apps/cantor
@@ -7759,7 +7760,6 @@ sys-apps/flashrom:usbblaster_spi - Enable support for Altera USB-Blaster dongles
 sys-apps/flashrom:wiki - Enable wiki informations, like supported devices etc.
 sys-apps/fwupd:colorhug - Enable ColorHug support through x11-misc/colord package.
 sys-apps/fwupd:dell - Enable Dell-specific support.
-sys-apps/fwupd:elf - Enable libelf support through dev-libs/libelf package.
 sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
 sys-apps/fwupd:uefi - Enable UEFI support
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index e012311ccf5e..c779a035c318 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 55fc7f303c67..f79632d62693 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -2,10 +2,13 @@ AUX eagle_wrapper_script 247 BLAKE2B 62fb49b87be84527b983473c7f9876da75a037cb823
 DIST eagle-lin32-7.3.0.run 48599533 BLAKE2B 9412464dec7f3dee0944bfa588c5d9d1c8fd35316d1acc95b3cfdad2347b42c6a04e63230dadc08fb16e3483d25948d0244f9f7facbcbbfe74ddbbc5d5d7fbb3 SHA512 ef25fe7910a89e80b0c4c2d8a8f80269474510d5bd9250c6a2751ac198e7a5b4c687a30d1d784a86196589377ef7df527ff8cfa2a747c4f6e0f85496c3a180ab
 DIST eagle-lin32-7.4.0.run 49535353 BLAKE2B bd72bc28cf8f33a2117080ee308d9bc29a0b441c0cdd7286ac259753dfbde374dbc4d3aeec864a06312ac7db47f91c1ee2c6639590249d3bf9b4b379c375d85c SHA512 667d213861458fb8f915dd1d46161e0b87fa9151f9686564638afdd33a8b2924fde28850c8bd6815d405104e48aa25957a5050e6276c43d5550a106016c0625a
 DIST eagle-lin32-7.6.0.run 51535802 BLAKE2B 25fda2b121e97e0f77265ad65c51e95b9bbe91dfaad71b6dc7e292547aa44482960c1743fdf83b43b299840087c4d415daafa01f062d455889056b368bd0ba48 SHA512 1151a34b16240dfd6ba1aff108e75bbd14d2062b0d0c43a1587770bc4897018031eda685e86accdfbfd53f3988774db6e538d862eb5844c45e939098005c1e76
+DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b
 DIST eagle-lin64-7.3.0.run 48248700 BLAKE2B e7d8a7a23e0023159d626203bba2cf195fad3eac54b9b72947c9e72e7bb3f3534ce2545857ce76e70302eb1d2042cc30f9c327fc2a5a4dd4287e82aef4393dc6 SHA512 bd158b25ed682c63405b90358f82ffcb0903c7f5e5ae81737efcb56b6074a78125de31909c64f31a5f4bab7727c63b6aa0c7af0f6440793010f7f6de3f92f681
 DIST eagle-lin64-7.4.0.run 49186247 BLAKE2B cb28eb9a4c6c1989d15cd241908628eb28b35c7b8f81e7fa84c6ddf502e621055ed3eef7335405cca906892479c38b6d20ab6f2c896e91df397fa47481b96b69 SHA512 a840689487a120f03323cb05894e9de00bae0fefc44ca63eaf6642ebb91c839ddc59ea7efffa308072ca38692f9ba6da478f114a56180a4bb6ec74eb49740a13
 DIST eagle-lin64-7.6.0.run 51149541 BLAKE2B 343991dea47eb1526687f6904fc31420e3194df5ba4092de91d0b2a4e0038dd20848791190adfa5361f2586b0fdd2824ab5a483e9b004f89087ebb6e059105b4 SHA512 2eb3192c7aab36d23ecaae4ac4cf0b096306383bcf49680fb5936f9c45ef42d429f72796f03f818f46ba945ead5b60e57744d78ca1e3c63b73b44c185586a82c
+DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
 EBUILD eagle-7.3.0.ebuild 3538 BLAKE2B fdbac7c06a3c6f87215d8c26f6d2314ef00058ac3552ce0a5cb2d7f08d63b24a06240c1f2a5d006d76678c0c5f595a965451a559997a6ea22da4144f9c2f09d3 SHA512 cec75e420196a3bc70ef85b2f5a3db2005d9ff963e1e15628ccf7f37f810949bb5eb2422ee5b54c6aa2e1dea251eb99eb1713e767b1954c87e5376eb9e404f23
 EBUILD eagle-7.4.0.ebuild 3540 BLAKE2B 7373ac5abebe65daf7efaabc58f0d15ad098cf19f330fae29a240638108951cdc4904e36fe4eb5cbbd33d2e957a2b1250360c3f331133e042140aee104666c38 SHA512 a3cd5350e4e4f23ccb590dbb322bcf92459aaf69d6e728fd0d8874648d45cd0bf173a9d06aebcb3395cb3d333d4dfb99e234dca89540e4cc4e1a04083fd5ea30
 EBUILD eagle-7.6.0.ebuild 3540 BLAKE2B e46e350a022f42366a2010e2d109b48b881d51bdf38887880e2e782917466c60863d58bc42eb1529274d11685a7ebf7b5ee0d84c1bb9bf63f882214c38175622 SHA512 cbfc083ead970ea2417a3a2cb67f6c659129d20e316a40a43f4d062b48dea51ceccac6bb1822232061c635afed3c3425a952c1aa267f413296d6f8c2479380b3
+EBUILD eagle-7.7.0.ebuild 3540 BLAKE2B e46e350a022f42366a2010e2d109b48b881d51bdf38887880e2e782917466c60863d58bc42eb1529274d11685a7ebf7b5ee0d84c1bb9bf63f882214c38175622 SHA512 cbfc083ead970ea2417a3a2cb67f6c659129d20e316a40a43f4d062b48dea51ceccac6bb1822232061c635afed3c3425a952c1aa267f413296d6f8c2479380b3
 MISC metadata.xml 781 BLAKE2B 966755c7f497175002e291cec41ecd8ce68cfc931dc1d17a62e200e5ca14deb10bcd4f82fe87e3ed5e9a50deffb1fb120e0856fc43142068510cf3f9b842b368 SHA512 cb30e6fffb1bfe09f177adc057e879a02b29f6651d45dceb029f541fb756cd1259c2658b14128bfd6b0866a67fcdeabcec8fc1df505ad4bc9ca11c79b20671af
diff --git a/sci-electronics/eagle/eagle-7.7.0.ebuild b/sci-electronics/eagle/eagle-7.7.0.ebuild
new file mode 100644
index 000000000000..75075bf2e4c8
--- /dev/null
+++ b/sci-electronics/eagle/eagle-7.7.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor"
+HOMEPAGE="http://www.cadsoft.de"
+SRC_URI="
+	x86? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin32-${PV}.run )
+	amd64? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin64-${PV}.run )"
+
+LICENSE="cadsoft-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE="doc"
+
+QA_PREBUILT="opt/eagle/bin/eagle"
+RESTRICT="mirror bindist"
+
+RDEPEND="
+	sys-libs/glibc
+	dev-libs/openssl:0
+	>=sys-libs/zlib-1.2.8-r1
+	>=media-libs/freetype-2.5.0.1
+	>=media-libs/fontconfig-2.10.92
+	x11-libs/libXext
+	x11-libs/libX11
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXrandr-1.4.2
+	>=x11-libs/libXcursor-1.1.14
+	>=x11-libs/libXi-1.7.2
+	net-print/cups
+	x11-libs/libxcb
+"
+
+# Append ${PV} since that's what upstream installs to
+case "${LINGUAS}" in
+	*de*)
+		MY_LANG="de";;
+	*)
+		MY_LANG="en";;
+esac
+
+src_unpack() {
+	# Extract the built-in .tar.bz2 file starting at __DATA__
+	sed  -e '1,/^__DATA__$/d' "${DISTDIR}/${A}" | tar xj || die "unpacking failed"
+}
+
+src_install() {
+	local installdir="/opt/eagle"
+
+	# Set MY_LANG for this function only since UPDATE_zh and README_zh
+	# don't exist
+	[[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}"
+
+	# Install the documentation
+	cd doc/
+
+	local pattern="^((README|UPDATE)_${MY_LANG}|library_${MY_LANG}\.txt)$"
+	for docs in README_* UPDATE_* library_*.txt; do
+		if [[ $docs =~ $pattern ]]; then
+			dodoc $docs
+		fi
+
+		rm -f $docs
+	done
+
+	doman eagle.1
+	rm eagle.1
+
+	# Install extra documentation if requested
+	pattern="^((tutorial|manual|generate-3d-idf-data)_|(connect-device-split-symbol|make-symbol-device-package-bsdl-2011)-)${MY_LANG}.pdf$"
+	if use doc; then
+		cd ulp/
+			for docs in generate-3d-idf-data_*.pdf connect-device-split-symbol-*.pdf make-symbol-device-package-bsdl-2011-*.pdf; do
+				if [[ ! $docs =~ $pattern ]]; then
+					rm $docs
+				fi
+			done
+		cd ../
+
+		for docs in manual_* tutorial_*; do
+			if [[ ! $docs =~ $pattern ]]; then
+				rm $docs
+			fi
+		done
+	else
+		rm {elektro-tutorial,manual_*,tutorial_*,layer-setup_designrules}.pdf
+		rm -rf ulp/
+	fi
+
+	rm -f license*.txt eagle.dtd
+
+	cd "${S}"
+
+	insinto $installdir
+	doins -r .
+
+	fperms 0755 ${installdir}/bin/eagle
+
+	# Install wrapper (suppressing leading tabs)
+	# see bug #188368 or http://www.cadsoftusa.com/training/faq/#3
+	exeinto /opt/bin
+	newexe "${FILESDIR}/eagle_wrapper_script" eagle
+	# Finally, append the path of the eagle binary respecting $installdir and any
+	# arguments passed to the script (thanks Denilson)
+	echo "${installdir}/bin/eagle" '"$@"' >> "${D}/opt/bin/eagle"
+
+	echo -e "ROOTPATH=${installdir}/bin\nPRELINK_PATH_MASK=${installdir}" > "${S}/90eagle-${PV}"
+	doenvd "${S}/90eagle-${PV}"
+
+	# Create desktop entry
+	newicon bin/${PN}icon50.png ${PF}-icon50.png
+	make_desktop_entry "${ROOT}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
+	elog "now to set up the correct paths."
+	elog "You must first run eagle as root to invoke product registration."
+	echo
+	ewarn "Due to some necessary changes in the data structure, once you edit"
+	ewarn "a file with version 7.x you will no longer be able to edit it"
+	ewarn "with versions prior to 7.0!"
+	ewarn
+	ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from a version prior 7.x!"
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index b395017f6219..2014c75d18aa 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index dd3c384a8061..f5e03b94940b 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -18,7 +18,7 @@ DIST gpsd-3.16.tar.gz 8587490 BLAKE2B db6619308ddb2f473727bc91d2f696a401a0b4f97a
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
 EBUILD gpsd-3.10.ebuild 4785 BLAKE2B 602594de9a4834b3f765a3be4e69148230987c9855f8294d9bf424704f7dadc74f1df2b92ce166752217cee8d0547ef331330819add3cafd046caa66a946bb1a SHA512 6c253b1459de0a8233537543a8c5031b6b30b2f78b4a080f31745f0fe75bb90254843a66e4f59ada264f0bfaacc3c1756351c2b0bb357a6056d96a3164bbe026
 EBUILD gpsd-3.16.ebuild 4930 BLAKE2B 14ebc98190eddf603ff9c747d871ebaf576538ff9e20b212262bf680abbb3976d3ba9d0a4397afbf9ea2419496aec587639be301f64ff7010fff6101b4d23d53 SHA512 0b977e0cf70f20ac136046ba83d3be128e0a78c3f4a62e593a7e17daeacf0b300803e34c90b15b3e3ee51c58c1c304925f9b25e78f1679edfddd7b1ffb8f26d4
-EBUILD gpsd-3.17-r1.ebuild 4723 BLAKE2B 6dd464eed24c3eaa6d1c9d0aa7c5841d28e492934bb4e4397f49ffb73ea8cac08d404c762d61abd368511c4fe23caa6f32c223b9a7410c75ec347adb2a2710b4 SHA512 a8d26da64fcbe69f1dd8bff80928424202d76d94d524428b68606918f521c2236b76b37fe2a30976e3d58e0674cfa0c4212512fff6f842b525636e16ff60e04e
+EBUILD gpsd-3.17-r2.ebuild 4608 BLAKE2B b09106b679d282ec09f43725020027b63a7c62134780acbd5e9e3659dc17139703eeeecae6625af7ab9b81fe1f1c0a9cee239e3b28a4dcfcd2ebdf9374b21e51 SHA512 930a740182dcdd642a94bdbfcc480c1fef271500b1f476bfb5c5f6ddfdb50cfcf3cf88eeb50e842e87bcff2f9b4aead7d76f35a9423a2d49cf981e90229c4b89
 EBUILD gpsd-3.17.ebuild 4627 BLAKE2B b257c138e370fa05be7931c76bad948ba3e747727b18a1b12856eafe7de01869ef99b3c1ee3ac7c1bd68697aa193fb199bbb26b5ec3e67318f497e14a0ee62f3 SHA512 7b4518ba869362b11fa793d66914c60d75411d017de7c75d77aef12502b1c21ca0823b36c38711b3162856cf0ed9c2187ddc49b3ffa8c4c663f4db402a9273c0
 EBUILD gpsd-9999.ebuild 4723 BLAKE2B 6dd464eed24c3eaa6d1c9d0aa7c5841d28e492934bb4e4397f49ffb73ea8cac08d404c762d61abd368511c4fe23caa6f32c223b9a7410c75ec347adb2a2710b4 SHA512 a8d26da64fcbe69f1dd8bff80928424202d76d94d524428b68606918f521c2236b76b37fe2a30976e3d58e0674cfa0c4212512fff6f842b525636e16ff60e04e
 MISC metadata.xml 950 BLAKE2B a2250377cdd4f1e827e7fe7dd5f8707316e8cbe9552f4ca2e56828e138d2d2b31d5c6cc930247c8666c9546fbe8dad618b2c38a34b6caac7f9e82ca620806ef3 SHA512 a5e8e60afc8c02e769cf496caa30003173455d82554378457ee7350bcc64b57a88b697cf2284a7a56f008461a33d260d167ce866bde0710e235f684e201a5bf8
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
deleted file mode 100644
index 98fba863a5a6..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/23"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
-	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
-	tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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_DEPS} )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=True
-		python=False
-		libgpsmm=True
-		manbuild=False
-		shared=$(usex !static True False)
-		$(use_scons bluetooth bluez)
-		$(use_scons debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons qt5 libQgpsmm)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
-	)
-
-	use qt5 && myesconsargs+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	if use python ; then
-		distutils-r1_src_install
-		# Delete all X related packages if user doesn't want them
-		if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then
-			rm "${ED%/}"/usr/bin/xgps* || die
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
new file mode 100644
index 000000000000..39652c21d116
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+	inherit git-2
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/23"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
+	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
+	tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+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_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	DEPEND+="
+		app-text/xmlto
+		=app-text/docbook-xml-dtd-4.1*"
+fi
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_export_best
+	# Extract python info out of SConstruct so we can use saner distribute
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+	local pybins=$(pyvar python_progs | tail -1)
+	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	sed \
+		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
+		-e "s|@URL@|$(pyvar website)|" \
+		-e "s|@EMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		nostrip=True
+		libgpsmm=True
+		manbuild=False
+		shared=$(usex !static True False)
+		$(use_scons bluetooth bluez)
+		$(use_scons debug clientdebug)
+		$(use_scons dbus dbus_export)
+		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
+		$(use_scons ncurses)
+		$(use_scons ntp ntpshm)
+		$(use_scons ntp pps)
+		$(use_scons X python)
+		$(use_scons qt5 libQgpsmm)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons usb)
+	)
+
+	use X && myesconsargs+=( xgps=1 )
+	use qt5 && myesconsargs+=( qt_versioned=5 )
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	use python && distutils-r1_src_install
+}
+
+pkg_preinst() {
+	# Run the gpsd daemon as gpsd and group uucp; create it here
+	# as it doesn't seem to be needed during compile/install ...
+	enewuser gpsd -1 -1 -1 "uucp"
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f07d1ac9887b..6d08dad05446 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6678840894a2..0c4bae34922a 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,5 +8,5 @@ DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
 EBUILD fftw-3.3.6_p2.ebuild 4433 BLAKE2B ba57766a5fc3f4dbf6eb5545b55e2c8eeed8a5e63cc35746fb78d9b583f2ba7831062ccc471cc426f12c1635cd5b259967e1a855a9465d2b566847d7ce896322 SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b
-EBUILD fftw-9999.ebuild 4629 BLAKE2B f4330901801b3a0fccd943915f7efa4a28b82b317a3e90f00ed05a90fa56515c758ec2e714cc280cc335c10f25019bcf4a7fd6ceccb985a4a1330041f7a615bd SHA512 3eb9c89f8bb1ff625f0c5dceb3286a59a61e5561f4ef29da8f4b860a3212ca315b582660a50cd647bf4676758654ce3124eaa0ec6c78dbbc852169d4a79b8079
+EBUILD fftw-9999.ebuild 4654 BLAKE2B b4118a314849101394a263073a661735c3e2ed85ff0b1b55ac3f62e23d295bd92259cca9f21f4e65839d3f264febdadd4198789fa5728c5c71a7c305ecac0bcd SHA512 b19cb97bbc3cd97e3d8c0500bf667e960ae252c6b3ef083736ba903f8bfacb284dd0369b15f3013754978cc9fe71f8dc5f21441e1854bea9967fbfb5a898f94f
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index bef41e83ea09..c08278dde801 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -30,11 +30,11 @@ DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 if [[ ${PV} = *9999 ]]; then
 	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild"
+		dev-ml/ocamlbuild
+		doc? ( media-gfx/transfig )"
 fi
 
 S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -146,7 +146,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
+	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
 }
 
 multilib_src_test() {
@@ -164,6 +164,7 @@ src_test() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -171,8 +172,6 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 63a417dcdf9a..86bcd876a8e3 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
-DIST indi-1.3.1.zip 20752009 BLAKE2B 45dcdae1fa3b830ef9220c1d38212aae74bbc64911577a67f8926b8f88c7567df49766db84bc2b037ae63e9467c4cef1dc831750313c620905db0d9213d4eb40 SHA512 80184287aebf1bc8381ba9f36b83f346411348c610c6c06c7b9aeb4a2c9f3a9713e4f043af66cb777d7fa8fe208d98fa1134c1f0935a706d1797eae38f0ef3f0
 DIST indilib-1.4.1.tar.gz 1529660 BLAKE2B e869ba6b7430515a88f536d1738a9e5beb2622fad20d47ef2e981f9f00eb46e8703b2ad7842dca00b784d972cae639db3c8bfbb301ecbec8d582f372dae2f360 SHA512 b1655070fbc71095215a06edc88b8fff247ed3dcab86c2af058978b209e48ce1701f3a6eef13d0b200be58abfcfdffe7800ecea35d820fc2fb158ea0f899833f
-EBUILD indilib-1.3.1.ebuild 825 BLAKE2B 017cb6fd2585f80288db3a45f2b9c6064a1d7767ba5bce0f34c60879189e610e3d8bc0338738417a89498e209fdb6ece4197621c04813fe74f624e6e56dfac62 SHA512 a7896fc0db97ebdd8b4f64b953abf10db3da8ef0158bbddfbd9fdfb0866545fe49017c618e3b0a280e0fa1b039baed48f3c78cbbc60efeba021e81bdea3ed33a
+DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
 EBUILD indilib-1.4.1.ebuild 845 BLAKE2B 67d815e51377ee5b154f91835e89352c77d5bdeccb69fe547da980a6be529ac08fdbaa07e69a505ffe542efc9793bb2fb63a2c7c88a95d9cecc6ef83ffe40824 SHA512 8bd626e97b2e8dff6081c62664be68cd5e42179315c5587a377e3a043d04dc416f89fbea44213e374d5470cd43866172f0bcd8f226b824e6ab8e16d7d21b4375
+EBUILD indilib-1.6.0.ebuild 1118 BLAKE2B 80c98094301156bbd7908f3ee3444b06ac529c43b6e488dce8b432571f894da0fa5323d2e74c1b0b09d03055bd505391c026dc7b81aab247d747c69ae1348bdb SHA512 992e6b768c3643e936108d4252f90c205e9176573326acc955918fc1e31da4bfcbc6a44ce3d7440b90a1ddf9d78494335e4a95fcb0f0426561306ede052ff413
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.3.1.ebuild b/sci-libs/indilib/indilib-1.3.1.ebuild
deleted file mode 100644
index accd09d2328b..000000000000
--- a/sci-libs/indilib/indilib-1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="lib${PN/lib/}"
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://www.indilib.org/"
-SRC_URI="mirror://sourceforge/${PN/lib/}/${PN/lib/}-${PV}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio
-	sci-libs/gsl
-	sci-libs/libnova
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	sys-kernel/linux-headers
-"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-S=${WORKDIR}/${PN/lib/}-${PV}/${MY_PN}
-
-src_configure() {
-	local mycmakeargs=(
-		-INDI_BUILD_UNITTESTS=OFF
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/indilib/indilib-1.6.0.ebuild b/sci-libs/indilib/indilib-1.6.0.ebuild
new file mode 100644
index 000000000000..e071e3c07b76
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="lib${PN/lib/}"
+
+inherit cmake-utils udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="http://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/releases/download/v${PV}/${MY_PN}_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg test"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-libs/libnova
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	test? (
+		dev-cpp/gmock
+		dev-cpp/gtest
+	)
+"
+
+DOCS=( AUTHORS ChangeLog COPYRIGHT README TODO )
+
+S=${WORKDIR}/${MY_PN}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
+		$(cmake-utils_use_find_package ogg OggTheora)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 6cb27e97daa0..fd8f5ca725ef 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/vitables/Manifest b/sci-misc/vitables/Manifest
index bf34b07e54af..c21cb24d094d 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,6 +1,3 @@
-AUX vitables-2.1-no-docs.patch 298 BLAKE2B 83691cd4783f56ff0feec70f9a356c475bf1443f57d22a2585513523957686cda7cf492cefad27d31ab59fce894d2efef001f977089e32bacf584f8dd2309f75 SHA512 cedcaced3111bb249df7440c7b156329969ff8413faa047407d06790012578a82a8292ca1cf09aca61d75d968e3976ff62e521f3383c15d2776b118b2d76aa61
-DIST ViTables-2.1.tar.gz 3111661 BLAKE2B b3f27b0db0d0e864a80194f9ea4cfa670bacfe3265e9ebf47e4eca6fb2906066f87df5099ed15befb58b61d9d8871c5f6897b9386ff0b5ac8f622b7a3641bb8b SHA512 9ca48fbc8aa33dd3e1e02e2cf2055082831a95f5c24a2ab3bb294d7b09a3f09e62e500b0d69f8843a93af0db6dfc25873a57604f3fd433c0168eb335a1816bc8
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
-EBUILD vitables-2.1-r1.ebuild 1161 BLAKE2B 2b82c1e41c345d9d9c0bfef0c02689ae64ff133a54dcab79273a3c90db0e6543db50f0cef1c7537abaaeee72b0e0bfc24d1ece0a183be09015eb0fb791d5955b SHA512 3f1e6bc322a553f5069037036104fcc8d3075b7b6e83d76b6e346dce1ee599874d30eba7b866937d7fa78bc8e3f06e1ce313d4e25d32e778001dadb5fbdf6635
 EBUILD vitables-3.0.0.ebuild 891 BLAKE2B 97879853adb17ba48c5c0627568b045aabeaeb19bc9e5b84c1d6701f0255615dd6d5402ea96c8e981545f38692d136539eaac8cae6c0aa582040d274211d3386 SHA512 cce826288f8bd7ca2ac23f131d3fedc1f00757ec674696c9497d971f71338d0401d23dc8dc9207a6c1683ebff20bb74d4b16a2ee555f3eba9db9e69f73bbcecb
 MISC metadata.xml 637 BLAKE2B 5de3507f0c14fd0a8af230464a40a60f861433cddea38ea9490a00477f7677045845e48465d1684b0e93cc94ad6423b416e4993aabc23c793114c70365f514c6 SHA512 3e891f2f726db29eb10ae7f26e4dd30abeb8cc3d251b119c226cccfa6ca8fc90311dae6b96acd810e95423674fb57017cae938f48e213d4a873da2d9e9ee7789
diff --git a/sci-misc/vitables/files/vitables-2.1-no-docs.patch b/sci-misc/vitables/files/vitables-2.1-no-docs.patch
deleted file mode 100644
index 0d76e264f79e..000000000000
--- a/sci-misc/vitables/files/vitables-2.1-no-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -34,13 +34,14 @@
- from distutils.dir_util import copy_tree
- from distutils.file_util import copy_file
- 
-+sphinx_found = True
- try:
-     from sphinx.setup_command import BuildDoc
- except ImportError:
--    pass
-+	sphinx_found = False
-+
- 
- 
--sphinx_found = True
- 
- 
- 
diff --git a/sci-misc/vitables/vitables-2.1-r1.ebuild b/sci-misc/vitables/vitables-2.1-r1.ebuild
deleted file mode 100644
index 28354d57da74..000000000000
--- a/sci-misc/vitables/vitables-2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P=ViTables-${PV}
-
-DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
-HOMEPAGE="http://vitables.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]"  # FIXME: check if any other useflags are needed
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-no-docs.patch )
-
-python_compile_all() {
-	# fixme: multiple python (anyone cares?)
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	dodir /usr/share/icons/hicolor/scalable/apps
-	dodir /usr/share/applications
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		DOCS+=( examples )
-	fi
-	if use doc; then
-		HTML_DOCS+=( "${BUILD_DIR}"/sphinx/html/. )
-		DOCS+=( "${BUILD_DIR}"/sphinx/latex/*.pdf )
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 02c14a2104a8..4a2a042e1c21 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index b11abe73bafd..b356b8406e37 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -18,6 +18,6 @@ EBUILD geant-4.10.00_p01.ebuild 2741 BLAKE2B edfbf1917289102994ad22fb26b733d242d
 EBUILD geant-4.10.01.ebuild 2761 BLAKE2B 8ef8e01bf410ee499c2706ce606e2c1e02a8fafba0ca2c5e0a44fd4fadbf626104cd68845019c733696a9ef4aabbed7caa39c1105402ec92aadb6b827d96ba63 SHA512 a47442d4e58abe3912333a387462dcdd60a052fe6e1ff40e33f54c566e9d9686ec4c47af63be232dc932e0f154f3db8d798ba2e9fd0138ec4d04de3a4e7e3f4f
 EBUILD geant-4.10.01_p02.ebuild 2805 BLAKE2B 522fbc9bddd7b17508558153cf7be2645503c0c0171262d92476e896139c1b718d3279949d49bbb52af631ced5fc864e9368d6957b29f4fc3806569fce4afb12 SHA512 797ff56d6e9c2e75d623fccf5d3251553bfea98903878abe2186a3115f6eb967ace7945fabcc7bca2043771aaca5a270e3a312bd1d69f6639ee29abd2ca5b77a
 EBUILD geant-4.10.02.ebuild 2843 BLAKE2B 94b0845354360183b5063f44334d40b7649a11ee95c552c779d595d08a3d81e5cdb2c94a3c75f82a5711dfa4f855a0d5fe5244040080a88d6de2bc37fe1d9df2 SHA512 2d9314d48905317bc75743fea700da178d1e7dcbd46b403c82450a8a72513448de7037416ce91c3989dd0f2260716bb181bdfaef91b9099083d26a51bbd05de1
-EBUILD geant-4.10.03.ebuild 2630 BLAKE2B 76479614cb251d21fb7f264fa1461fdfbafc0abcb6ce36388b0de4e923b37a24126613a8d16a250c01bbda605bfe527f88a69101c9b6814ab1498aaf917a753e SHA512 ab74655c8f0aa08d45db0ad996bd1bee0af7ee8cbdb60d684823b39ae0ab6f5cc583486bf2512ee0183951cd34a73ce434de76868f21be40c2eabb1873b7b3ca
+EBUILD geant-4.10.03-r1.ebuild 2651 BLAKE2B 35a96e24a93b5036da26a7b37a359e8baea4047d57aace38385ff3ff38de1af8129b3a37b1d59a6f36a46125f21127fdc0987eed5204bfe3eb08af83f0a4fe0c SHA512 c5b91f3b5ac627e8fc20cecb6395459f0698bbb598cac2f27e5097aecedc1242a73bdbc97c0f7272725acc92a7052d2d21df11e649b6b3287ddb5158a4acedfe
 EBUILD geant-4.9.6_p02-r1.ebuild 2695 BLAKE2B 4b28a684e83af69e1d1f4aa3d18a9f1dd8fa03dbb25214f274fe3a41cc3407af34ca3032420b70478bd9c15689ba76b45d6e305d46c6dab55d00411653624077 SHA512 101ab0205ce6a18357774a9d70e694e38371436716a53bd196a925ddc95a8ed87e4a0eec5ba657b02f5e405a737865557e4551e37178360018361809abf674f6
 MISC metadata.xml 1306 BLAKE2B 22a8b02b71c8e182649a701f1e28192c3bb7f7f3722bfee91490aaea9f96111be2aafe162ac1ba07fddd7b088db15c7b87a2f8c3f9a9fd2fac0e8317b605b91e SHA512 8c84f9185232134dd9da7937244bc07b5ac1fd6f7f3732491e759b000be357b51b9434c861d81ec8c5956431ae44947e475af0b86fd8368e0ad9c68b10979ae1
diff --git a/sci-physics/geant/geant-4.10.03-r1.ebuild b/sci-physics/geant/geant-4.10.03-r1.ebuild
new file mode 100644
index 000000000000..69e39077efbb
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.03-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+MY_P=${PN}${PV}
+SPV="$(get_version_component_range 1 ${PV}).$(get_version_component_range 2 ${PV}).$(printf %1d $(get_version_component_range 3 ${PV}))"
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="http://geant4.cern.ch/"
+SRC_URI="http://geant4.cern.ch/support/source/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+data dawn doc examples gdml geant3 inventor motif opengl
+	qt5 raytracerx static-libs threads vrml zlib"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.3.3.0:2=
+	dawn? ( media-gfx/dawn )
+	gdml? ( dev-libs/xerces-c )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND} prefix? ( app-shells/tcsh )"
+PDEPEND="
+	data? ( ~sci-physics/geant-data-${PV} )
+	doc? ( ~app-doc/geant-docs-${PV} )"
+
+HTML_DOCS=( ReleaseNotes/ReleaseNotes${SPV}.html )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use examples; then
+		sed -i '/install(DIRECTORY examples/,/)/d' CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_XM=$(usex motif)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_SYSTEM_ZLIB=$(usex zlib)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	if use inventor; then
+		mycmakeargs+=(
+			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
+			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake-utils_src_install
+	[[ -f ReleaseNotes/Patch${SPV}-1.txt ]] && DOCS+=( ReleaseNotes/Patch${SPV}-*.txt )
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "The following scripts are provided for backward compatibility:"
+	elog "$(ls -1 ${EROOT%/}/usr/share/${PN^}${SPV}.*/geant4make/*sh)"
+}
diff --git a/sci-physics/geant/geant-4.10.03.ebuild b/sci-physics/geant/geant-4.10.03.ebuild
deleted file mode 100644
index ad7340f6f643..000000000000
--- a/sci-physics/geant/geant-4.10.03.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P=${PN}${PV}
-SPV="$(get_version_component_range 1 ${PV}).$(get_version_component_range 2 ${PV}).$(printf %1d $(get_version_component_range 3 ${PV}))"
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="http://geant4.cern.ch/"
-SRC_URI="http://geant4.cern.ch/support/source/${MY_P}.tar.gz"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn doc examples gdml geant3 inventor motif opengl
-	raytracerx qt4 static-libs vrml zlib threads"
-
-RDEPEND="
-	dev-libs/expat
-	>=sci-physics/clhep-2.3.3.0:2=
-	dawn? ( media-gfx/dawn )
-	gdml? ( dev-libs/xerces-c )
-	motif? ( x11-libs/motif:0 )
-	opengl? ( virtual/opengl )
-	inventor? ( media-libs/SoXt )
-	qt4? (
-		dev-qt/qtgui:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	raytracerx? (
-		x11-libs/libX11
-		x11-libs/libXmu
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND} prefix? ( app-shells/tcsh )"
-PDEPEND="
-	data? ( ~sci-physics/geant-data-${PV} )
-	doc? ( ~app-doc/geant-docs-${PV} )"
-
-HTML_DOCS=( ReleaseNotes/ReleaseNotes${SPV}.html )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use examples; then
-		sed -i '/install(DIRECTORY examples/,/)/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_INSTALL_DATA=OFF
-		-DUSE_GEANT4_BUILD_MULTITHREADED=$(usex threads)
-		-DUSE_GEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DUSE_GEANT4_USE_GDML=$(usex gdml)
-		-DUSE_GEANT4_USE_G3TOG4=$(usex geant3)
-		-DUSE_GEANT4_USE_XM=$(usex motif)
-		-DUSE_GEANT4_USE_OPENGL_X11=$(usex opengl)
-		-DUSE_GEANT4_USE_INVENTOR=$(usex inventor)
-		-DUSE_GEANT4_USE_QT=$(usex qt4)
-		-DUSE_GEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DUSE_GEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DUSE_GEANT4_USE_SYSTEM_ZLIB=$(usex zlib)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-	if use inventor; then
-		mycmakeargs+=(
-			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
-			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# adjust clhep linking flags for system clhep
-	# binmake.gmk is only useful for legacy build systems
-	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
-	cmake-utils_src_install
-	[[ -f ReleaseNotes/Patch${SPV}-1.txt ]] && DOCS+=( ReleaseNotes/Patch${SPV}-*.txt )
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "The following scripts are provided for backward compatibility:"
-	elog "$(ls -1 ${EROOT%/}/usr/share/${PN^}${SPV}.*/geant4make/*sh)"
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 97404aa06b40..68f69fcc7dea 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index c496f7709c1e..d54c9b5c4133 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,5 +1,6 @@
 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.6.tar.gz 5093897 BLAKE2B 9cbd432b8177175b39b4c0068b4852951903fb7d142608b2a7d624e29d8f5e6f4b700ecb3914b7de8e0fc8dcc22156d4cbf2e5b681412b3b5aca4738ec258759 SHA512 7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
@@ -7,7 +8,7 @@ DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036
 EBUILD gnuplot-5.0.1-r1.ebuild 5692 BLAKE2B 62aa0d443aeb5690a274c1a7e389e506a152eac52a4d0ec36d412158c7bd963a8eee6d558b9f2b1608b4d8612879a34b89f476f21ebef5c4d73fc95c28f2e70d SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849
 EBUILD gnuplot-5.0.6.ebuild 5891 BLAKE2B fd3af7f1a8184ff2ea2464fae22525d7832eeb21e37b64739016bdf4a3e9ed58d3dce75cb5763c61e5ec0fda3c07a70cb72cb002d3365304e9656c2b38de2cae SHA512 53e558357ab52930975be0fa3bf2bba9578c62d2f98658eafe0bb9581c477aa56f64f378705de51e1d284b0f37365b10e159d9e229a1a10a14f1a6d544cb25cb
 EBUILD gnuplot-5.0.7.ebuild 5830 BLAKE2B cb0609ed221db653ae7a25c41ec43afeac5358a8ce7334d4b127de353800bd14820c90d84c6b70ba1163f1c831a5a99e5bb33b46ee173d11b3566fe63d30f815 SHA512 a21375723ecf36385a2749c2710bb3e45448df198c373c190c5be0f293474cf97733a3ef8f8e16e83399d7dc85f6ff104110cf10e85c3ed98c5abfabd7852197
-EBUILD gnuplot-5.2.2.ebuild 5786 BLAKE2B 9fa3e7d0881cb7bc002be34e9a0b1efa52169bcd97de44ee5257a303fdcd0b6603fb695385907ff558d81492dbd553f9499995778ffa7b384e89df1474a49ff5 SHA512 0288e928706b88c9294bb65e18ea68c47902fc6ecddd790656c4d465eef5684f782780d9ea6e0680082fa79bed1650b4b7272f3a58b821ef9ecd8f65907cce17
+EBUILD gnuplot-5.2.2.ebuild 5860 BLAKE2B 1c1cb9b7e2ac370674628a8bd9d1e444a60aae2967eca5d53bcbd52202d8f3e4623071da33ab12c2f58462855bcb871bf3edd8c42da7082e6a7616a282ee826e SHA512 ae23cfd5c27f35102e76dba5f204b69b5a5df8e7e41ede76be867043233a3611ca17420217c7adc3045a5f8480483253a34771dd3c97e2d59881607344a41e96
 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 1217 BLAKE2B 50ad1f750abe89f9b8b46da87d676d91777be370bd5d51f068b02697254c89e47c232a92d5c2e5316aa2c0ed7fd3905f5aa67fb7bb05b420180ee53a7f20945a SHA512 e97feeb58efc1064f7b5739306dde9435e4cb93c260d8999e292adefc99c45c8534ac5e4c06096c5fb79faea88562c76ef74868be0b112dcb8162ecbfa39a42c
+MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
new file mode 100644
index 000000000000..613a028ee79b
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
@@ -0,0 +1,43 @@
+Add configure option for ReGIS support.
+https://bugs.gentoo.org/643888
+
+--- gnuplot-5.2.2-orig/configure.ac
++++ gnuplot-5.2.2/configure.ac
+@@ -1057,6 +1057,13 @@
+   AC_DEFINE(HAVE_MIF,1,
+           [ Define to include support for mif terminal ],))
+ 
++dnl ReGIS terminal
++AC_ARG_WITH(regis,dnl
++[  --with-regis            ReGIS terminal])
++AS_IF([test "x${with_regis}" = "xyes"],
++  AC_DEFINE(HAVE_REGIS,1,
++          [ Define to include support for ReGIS terminal ],))
++
+ AC_ARG_WITH(cairo,dnl
+ [  --without-cairo         cairo-based terminals (default enabled)],,
+   [test -z "${with_cairo}" && with_cairo=yes])
+@@ -1350,6 +1357,12 @@
+   AC_MSG_RESULT([  mif terminal: no   (use --with-mif to enable)])
+ fi
+ 
++if test "$with_regis" = yes; then
++  AC_MSG_RESULT([  ReGIS terminal: yes])
++else
++  AC_MSG_RESULT([  ReGIS terminal: no (use --with-regis to enable)])
++fi
++
+ if test "$is_msdos" = yes; then
+   AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
+ fi
+--- gnuplot-5.2.2-orig/src/term.h
++++ gnuplot-5.2.2/src/term.h
+@@ -182,7 +182,7 @@
+ #endif
+ 
+ /* REGIS graphics language */
+-#ifdef VMS
++#if defined(VMS) || defined(HAVE_REGIS)
+ # include "regis.trm"
+ #endif
+ 
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index 9948859c4837..ee0a6fd16570 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
 SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -73,6 +73,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
 	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
 	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then
@@ -138,6 +139,7 @@ src_configure() {
 		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
 		$(use_with libcerf) \
 		$(use_with lua) \
+		$(use_with regis) \
 		$(use_with svga linux-vga) \
 		$(use_with X x) \
 		--enable-stats \
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 8700ea957399..6442566e482f 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -27,6 +27,7 @@
   <flag name="libcerf">Enable special functions from
     <pkg>sci-libs/libcerf</pkg></flag>
   <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
+  <flag name="regis">Enable ReGIS terminal</flag>
 </use>
 <upstream>
   <remote-id type="sourceforge">gnuplot</remote-id>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b2d74cdf4649..dbe483135fe2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 3a4c194d4364..dc08cc5de6c1 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.3.tar.bz2 32266 BLAKE2B 6535bb451e393accd7c041079188c8c76b318f449adf2e5d1579496a27951de12b8404fb4ded3c143b60fe59ad04017a1a53e4a4ce864559f192fc96f1269a05 SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 EBUILD baselayout-2.3.ebuild 8346 BLAKE2B e69042d75377e5993f7f834cff27fbb30ecc5c1b1f6bceae70b96c6c077918e214d1d25b2b335f9c711ec32bb0edbeed3daceb4a98860342e7ac0e9e66b15304 SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1
-EBUILD baselayout-2.4.1-r2.ebuild 8590 BLAKE2B d69044e26bbe76022f9b6e3dffe9efa1ca165e1a9c5c39c462966a5a4369c0dca69a80021d6475c1f2ca400bb4f8b3104c74f1fbfe7dee8722c376e0fa32ac69 SHA512 7165d72ad79dda758181d7f623ec10b75463961cc6a19355ecea2b3ac3ce873670afdb82ab266d3be44add9ddc13176e1fdb48d8bc551b87c06f2b162138241f
+EBUILD baselayout-2.4.1-r2.ebuild 8586 BLAKE2B df33e986a6d7f0135b7e0861c6a8f689c1eefded615d4d40f18fb1885b725f6b6c3115596c5da399426e54a40facf577fd4d6cdfdfb2ca59f520a79859dd6366 SHA512 c7816cb2f1dfb69608ee0a3ea12fe5bb4c4a94b63f281ebc727b6faae11e796cb2393c696bd04c9a197268c8d3fc73e8caf59c849ba2dc359597ff4a7396ccd9
 EBUILD baselayout-9999.ebuild 9191 BLAKE2B defd00dbef7c524e118b8d863c7eae6f87870d25169ea7919c43c68b5e20892b214d7cc72637dfaebb29b50eab546e38a8cbb745d0eb236a5155c4cdf20f8799 SHA512 0cc07338bdc4eaba42770dca5fb7be1e0c025325f9879d3a0d4081edd3e9f6dd11a7c1ea24d2ab2eb19b28ac2648f14877cf305ef65b6d9bd7aff11fc3d60e0f
 MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index bc82d2ddcdb2..ec9e36e9794c 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 35622b197fb9..f825784ac46b 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,3 +1,3 @@
 DIST colorized-logs-2.1.tar.gz 9997 BLAKE2B 5d6b184102c63dad8526f1feebbd84531a18f2505801f4bedd62cbdfa04bd919b750b60b37fec5449b1a5b98500dcbd7feec7b7155ca0c779d31ea66d8305e28 SHA512 d03919cfa19d6df41bcb9dd6bb29e436febff4ed4d50d9ce83910bfdb61acbf323ecd4dcf9eaa9cfae3bb338b2107f1d156815848b8da8b470c50651650dfee1
-EBUILD colorized-logs-2.1.ebuild 656 BLAKE2B 92bbc9f7f776e1bc9d00317883acbdeab1e59e4f10aacda88546b6c9c6ec3f91d555d761b73caf2c3833def414ebb78b7bf724b3ec99a9d3e8f2a46ec1d2608e SHA512 5f765f2673ba17c90019125c2c2fca9c0cfd0feab5559255a17dcaa6fdc2ab87f001d5dbb2b3ffae5799e43a169c074b925c17a445b6b4ecae8f2214cb362986
+EBUILD colorized-logs-2.1.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.1.ebuild b/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
index 2d9ecaf97f24..0e22beb33d1e 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a6b26866160e..e0070cf3f0a6 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,5 @@
-DIST fwupd-1.0.0.tar.gz 1466486 BLAKE2B 284f17eb9150251ca012f5b09eed925a397d77375f6d4ab1d0872b6a3c1c7ded4f76d8d8c158797154696b04e8856b9ddd1b185dd0df8465c50d93beeaa3335a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422
-DIST fwupd-1.0.1.tar.gz 1498681 BLAKE2B 3320c540d5395c28ab778d40e5a9901f877a7606b5e5188a7bc8e1c17648916c52e752363f07e01e5381894feb9df7034064bebb62a9088fbaf8affd01685d34 SHA512 f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345
 DIST fwupd-1.0.2.tar.gz 1516078 BLAKE2B bdc0d54fa0058a329d409debd41c4f83f7036669b3356ca82d86a1233ca567841b1758adeb8f8abbfb7f9bda004934ba970747da413dc4862e459792a42745ec SHA512 52773590255b0a120c56f5f8b58243e88fcc322d8f2348b5f463db4107aebd4df2769103e003d095b1d0571c598c0274af0b7da4a248e4dd1786156697170e06
-EBUILD fwupd-1.0.0.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9
-EBUILD fwupd-1.0.1.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9
+DIST fwupd-1.0.3.tar.gz 1534438 BLAKE2B b578bc4f8a53bd596f13a2bc45e5229b30a9aacb837fe3ef3b267eaaf5e8e277c21b9c2b915495d5b58a36b386b9b223ff219cfe2082ca6d18fae2cbd37b1ff9 SHA512 4a39c6d2da5ca83f9bf2a6aba9a63cd716622f6bfda4760c7abdc73932d86dc41305cc8780b3292b208c285fddda6edd926d58d2c90847e34130e6f145b5c6b7
 EBUILD fwupd-1.0.2.ebuild 2468 BLAKE2B 3e2171512869cfb08ba0121dabcdeb527acd5da45248506a6c03558d622d1ec3d13a07da08d68bdb3a27b9228db8f82edf773510cafe7c21b13ed52f54200269 SHA512 2d640bf0f2e71955c75a99cbdf856a30f8d48cfcd027c9b2b6515edf0227d5baf4764fabf672bb4a3840f5a3cd19abf2a245b53c35e4e5043bb05b67a53a5d12
-MISC metadata.xml 838 BLAKE2B 94e61de164b7858afceebb163391c113e557d7d962c40650ac2e45a334e2347ad5ee42123ca5e878693a0768ca9819ce29e64650b0dae6d0e49c558d46550ba3 SHA512 22e958ed755f3d824fed8f164fb20943947ff1038382e8983104e15c4b0b57540f940da6933a2a121e4795ddafba817cecf0fde92e563d5b875574c268eb4f4c
+EBUILD fwupd-1.0.3.ebuild 2468 BLAKE2B ae4b1a59eb7e81f6faf75b7df3b1a7bb446df4207dee13f286a86b0783029e9da3b9f34453305b77eacaa96358c24546cd4eb0086505d82192e7a0fd30011da5 SHA512 3fccd7b9c663b765bd07c2eef41a10e4d4a4f8085901f5c3e510e00810a8eb3e52d45c0bf2b63b72abcf1005b883676f2a82f818aede3cf136df8cb1406db612
+MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
diff --git a/sys-apps/fwupd/fwupd-1.0.0.ebuild b/sys-apps/fwupd/fwupd-1.0.0.ebuild
deleted file mode 100644
index c102d10d91b7..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
-REQUIRED_USE="
-	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	app-crypt/gpgme
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=net-libs/libsoup-2.51.92:2.4
-	>=sys-auth/polkit-0.103
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	elf? ( virtual/libelf:0= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Denable-colorhug="$(usex colorhug true false)"
-		-Denable-consolekit="$(usex systemd false true)"
-		-Denable-dell="$(usex dell true false)"
-		-Denable-doc="$(usex doc true false)"
-		-Denable-man="$(usex man true false)"
-		-Denable-libelf="$(usex elf true false)"
-		-Denable-synaptics="$(usex dell true false)"
-		-Denable-systemd="$(usex systemd true false)"
-		# requires libtbtfwu which is not packaged yet
-		-Denable-thunderbolt=false
-		-Denable-tests="$(usex test true false)"
-		-Denable-uefi="$(usex uefi true false)"
-		-Denable-uefi-labels="$(usex uefi_labels true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.1.ebuild b/sys-apps/fwupd/fwupd-1.0.1.ebuild
deleted file mode 100644
index c102d10d91b7..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
-REQUIRED_USE="
-	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	app-crypt/gpgme
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=net-libs/libsoup-2.51.92:2.4
-	>=sys-auth/polkit-0.103
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	elf? ( virtual/libelf:0= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Denable-colorhug="$(usex colorhug true false)"
-		-Denable-consolekit="$(usex systemd false true)"
-		-Denable-dell="$(usex dell true false)"
-		-Denable-doc="$(usex doc true false)"
-		-Denable-man="$(usex man true false)"
-		-Denable-libelf="$(usex elf true false)"
-		-Denable-synaptics="$(usex dell true false)"
-		-Denable-systemd="$(usex systemd true false)"
-		# requires libtbtfwu which is not packaged yet
-		-Denable-thunderbolt=false
-		-Denable-tests="$(usex test true false)"
-		-Denable-uefi="$(usex uefi true false)"
-		-Denable-uefi-labels="$(usex uefi_labels true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.3.ebuild b/sys-apps/fwupd/fwupd-1.0.3.ebuild
new file mode 100644
index 000000000000..de768b752cdd
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.0.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit meson python-single-r1 xdg-utils
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
+REQUIRED_USE="
+	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	app-crypt/gpgme
+	dev-db/sqlite
+	>=dev-libs/appstream-glib-0.6.13[introspection]
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/libgpg-error
+	dev-libs/libgudev
+	>=dev-libs/libgusb-0.2.9[introspection]
+	>=net-libs/libsoup-2.51.92:2.4
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.3.3
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	systemd? ( >=sys-apps/systemd-231 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	uefi? ( >=sys-apps/fwupdate-5 )
+	uefi_labels? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/pango
+		x11-libs/cairo
+		media-libs/freetype
+		media-libs/fontconfig
+		media-fonts/dejavu
+		media-fonts/source-han-sans
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/gcab
+	app-arch/libarchive
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	test? ( net-libs/gnutls[tools] )
+"
+
+# tests require some ominous "certtool" which has not been packages for Gentoo yet
+RESTRICT="test"
+
+REQUIRED_USE="dell? ( uefi )"
+
+src_prepare() {
+	default
+	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dplugin_colorhug="$(usex colorhug true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		# requires libtbtfwu which is not packaged yet
+		-Dplugin_thunderbolt=false
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index a6f7b5108871..dd10e28c07e5 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -9,8 +9,6 @@
     <flag name="colorhug">Enable ColorHug support through
       <pkg>x11-misc/colord</pkg> package.</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
-    <flag name="elf">Enable libelf support through
-      <pkg>dev-libs/libelf</pkg> package.</flag>
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="uefi">Enable UEFI support</flag>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index c35429cda918..85b01e1afd59 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,7 +1,7 @@
 DIST hwids-20170328.tar.gz 2049249 BLAKE2B b9dd6dc98c9eafd4f1eb1e129a53bf10ebc4b3b718c9bc134cb5b3f5c2dfaa9626607b4f6edc8f35b811e3a7404cc967d5e9732398880dd5b96a76ca6e97cd37 SHA512 ffccbcda78f856b93026102d1d7f62f4639910671c63e30471c990b1029db94b542c555b6ad69820f8a91a45ef9d52c320b9767d38ff08b6e72c041a28e6f0f3
 DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a4bbfcd250ac3b96259b3c2eefbade8b0555fcffeafc35e46ce07551bdc6d26d25d9913d7a584945b52f7e744dfe SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
-EBUILD hwids-20170328.ebuild 1445 BLAKE2B 10fcadbd95e9f6f6f75c1b4c0bcf8ab4a4ec9ef6c8ec2b3d413ee5247e7c5194d128004077278edef9c74ab92212823f1ad3ddb7231bd77a47421af70b66acb8 SHA512 bde4d3969c19eca2dc0b037473d2bc93fc7ef5aa79c5d23f7e2476fc6f51adb304b324658b005faff9d73ef918c0c8d73a57dd56dd297f2a3685f40204ca03c1
+EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
 EBUILD hwids-20171003.ebuild 1719 BLAKE2B 3bf86ff4b2a95b72dc19f2b8cdcecd3eb1dfa60ce0b7a3f288552f292d8598f8c6ed147b7e5a790b969bd9e5ece39cde8eb0e5e649c12f92ed28f2ae64a5cf10 SHA512 b7ecee65b754aa40ab65204f08803728560156e4c54df221df8163432ee488a284ea43cb5d4b26ee68a86765c776963d6cd5e0fa2e5a0482febc1aff8b240bc0
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
diff --git a/sys-apps/hwids/hwids-20170328.ebuild b/sys-apps/hwids/hwids-20170328.ebuild
index 26e95e33c5cf..b59f80cc2afc 100644
--- a/sys-apps/hwids/hwids-20170328.ebuild
+++ b/sys-apps/hwids/hwids-20170328.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	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"
+	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"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index e68a2b27d9ca..f3fabf5020ea 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -9,5 +9,5 @@ DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 EBUILD keyutils-1.5.10.ebuild 2804 BLAKE2B f0f4d4b762592597e38e358c721e6625288ed5b443b37b459d4edf3f285f17d3776a1695d6a04cc24435df297de76b151d2d5ae4939472a88276d72a28db6ab6 SHA512 88cd81319c89a05b6f4f446f22833810e894802809610afc3066df35ad0d426349e964e739aaa34bdc4dab9368d5c728cb791af2486f38f0e966be9c49981323
 EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
-EBUILD keyutils-1.5.9-r4.ebuild 2957 BLAKE2B bbbade2fc5082d6a325931e6fe03c6997141c50e44b461e94553f42917544c42a5019b345b1a2a850895762e2649cdc182972bc7320d2d4f34747353ed12f93b SHA512 be012496cb7ea1185ba7780ae077c10d372f9a4147b5477636eb5567a0b56eff02eb170d6e4c3405e91a8ab84c4f22e1c0d9053bbee367b1905a55c6bacd4cf4
+EBUILD keyutils-1.5.9-r4.ebuild 2951 BLAKE2B 9900bae33b3e40f55f9a8a82de36398fc0933ed73ee6c2e6b3883469f383e8f5c49f0af6321dab0b6b983d903822748c690d768658b53ae44a47702ee9f63337 SHA512 ed51b0f3ef93d81f135b20d5c54ae867221c8da2a4246706c62af409a97a462bbb5c85f587c8951a654fb3a9134b4b77965b7a9b98a094f40db7e5ea6d1759cb
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index c5a160fb1459..9a2e98de587c 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 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="static static-libs test"
 
 RDEPEND=""
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 005741c11d8f..459de10b7018 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,7 +3,7 @@ DIST kmod-23.tar.xz 450376 BLAKE2B dd38b6d8853e40cb8c9939cd3c68bfe3b36e58445cac9
 DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 EBUILD kmod-23.ebuild 4902 BLAKE2B 22ef9ed75e115712545c6923ba982d5e1a271b4a61576760a2af471885a32727d70c5e44542d68b545e333440e417052c16f069b50efe92c54b3d480ae1e09ae SHA512 b38be77d4f89ffda2551a3c5ef2b85146ba27254d0c109425b7ad0fbfdc1528381f605a1e354a06f3321eb5b63bba6d6ec955245135f54a3a2a5d131667360e5
-EBUILD kmod-24.ebuild 4917 BLAKE2B 948c3e51bd2fbb7270dda317ea6baecf40e736082a9af262a3afe86684348f689349ca3d81930a454980077466cd0250dbe534196cbf8261d25f9add57e23008 SHA512 c8715b0176a7c02da837e6ee113f576b115febe9f5b93636bc5438b2c11d4a005bda1569fb414a50cc4fa115bd5e32bb66615cd75a2af4712f73c3fa49a993f7
+EBUILD kmod-24.ebuild 4914 BLAKE2B d44e7e1a325d992cc650d25227c55b3cce916cf92a148e1e429f6b4dd41146c01dce144e029f3138900a5903bd82fa59a0562284cfd3c9e9b8cc837d3f23dec8 SHA512 84d2501285ef621e977dcd94fff0c4597f8af303174533b69c17e1782afa831d12647fcbe83bc6ceb67d321ca50940191e29d180e1bbb496e4567c8045317272
 EBUILD kmod-25.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 EBUILD kmod-9999.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
index 77b0a8b5ccdf..ae6cb6730b93 100644
--- a/sys-apps/kmod/kmod-24.ebuild
+++ b/sys-apps/kmod/kmod-24.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 3ba294d29ddc..ee8df8260e16 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,6 +5,6 @@ DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 EBUILD openrc-0.28.ebuild 10123 BLAKE2B 93866eee80dc86f95a4e1f2a506832048720a01608c020108bc20a54936b857b1e5e5c1f88625c01afa482247677977c33c478ef3ef38519693b01e4d09694bc SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72
 EBUILD openrc-0.32.1.ebuild 10162 BLAKE2B 2948ad5e2f905ccd933861ce20c1ccf8dae1a51e3f11086015f250d217c76f70cc87d99ecd8fdfc1f525984f2337841dd0d3eb83fa5ff8c9369fa8f8f476b65c SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0
-EBUILD openrc-0.34.11.ebuild 10160 BLAKE2B 97e3355b42deb4be403255b041f8c631b8a5d5177411964e38486ce3d8b4d8dc14205b746f5ca20081290f346083a0734edcea7e0dad35a3aa05d3c2d7085cf5 SHA512 715d9547706b7adb9cec57f75daf35af86d3da375b4518b501a7f0bdcdd722effc12087cf2c817ffcc58216a513282a255d4e47ab2d33a6a0999298870f5ad61
+EBUILD openrc-0.34.11.ebuild 10157 BLAKE2B c40f4e35c5be8609a061e763521eccea6c6a83f1b3e244157a9100387e68c8a9e300930b217aad9d9f9dd4e234485fd8258cd90d272255856840117a6aee8e8e SHA512 36f92e6cffb5effa0304c2117ae436649d9f2a885917a43c5b71d9c46f6327188d32ac70ef82c30d9d869727341c26ae0776b23b1bcb6e0de9515301c3d4f827
 EBUILD openrc-9999.ebuild 10276 BLAKE2B 40b25d0b8dd57aed46814ad381caa3df4a6b56f3f66c5271943eafd83d44f536d8fd654fa91efe00ce20a51c01f40c871cf0c94ceda41b81ddc89bf301dfd88e SHA512 370126a545dec34a34366badcd11ead8588c58f2e8414c85afb80c3544c94610caa7fb258118a7d2b2b4b289d8c67cd3d7119fd2ff4410613a1a1942be984506
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
index 91c0a038078d..129eefba81e6 100644
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 4e32e851804d..985c133fb0e8 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,9 +1,5 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
-AUX razerd.init.d-r1 448 BLAKE2B 8f872bae7951d745f6e1f3e57788d7f9486152cb5bf7b0e8be543673e2d8c29faa114cdc30270e6e39c99b9074652f974ecf4fb62c21794c0afb93238acdbf21 SHA512 4228b7d18c546e6c8d840c3ff3b4e3690e89e70bab156e3f6646c9fb68c23adb0ec0ca40fbbe28d3c768c75a0b27deec2890df26566e40c02e4dbe7f4890530a
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
-DIST razercfg-0.23.tar.bz2 69425 BLAKE2B d233a102871f8cbd19398c154e52e9a2400dc9c935c180e8a228a860c53c0cc185a4d3003f3f07e7d6f628d10a40b267c6a28b3e5b351b368cd15c96b7eca42a SHA512 79c795870efa960b42abc70710b4bebe793acb9e732943207ca4b34d35ba926af4877993db888829dbacedbe327324fba0ab2ef82ced1d653b4aee23e154fd8b
 DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
-EBUILD razercfg-0.23.ebuild 1420 BLAKE2B 7ac0d6f3a6813bbd56b04d1e47fc1a9728610538bc53b70c843c846845dfa62985523bb4fafcad79ba1013cf2eabc54a0984dcc39d1d0d8d1acd26e0c87b586c SHA512 5305f308818675fa7a3fb4057d545bc493b2999536f6ea0f89a5d94b4a84f00633a20ea1b21370892d5e13b3869addec838ae90acab7d2a57d9dcdaae2eba8ae
 EBUILD razercfg-0.39-r1.ebuild 2199 BLAKE2B c0c3506070627a55a110f1e1a709f04d5b37d4b34da417e31978a32f8978152665197c7eafeea2347e97b8737280ee0ce94cfd7c6a3608105661c946d54c2253 SHA512 b2159f2534e6ec259b174c8cbbd2768cddb992a7c4233d1d6b777bdf68e5bcf4685e2f0a4b8de0b1492944fce8f8267850bf2bd555e0ecf297f95f56ab098e5f
-EBUILD razercfg-0.39.ebuild 2084 BLAKE2B 83c810b78416dd25e4432f029865c6bf1bf9b489b37fd9e2e19ccdca13debda615e342dce5c0edcb0f82ecc338a5fecc5eb18ad46b394e5680ae812602a53343 SHA512 2a6b28d9f06b97165e036f28dd50dee66a7a2fc78f5ec152ab898a341f208bf8d397151b10c0981684592664c61a56990194d5c729adaf2d2d61c235a64f22d1
 MISC metadata.xml 886 BLAKE2B dee29a5b317f3b4b36ed7a4baebf09a3da4d282e548e6d826c42ab4bb23cf0664fdf1a059e1273dce6cce15321b26447a9f666ac3584e8d68a4fc812f9f5029b SHA512 2076e37094d47851ca979be25c695bdb40533d1adfa81520992a1a6c88191c5cfac2e61f0ad2ee50efef0b7fcfe3b0aca993275aa1c05559d09644d37f466599
diff --git a/sys-apps/razercfg/files/razerd.init.d-r1 b/sys-apps/razercfg/files/razerd.init.d-r1
deleted file mode 100644
index 304d91196bc0..000000000000
--- a/sys-apps/razercfg/files/razerd.init.d-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-}
-
-PIDFILE=/run/razerd/razerd.pid
-
-start() {
-	ebegin "Starting razerd"
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/razerd \
-		-- --background --pidfile ${PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping razerd"
-	start-stop-daemon --stop --pidfile ${PIDFILE}
-	eend $?
-}
-
diff --git a/sys-apps/razercfg/razercfg-0.23.ebuild b/sys-apps/razercfg/razercfg-0.23.ebuild
deleted file mode 100644
index f902f7fa366b..000000000000
--- a/sys-apps/razercfg/razercfg-0.23.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 cmake-utils multilib eutils udev python-single-r1
-
-DESCRIPTION="Utility for advanced configuration of Razer mice (DeathAdder, Krait, Lachesis)"
-
-HOMEPAGE="http://bues.ch/cms/hacking/razercfg.html"
-SRC_URI="http://bues.ch/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+pm-utils qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	pm-utils? ( sys-power/pm-utils )
-	qt4? ( dev-python/PyQt4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e '/ldconfig/{N;d}' \
-		-e '/udevadm control/{N;d}' \
-		-e "s:/etc/udev/rules.d/:$(get_udevdir)/rules.d/:" \
-		-e 's:01-razer-udev.rules:40-razercfg.rules:' \
-		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
-		-e 's:50-razer:80razer:' \
-		librazer/CMakeLists.txt \
-		|| die "sed failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/razerd.init.d-r1 razerd
-	dodoc README razer.conf
-
-	if ! use qt4; then
-		rm "${D}"/usr/bin/qrazercfg
-	else
-		make_desktop_entry qrazercfg "Razer Mouse Settings" mouse "Qt;Settings"
-	fi
-
-	use pm-utils || rm "${D}"/usr/$(get_libdir)/pm-utils/sleep.d/80razer
-
-	python_fix_shebang "${ED}"usr/bin
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-}
diff --git a/sys-apps/razercfg/razercfg-0.39.ebuild b/sys-apps/razercfg/razercfg-0.39.ebuild
deleted file mode 100644
index 05d798d71a69..000000000000
--- a/sys-apps/razercfg/razercfg-0.39.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit cmake-utils multilib udev python-single-r1
-
-DESCRIPTION="Utility for advanced configuration of Razer mice"
-
-HOMEPAGE="http://bues.ch/cms/hacking/razercfg.html"
-SRC_URI="http://bues.ch/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pm-utils qt4 systemd +udev"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	qt4? ( >=dev-python/pyside-1.2.1[${PYTHON_USEDEP}] )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/udev )
-	pm-utils? ( sys-power/pm-utils )
-	virtual/libusb:1"
-DEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/libusb:1"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i CMakeLists.txt \
-		-e '/udevadm control/{N;d}' \
-		-e '/systemctl/{N;d}' \
-		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
-		-e 's:50-razer:80razer:' \
-		|| die "sed failed"
-
-	sed -i librazer/CMakeLists.txt \
-		-e '/ldconfig/{N;d}' \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
-		|| die "sed failed"
-
-	sed -i razercfg.desktop.template \
-		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
-		|| die 'sed failed'
-}
-
-src_configure() {
-	mycmakeargs=( -DPYTHON="${PYTHON}" )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
-	dodoc README.* HACKING.* razer.conf
-
-	if ! use qt4; then
-		rm "${D}"/usr/bin/qrazercfg{,-applet} || die
-		rm "${D}"/usr/share/icons/hicolor/scalable/apps/razercfg* || die
-		rm "${D}"/usr/share/applications/razercfg.desktop || die
-	fi
-
-	if ! use pm-utils; then
-		rm "${D}/usr/$(get_libdir)/pm-utils/sleep.d/80razer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use udev ; then
-		udevadm control --reload-rules
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	if [[ -e "${ROOT}"usr/bin/pyrazer.pyc ]]; then
-		eerror "A stale ${ROOT}usr/bin/pyrazer.pyc exists and will prevent"
-		eerror "the Python frontends from working until removed manually."
-	fi
-}
diff --git a/sys-apps/readahead-list/Manifest b/sys-apps/readahead-list/Manifest
index 2121267d4f9c..58902d4c5c41 100644
--- a/sys-apps/readahead-list/Manifest
+++ b/sys-apps/readahead-list/Manifest
@@ -4,8 +4,5 @@ AUX init.d-readahead-list-early 516 BLAKE2B 61f56105177fa70318a0076ba327f9795023
 AUX readahead-list-1.20060421.1016-gcc-4.3.patch 200 BLAKE2B ba4051a07214477f948af0e1c310b97e43cd7aaed9c1d79b3937da8ea42ad4b604bb69967a15da21dda219e82a5b71ccfa82c947f51f116f3a69ac2e1c67bc22 SHA512 eb292b74e4fdc167a7edaf9d0f3f8ebabd69eff14a18b860ecbe26241708875153dd43ba3bce41a94bd83892093cf8f41d3f7bc421fadaab8a88d9728cb67795
 AUX readahead-list-1.20060421.1016-gcc6.patch 674 BLAKE2B 5749541d931ec45679c3c43fc2afb0b625fa53e54c86f4da413774d6e2cdf8f94f9819e0f802fe27d2ec6bff8dffe368ca72952769d1d6596ae0958030625ebb SHA512 3b070f6ffe5c396c2535e0fb7cbe8ba3ed87dcada1cacc39e9a607298c8a9fa4af37dd0942733b3a6d9bdbf55f6d1ad3916da7ac25bcce3188ce29c76711bdc8
 DIST readahead-list-1.20060421.1016.tar.bz2 108337 BLAKE2B d806e5afd9ba5334522e90cae830496ba3316927a5b2f605834de4b6cd3cbf6a8fbf840e92069546bc526e65d0beac04bc8c6f6dbff5f2fdfc9f033b0f5a2682 SHA512 fa5644be139c37f9464823e20472a607d7ab754259c6545f83cc9679419bf643ee70aebd7aa4d496a8fb349048ba4836e2ac45ae727ade76156b5ad6e6889ec5
-EBUILD readahead-list-1.20060421.1016-r1.ebuild 1565 BLAKE2B 8522b43c247c289c5739aa3977aad26876f3c665839c4da35204c0f8881514ec1d72135a2c2ef85e3ac09f77b17af29535b3c47547f7f030b62741d7cb9b2944 SHA512 9665223202d788db47dea77364657df4608be446b4c8a9c6e81e971f6ec934fc7e497943dac2ce3ff25031f7d5e4c375e9db902f4d6964f7e252bc3a2b78d636
-EBUILD readahead-list-1.20060421.1016-r2.ebuild 1477 BLAKE2B c899f8847d2f9e8f2037c8a320703a19113e862cbdefaf58e358c3bb4e54568ef5fe7627671dde9f01202282f99021ddfb056843ee988a0cb51298697e640efa SHA512 4e84737d1017d57a6ca536bd1a2bcb5bc2385cd67ceafb524cd502fad5609d8a0e3bc83b27a05b73d6f397547150336a81b713434d1c34a875642136945fd417
-EBUILD readahead-list-1.20060421.1016-r3.ebuild 1474 BLAKE2B 46d8fbe7d8d3f84992ace61b7d14b4365de2e950d9f828cb93fcb05be000d10db4de6834ad0c9df756d4b7b7bdb88d701ab630f97bdd7514bd33c8201cbc37b2 SHA512 8abf829d9b5765f6b734ba58a066326f1b8b0a9a4249e2ddfc0179fe42f45a9269d5bd63b7b479c37db2c6cbf6c01bc1e3a21fe6c55d5025896eefbf6c640f3d
-EBUILD readahead-list-1.20060421.1016.ebuild 1616 BLAKE2B 78c96e72dbae0de52fe9cbdfb1618d66c1880ef6e0c8e050f3b176a1d1c07a505e8fd62e899296cf75d969e73946ebf780ce2194bc7c88fe5b635afe05ce714d SHA512 88d19739d2aa452464f19e95f312383744f927ace3716a4375cf6c08b34b736d3558a8dc80e6ecbbcdbbbdc4a0007f908b86ca6de7af6437aef56979329747da
+EBUILD readahead-list-1.20060421.1016-r3.ebuild 1486 BLAKE2B 281c4cad9f8db8def29563b2ea026dd7066acd12ab87b0427299cc2c019ab01eaef67a17826eeea77ba902f6156739520a64bbba9fb50c542fd39439b61974e3 SHA512 eed7fa282df5e9cd375a68486bae9e8f6a65491f11caf47a6a37c41ffae3f398606ab81fd839f3eed5eef395a29b883638ccc5b5f83e02251082b9629dd23c39
 MISC metadata.xml 407 BLAKE2B 4f8a789b9f98f2ad875b0f61daa025f394864a55f3f96f49cd9074e5309c78b22b88de04e9db875e7853bad393c9d37f656d17dcaaede73ec0cc1dc52b4c8c52 SHA512 a70ad465795004c9e3d4bfe6597597716d9618ed82a789121f78a69b259215757adba0e0eb66234c974d2f93681cffc9894c130ce96c9289e18aed13793aa67c
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r1.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r1.ebuild
deleted file mode 100644
index 5790a1d340e5..000000000000
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit base
-
-DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" )
-
-src_compile() {
-	econf --sbindir=/sbin || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# init scripts
-	#cd "${S}/contrib/init/gentoo/"
-	newinitd "${FILESDIR}"/init.d-readahead-list readahead-list
-	newinitd "${FILESDIR}"/init.d-readahead-list-early readahead-list-early
-	newconfd "${FILESDIR}"/conf.d-readahead-list readahead-list
-
-	# default config
-	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
-	newins readahead.runlevel-default.list runlevel-default
-	newins readahead.runlevel-boot.list runlevel-boot
-	newins readahead._sbin_rc.list exec_sbin_rc
-
-	# docs
-	cd "${S}"
-	dodoc README
-	if use doc; then
-		docinto scripts
-		dodoc contrib/scripts/*
-	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{\} \;
-}
-
-pkg_postinst() {
-	einfo "You should add readahead-list to your runlevels:"
-	einfo "  rc-update add readahead-list-early boot"
-	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
-	einfo "for maximum performance gain."
-}
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r2.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r2.ebuild
deleted file mode 100644
index 80b37f7a964a..000000000000
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-4.3.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-)
-
-src_configure() {
-	econf --sbindir=/sbin
-}
-
-src_install() {
-	default
-
-	# init scripts
-	#cd "${S}/contrib/init/gentoo/"
-	newinitd "${FILESDIR}"/init.d-readahead-list readahead-list
-	newinitd "${FILESDIR}"/init.d-readahead-list-early readahead-list-early
-	newconfd "${FILESDIR}"/conf.d-readahead-list readahead-list
-
-	# default config
-	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
-	newins readahead.runlevel-default.list runlevel-default
-	newins readahead.runlevel-boot.list runlevel-boot
-	newins readahead._sbin_rc.list exec_sbin_rc
-
-	# docs
-	cd "${S}"
-	if use doc; then
-		docinto scripts
-		dodoc contrib/scripts/*
-	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{\} \;
-}
-
-pkg_postinst() {
-	einfo "You should add readahead-list to your runlevels:"
-	einfo "  rc-update add readahead-list-early boot"
-	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
-	einfo "for maximum performance gain."
-}
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
index b7033eeced8b..2c963c97fec9 100644
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
+++ b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
+HOMEPAGE="https://github.com/robbat2/readahead-list"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016.ebuild
deleted file mode 100644
index 1e7b7b64fb1d..000000000000
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit base
-
-DESCRIPTION="Preloads files into the page cache to accelerate program loading"
-HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-# I'm not entirely certain about this
-# need to check if other libc variants provide readahead(2)
-RDEPEND=""
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" )
-
-src_compile() {
-	econf --sbindir=/sbin || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# init scripts
-	cd "${S}/contrib/init/gentoo/"
-	newinitd init.d-readahead-list readahead-list
-	newinitd init.d-readahead-list-early readahead-list-early
-	newconfd conf.d-readahead-list readahead-list
-
-	# default config
-	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
-	newins readahead.runlevel-default.list runlevel-default
-	newins readahead.runlevel-boot.list runlevel-boot
-	newins readahead._sbin_rc.list exec_sbin_rc
-
-	# docs
-	cd "${S}"
-	dodoc README
-	if use doc; then
-		docinto scripts
-		dodoc contrib/scripts/*
-	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{} \;
-}
-
-pkg_postinst() {
-	einfo "You should add readahead-list to your runlevels:"
-	einfo "  rc-update add readahead-list-early boot"
-	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
-	einfo "for maximum performance gain."
-}
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index f5a78f940d3c..7643de095fe9 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -3,6 +3,9 @@ DIST e2fsprogs-1.41.3.tar.gz 4365234 BLAKE2B 44875ed5890d6f7a690efc5148edc39b454
 DIST linux-2.6.27.tar.bz2 50355835 BLAKE2B 7f3a20b510e1127894871e7eabad13fd8b26888110a6cf0b64348667299ba3f7a8018995b0ed41d3a7bc32e802e0db2093e35ae4f889022d04fc911952140e0f SHA512 fcafcea4148e15ffacb57e4eef731d8a2655bba15c6445a84f7345579bd6b6b9a68ad1a44a58f78e78a619efd84ce79c63ce3de3931ae7857af647a06ac052e2
 DIST s390-tools-1.23.1.tar.bz2 625295 BLAKE2B 657ca9394468605ed26b9e4eb24239971076cd741837913109745598c25ffc4fc024c22af376f1da4f3236da3df31da93ccfdd6766e61dc3c004153913b0abca SHA512 c1f0fe79cfcbf6217e1aba74172e7644eee25f8886b70885e8558ad48342d6b41b35cefd398c3f5ff430d382ea6103b93ed8f666f0038d4f5abc3c3bc787d0eb
 DIST s390-tools-1.36.1.tar.bz2 827505 BLAKE2B 5774062699331c6d5958fef44f6cbb048e05aecc190c2519a29dc9c43b0d0d000d8be8183a447eb81b7affbf236edc21105bfe6a689e23b2f519feea0700b9f0 SHA512 83b3456bce8af0d5e1f6a1b96335809a21b676b2371ca101e5f588a18e0de65b8e15a9a973a7dcc2cad800341ecf5997e8230a68b9670751cdf1d6f8d59be22c
+DIST s390-tools-2.2.0.tar.gz 1047199 BLAKE2B d23cfb277d341b4fe73ca92eba0a7bf49420d3303737d871979a93814d1c0cb53884a6fae78453fe69d4a8a8e35923fe9bf2433a412578f8d7696c9defd8570a SHA512 f029b92f18f95b49e189a4f5ad78c02ee629e630a93a8bbfe6966030fe8aaf069e86582d77213d68b447300b73317e4dbcb228df5ff0795a2785f6735087ceab
 EBUILD s390-tools-1.23.1.ebuild 1513 BLAKE2B 54188774b4956580d9a44c39012eeb9a0d56f8a729c9fc764a39383b33fdb61967943d728befcb97b74e89e133df8ebf224f4e53cd97376f82f3616c52ada1d7 SHA512 244e154909692e5c910925364da070800e18785a28785882299bc545ffab1c1a68de4328119e1d71ed616bd8ea8eef101d60dd6ac5934baa871fdbb624ffa796
-EBUILD s390-tools-1.36.1.ebuild 1232 BLAKE2B e0c56f28b374361770ea7f59553a50f222f54bf0ab56ba5af68647684ba6ba0687dfd822e3e5572e5f589b9e3e361cdc1f792dfece665b6d89610474eb0393d2 SHA512 4f640a57f79ca19c5734478bc97c0894bc73b7adf2938c14a3a33723fc8e5088ff9a0e38360ea103ecef6846e4826b9451a5974b0a75d5a7aaab160bc19226a2
+EBUILD s390-tools-1.36.1-r1.ebuild 1383 BLAKE2B 11ea38013015a94b1ed796276dc667423406cb56fbcc01afed2320ad004893ed6964f4acfb0d37d3dd93d456b156305c808be875720592f3aab526e84f7d47da SHA512 40b6b7e50f68f57e044b54b9b4425433aab715267f2652426b037452f94af6a3636da64628681469878962c1340cfc2c3851fe37104aea83410810cec58b498c
+EBUILD s390-tools-1.36.1.ebuild 1231 BLAKE2B df788b16365ddb10b105490ae3f1a08774d44641db5e843188ca3f8432a3225af5811d7399e607cdc4d5fd0424da088cdb40bbd54815d938c2b93debafb8330c SHA512 bbe4770cdb572b7d515a8eb0bb90820bbe6f1e72ddf73bbb96a12d60cb2cbfd0fd28ef6089707ae4a62f0d6fb7c6b3e5d990a4f66fdff58e1625ba0b869e237d
+EBUILD s390-tools-2.2.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
 MISC metadata.xml 795 BLAKE2B 27e39c453bd207d7cac8a38d5422735a0a581e7b72000452b98f406b00e2c2e7287abb2be992ada611f645b8f7a97c497d905278017b4862193475a34654c810 SHA512 23cd50f27b3b968621713e813ca1a822afccd90beb2f5641344ddc7abd2418d153d86309b690d0d1a84c51b47bc92e57a253a0bdeb34f22b5883a26035a53074
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild b/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild
new file mode 100644
index 000000000000..b77f1f4fe47d
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
+HOMEPAGE="http://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
+SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* s390"
+IUSE="fuse ncurses pfm snmp zlib"
+
+RDEPEND="fuse? ( sys-fs/fuse )
+	ncurses? ( sys-libs/ncurses:0= )
+	pfm? ( app-misc/pfm )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )
+	>=sys-apps/util-linux-2.30"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+src_configure() {
+	export MAKEOPTS+=" V=1"
+	export HAVE_DRACUT=0
+	export HAVE_FUSE=$(usex fuse 1 0)
+	export HAVE_NCURSES=$(usex ncurses 1 0)
+	export HAVE_SNMP=$(usex snmp 1 0)
+	export HAVE_PFM=$(usex pfm 1 0)
+	export HAVE_ZLIB=$(usex zlib 1 0)
+	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
+}
+
+src_compile() {
+	emake \
+		AR="${AR}" \
+		HOSTCC="${BUILD_CC}" \
+		CC="${CC}" LINK="${CC}" \
+		CXX="${CXX}" LINKXX="${CXX}" \
+		LD="${LD}" \
+		NM="${NM}" \
+		OBJCOPY="${OBJCOPY}"
+}
+
+src_install() {
+	default
+	udev_dorules etc/udev/rules.d/*.rules
+
+	# The chmem tool has moved to util-linux.
+	rm "${ED}"/usr/sbin/{ch,ls}mem "${ED}"/usr/share/man/man8/{ch,ls}mem.8* || die
+}
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
index 5d8da04de42c..51d00f78707b 100644
--- a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~s390"
+KEYWORDS="-* s390"
 IUSE="fuse ncurses pfm snmp zlib"
 
 RDEPEND="fuse? ( sys-fs/fuse )
diff --git a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
new file mode 100644
index 000000000000..72f09e63dfbe
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
+HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
+SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~s390"
+IUSE="fuse ncurses pfm snmp zlib"
+
+RDEPEND="fuse? ( sys-fs/fuse:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	pfm? ( app-misc/pfm )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+src_configure() {
+	export MAKEOPTS+=" V=1"
+	export HAVE_DRACUT=0
+	export HAVE_FUSE=$(usex fuse 1 0)
+	export HAVE_NCURSES=$(usex ncurses 1 0)
+	export HAVE_SNMP=$(usex snmp 1 0)
+	export HAVE_PFM=$(usex pfm 1 0)
+	export HAVE_ZLIB=$(usex zlib 1 0)
+	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
+}
+
+src_compile() {
+	emake \
+		AR="${AR}" \
+		HOSTCC="${BUILD_CC}" \
+		CC="${CC}" LINK="${CC}" \
+		CXX="${CXX}" LINKXX="${CXX}" \
+		LD="${LD}" \
+		NM="${NM}" \
+		OBJCOPY="${OBJCOPY}"
+}
+
+src_install() {
+	default
+	udev_dorules etc/udev/rules.d/*.rules
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 64603d229623..8791236d1160 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,6 +6,6 @@ AUX sandbox-2.11-symlinkat-renameat.patch 3418 BLAKE2B 4864dd5794abbf70d70f30949
 DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 EBUILD sandbox-2.10-r3.ebuild 2168 BLAKE2B fa95588691da010c6239e89a52e55f5d7b006276e269527319ef2628956f35719af65d918ef046fa6feb2a8c7d28531e49c218e0b26c3c41209138e114300fd6 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc
-EBUILD sandbox-2.10-r4.ebuild 2238 BLAKE2B 28ff4e0b5fa2b6fb47088ac943172ac49d9a217aa9c1136ebceddca81d86c6d3c6097098bc6a40f69d220f780c5fde02666bcbaea62bf22b1595f1f7351ab05d SHA512 b4a1f29d4af085b6c1dcae616ad32e321106626d07df836b6f1ace5dd374eca6a9ea098ca7f282d7bcec3ef416a01a395b75fe50658a73f41497fbdea9a76bb0
-EBUILD sandbox-2.12.ebuild 1950 BLAKE2B 931801781bc514826050efb1c57972ad7f92e2e020d852deed9264892f1f26e0946164474c4f5919d1e703304570b0283e765c190aca4e1010dabac3ccb51353 SHA512 f0d3e1707225171c280902e612a5109ed78703d4bcd658a827c61e48ffbbb71c3ed86d2a2ae00289d07e46b264b10fbf48a962cf8e35c4709046c9263a473da0
+EBUILD sandbox-2.10-r4.ebuild 2234 BLAKE2B 7ec0b2ea8c5aa220f6a99bbc7135b5f9ed0d57c119988d37a75a02b8f0797a68c6dd0ad1b90c45a69e7e941b61cbdac0705c53194dfdc61704155e0ae8675b2e SHA512 08ca4e1d4923b663483d097541020725a8f50efc36779519ccf591d4cedc55017d368b474da5b7d010cf15cc3814b5d31937e742b02a327bbb18b225d92cf78d
+EBUILD sandbox-2.12.ebuild 1949 BLAKE2B 72871c0b3ce7c45d1ea56a64ceaa020f668267eb43ae34bfa525b4f4db6aefe3a0fbee5afe72e6d330d54612d82171abd26c18f98beaaf6d14939bf5bbfa631f SHA512 7e85fd6df9846ba79513976d9de4c200ff6570255c79794c22b09dba4e0206e113bcbe885ced7b8c257d2fffc480f71ecf273d100e0b6e600dbaf28042d55142
 MISC metadata.xml 266 BLAKE2B f0eff1a6b8face69d2c99fb4c4426deb3800b2b0c4a009ead29e2c5898fa0650e8003c85961ba4c3303053ae9dd6707619d25d03a40e0919ff779c2f1f893316 SHA512 8dcc34d3a08407d6807bc5e30b23c6696dbfc63c19106338780d4e2a61be360e17faeb54af993c962f347ada5d24cb314de866506484b04de4c619d6a88787e3
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 4ced4cfb7790..4a5c4ddd52c6 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 6bea9b719117..0347d33d7d1d 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 6a10c9ac35cd..77bccda4b94a 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,5 +1,6 @@
+AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 EBUILD the_silver_searcher-2.0.0.ebuild 919 BLAKE2B 779ddb58c67006c8d8f70cc5d80e9061d7f22661d76e29b320d3fbe5b968865b56d3a0b61fe0ebd793823d6b6fcd80abc1aa488fd7f469c16da964e75830f85a SHA512 a8e46a1bea749feaa9f05560e89b7e88a0739a15f33391a1945f5232811703d71e1438ae68ed42e38208b92282fdb543f999edd756f2b0a7d993df8e7a7717ea
-EBUILD the_silver_searcher-2.1.0.ebuild 921 BLAKE2B c2956f22937b04a5383286a6c69c1078d0962d6a46cbae325eb53bb5dbfe74e1f243c11cf4917da3252a08e08d3c420db9ddab4cd0cca59e31b20439de706493 SHA512 93f159fe1c564b49c4bbb7ebfe7df4e4572a5219b3b091c71c6da671ca7000e4f49029eaad9918d928ab9bf877a3acbe22b89dae561d96046aa8ea14637728b6
+EBUILD the_silver_searcher-2.1.0.ebuild 984 BLAKE2B a43bdc7611c19136278e71dfa833f6e75fc2e49cee685bf6e8240157b39d2387880938524a1dc08cd4888ff7c4b2e8983d0e9d38af881bf94cbae5a37f93bb16 SHA512 83c2d295235764ca60430c6e05dcc584be6af4552691a6c87da1547f05422fc68093f6d8a0abb018202dc049921156b73ac3df09d4cb500accac60b5708fdc0d
 MISC metadata.xml 347 BLAKE2B cec1df10eb40daa911db4a3b082a3d1e5f67a63d4326092bc337a5b2300c89b41205db84a6daf54c72d6ff775166d385717039cee458076d4b483a8c0a5112fa SHA512 56848f01fba3974410effc1dbc30118c77bf97cf09fead70be94f7360dddb80d47005ebb3b3c7d5accb97b24db3a3f7735cf0f40d7af13dde58b78a4bef768b2
diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch
new file mode 100644
index 000000000000..21eb7118b204
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch
@@ -0,0 +1,491 @@
+From 24995eb239799e52ae09d47b7520d50a3b8b606c Mon Sep 17 00:00:00 2001
+From: Allen Wild <allenwild93@gmail.com>
+Date: Tue, 5 Sep 2017 19:48:49 -0400
+Subject: [PATCH] zfile: fix build when zlib and/or lzma are excluded
+
+Currently, zfile won't build if either zlib.h or lzma.h are missing
+
+  * Add several inline wrapper functions which check cookie->ctype and
+    call an inline zlib or lzma implementation function.
+    - This cleans up zfile_read at the expense of growing the file and
+      adding 2 layers of function calls. Everything is static and inline
+      so the compiler should be able to optimize sufficiently.
+  * Stub functions are #define'd for the unsupported compression method
+    (if applicable)
+  * Use an Automake conditional to only build zfile.c if either
+    zlib.h or lzma.h are available, define the symbol USE_FOPENCOOKIE if
+    this is the case and check it instead of HAVE_FOPENCOOKIE
+  * Replace tabs in zfile.c with spaces for consistency with the rest of
+    the codebase
+
+Fixes: #1147
+---
+ Makefile.am      |   6 +-
+ configure.ac     |   5 +
+ src/decompress.h |   2 +-
+ src/search.c     |   2 +-
+ src/zfile.c      | 301 ++++++++++++++++++++++++++++++++++++++++---------------
+ 5 files changed, 232 insertions(+), 84 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3931c3a7..4d85f54f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,9 +1,13 @@
+ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+ 
+ bin_PROGRAMS = ag
+-ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c src/zfile.c
++ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c
+ ag_LDADD = ${PCRE_LIBS} ${LZMA_LIBS} ${ZLIB_LIBS} $(PTHREAD_LIBS)
+ 
++if USE_FOPENCOOKIE
++ag_SOURCES += src/zfile.c src/zfile.h
++endif
++
+ dist_man_MANS = doc/ag.1
+ 
+ bashcompdir = $(pkgdatadir)/completions
+diff --git a/configure.ac b/configure.ac
+index 982cc3b2..5917ecc1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,6 +66,11 @@ AC_CHECK_MEMBER([struct dirent.d_namlen], [AC_DEFINE([HAVE_DIRENT_DNAMLEN], [],
+ 
+ AC_CHECK_FUNCS(fgetln fopencookie getline realpath strlcpy strndup vasprintf madvise posix_fadvise pthread_setaffinity_np pledge)
+ 
++# Only build zfile.c if we need it
++AM_CONDITIONAL([USE_FOPENCOOKIE], [(test "$ac_cv_func_fopencookie" = "yes") &&
++                                   (test "$ac_cv_header_zlib_h" = "yes" || test "$ac_cv_header_lzma_h" = "yes")])
++AM_COND_IF([USE_FOPENCOOKIE], [AC_DEFINE([USE_FOPENCOOKIE], [], [Use fopencookie streaming in zfile.c])])
++
+ AC_CONFIG_FILES([Makefile the_silver_searcher.spec])
+ AC_CONFIG_HEADERS([src/config.h])
+ 
+diff --git a/src/decompress.h b/src/decompress.h
+index 9c5592cf..d5c3d582 100644
+--- a/src/decompress.h
++++ b/src/decompress.h
+@@ -19,7 +19,7 @@ ag_compression_type is_zipped(const void *buf, const int buf_len);
+ 
+ void *decompress(const ag_compression_type zip_type, const void *buf, const int buf_len, const char *dir_full_path, int *new_buf_len);
+ 
+-#if HAVE_FOPENCOOKIE
++#ifdef USE_FOPENCOOKIE
+ FILE *decompress_open(int fd, const char *mode, ag_compression_type ctype);
+ #endif
+ 
+diff --git a/src/search.c b/src/search.c
+index 14e9d415..84d9423f 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -357,7 +357,7 @@ void search_file(const char *file_full_path) {
+     if (opts.search_zip_files) {
+         ag_compression_type zip_type = is_zipped(buf, f_len);
+         if (zip_type != AG_NO_COMPRESSION) {
+-#if HAVE_FOPENCOOKIE
++#ifdef USE_FOPENCOOKIE
+             log_debug("%s is a compressed file. stream searching", file_full_path);
+             fp = decompress_open(fd, "r", zip_type);
+             search_stream(fp, file_full_path);
+diff --git a/src/zfile.c b/src/zfile.c
+index e4b75662..74de37e6 100644
+--- a/src/zfile.c
++++ b/src/zfile.c
+@@ -33,10 +33,10 @@ typedef _off64_t off64_t;
+ 
+ #if HAVE_FOPENCOOKIE
+ 
+-#define min(a, b) ({				\
+-	__typeof (a) _a = (a);			\
+-	__typeof (b) _b = (b);			\
+-	_a < _b ? _a : _b; })
++#define min(a, b) ({                \
++    __typeof (a) _a = (a);          \
++    __typeof (b) _b = (b);          \
++    _a < _b ? _a : _b; })
+ 
+ static cookie_read_function_t zfile_read;
+ static cookie_seek_function_t zfile_seek;
+@@ -60,23 +60,217 @@ struct zfile {
+     ag_compression_type ctype;
+ 
+     union {
++#ifdef HAVE_ZLIB_H
+         z_stream gz;
++#endif
++#ifdef HAVE_LZMA_H
+         lzma_stream lzma;
++#endif
+     } stream;
+ 
+     uint8_t inbuf[32 * KB];
+     uint8_t outbuf[256 * KB];
+     bool eof;
++    bool eof_next;
+ };
+ 
+-#define CAVAIL_IN(c) ((c)->ctype == AG_GZIP ? (c)->stream.gz.avail_in : (c)->stream.lzma.avail_in)
+-#define CNEXT_OUT(c) ((c)->ctype == AG_GZIP ? (c)->stream.gz.next_out : (c)->stream.lzma.next_out)
++#ifdef HAVE_ZLIB_H
++/***************** zlib functions ********************************/
++static int zfile_zlib_cookie_init(struct zfile *cookie) {
++    int rc;
++
++    memset(&cookie->stream.gz, 0, sizeof(cookie->stream.gz));
++    rc = inflateInit2(&cookie->stream.gz, 32 + 15);
++    if (rc != Z_OK) {
++        log_err("Unable to initialize zlib: %s", zError(rc));
++        return EIO;
++    }
++    cookie->stream.gz.next_in = NULL;
++    cookie->stream.gz.avail_in = 0;
++    cookie->stream.gz.next_out = cookie->outbuf;
++    cookie->stream.gz.avail_out = sizeof cookie->outbuf;
++    return 0;
++}
++
++static inline size_t zfile_zlib_cavail_in(struct zfile *cookie) {
++    return (size_t)cookie->stream.gz.avail_in;
++}
++
++static inline uint8_t *zfile_zlib_cnext_out(struct zfile *cookie) {
++    return (uint8_t *)cookie->stream.gz.next_out;
++}
++
++static inline int zfile_zlib_is_stream_end(int ret) {
++    return ret == Z_STREAM_END;
++}
++
++static inline void zfile_zlib_set_next_in(struct zfile *cookie, size_t nb) {
++    cookie->stream.gz.avail_in = nb;
++    cookie->stream.gz.next_in = cookie->inbuf;
++}
++
++static inline void zfile_zlib_set_next_out(struct zfile *cookie) {
++    cookie->stream.gz.next_out = cookie->outbuf;
++    cookie->stream.gz.avail_out = sizeof(cookie->outbuf);
++}
++
++static inline int zfile_zlib_inflate(struct zfile *cookie) {
++    int ret = inflate(&cookie->stream.gz, Z_NO_FLUSH);
++    if (ret == Z_STREAM_END) {
++        cookie->eof_next = true;
++        return 0;
++    }
++    return ret == Z_OK ? 0 : -1;
++}
++
++#else
++/***************** zlib stubs ********************************/
++#define zfile_zlib_cookie_init(c) EINVAL
++#define zfile_zlib_cavail_in(c) 0
++#define zfile_zlib_cnext_out(c) 0
++#define zfile_zlib_is_stream_end(r) 1
++#define zfile_zlib_set_next_in(c, n) (void)0
++#define zfile_zlib_set_next_out(c) (void)0
++#define zfile_zlib_inflate(c) -1
++#endif
+ 
+-static int
+-zfile_cookie_init(struct zfile *cookie) {
+ #ifdef HAVE_LZMA_H
++/***************** lzma functions ********************************/
++static int zfile_lzma_cookie_init(struct zfile *cookie) {
+     lzma_ret lzrc;
++    cookie->stream.lzma = (lzma_stream)LZMA_STREAM_INIT;
++    lzrc = lzma_auto_decoder(&cookie->stream.lzma, -1, 0);
++    if (lzrc != LZMA_OK) {
++        log_err("Unable to initialize lzma_auto_decoder: %d", lzrc);
++        return EIO;
++    }
++    cookie->stream.lzma.next_in = NULL;
++    cookie->stream.lzma.avail_in = 0;
++    cookie->stream.lzma.next_out = cookie->outbuf;
++    cookie->stream.lzma.avail_out = sizeof(cookie->outbuf);
++    return 0;
++}
++
++static inline size_t zfile_lzma_cavail_in(struct zfile *cookie) {
++    return cookie->stream.lzma.avail_in;
++}
++
++static inline uint8_t *zfile_lzma_cnext_out(struct zfile *cookie) {
++    return cookie->stream.lzma.next_out;
++}
++
++static inline int zfile_lzma_is_stream_end(int ret) {
++    return (lzma_ret)ret == LZMA_STREAM_END;
++}
++
++static inline void zfile_lzma_set_next_in(struct zfile *cookie, size_t nb) {
++    cookie->stream.lzma.avail_in = nb;
++    cookie->stream.lzma.next_in = cookie->inbuf;
++}
++
++static inline void zfile_lzma_set_next_out(struct zfile *cookie) {
++    cookie->stream.lzma.next_out = cookie->outbuf;
++    cookie->stream.lzma.avail_out = sizeof(cookie->outbuf);
++}
++
++static inline int zfile_lzma_inflate(struct zfile *cookie) {
++    lzma_ret ret = lzma_code(&cookie->stream.lzma, LZMA_RUN);
++    if (ret == LZMA_STREAM_END) {
++        cookie->eof_next = true;
++        return 0;
++    }
++    return ret == LZMA_OK ? 0 : -1;
++}
++
++#else
++/***************** lzma stubs ********************************/
++#define zfile_lzma_cookie_init(c) EINVAL
++#define zfile_lzma_cavail_in(c) 0
++#define zfile_lzma_cnext_out(c) 0
++#define zfile_lzma_is_stream_end(r) 1
++#define zfile_lzma_set_next_in(c, n) (void)0
++#define zfile_lzma_set_next_out(c) (void)0
++#define zfile_lzma_inflate(c) -1
+ #endif
++
++static inline size_t zfile_cavail_in(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_cavail_in(cookie);
++            break;
++        case AG_XZ:
++            return zfile_lzma_cavail_in(cookie);
++            break;
++        default:
++            return 0;
++    }
++}
++
++static inline uint8_t *zfile_cnext_out(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_cnext_out(cookie);
++            break;
++        case AG_XZ:
++            return zfile_lzma_cnext_out(cookie);
++            break;
++        default:
++            return NULL;
++    }
++}
++
++static inline int zfile_is_stream_end(struct zfile *cookie, int ret) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_is_stream_end(ret);
++        case AG_XZ:
++            return zfile_lzma_is_stream_end(ret);
++        default:
++            return 1;
++    }
++}
++
++static inline void zfile_set_next_in(struct zfile *cookie, size_t nb) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            zfile_zlib_set_next_in(cookie, nb);
++            break;
++        case AG_XZ:
++            zfile_lzma_set_next_in(cookie, nb);
++            break;
++        default:
++            break;
++    }
++}
++
++static inline void zfile_set_next_out(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            zfile_zlib_set_next_out(cookie);
++            break;
++        case AG_XZ:
++            zfile_lzma_set_next_out(cookie);
++            break;
++        default:
++            break;
++    }
++}
++
++static inline int zfile_inflate(struct zfile *cookie) {
++    switch (cookie->ctype) {
++        case AG_GZIP:
++            return zfile_zlib_inflate(cookie);
++            break;
++        case AG_XZ:
++            return zfile_lzma_inflate(cookie);
++            break;
++        default:
++            return -1;
++    }
++}
++
++static int
++zfile_cookie_init(struct zfile *cookie) {
+     int rc;
+ 
+     assert(cookie->logic_offset == 0);
+@@ -85,39 +279,18 @@ zfile_cookie_init(struct zfile *cookie) {
+     cookie->actual_len = 0;
+ 
+     switch (cookie->ctype) {
+-#ifdef HAVE_ZLIB_H
+         case AG_GZIP:
+-            memset(&cookie->stream.gz, 0, sizeof cookie->stream.gz);
+-            rc = inflateInit2(&cookie->stream.gz, 32 + 15);
+-            if (rc != Z_OK) {
+-                log_err("Unable to initialize zlib: %s", zError(rc));
+-                return EIO;
+-            }
+-            cookie->stream.gz.next_in = NULL;
+-            cookie->stream.gz.avail_in = 0;
+-            cookie->stream.gz.next_out = cookie->outbuf;
+-            cookie->stream.gz.avail_out = sizeof cookie->outbuf;
++            rc = zfile_zlib_cookie_init(cookie);
+             break;
+-#endif
+-#ifdef HAVE_LZMA_H
+         case AG_XZ:
+-            cookie->stream.lzma = (lzma_stream)LZMA_STREAM_INIT;
+-            lzrc = lzma_auto_decoder(&cookie->stream.lzma, -1, 0);
+-            if (lzrc != LZMA_OK) {
+-                log_err("Unable to initialize lzma_auto_decoder: %d", lzrc);
+-                return EIO;
+-            }
+-            cookie->stream.lzma.next_in = NULL;
+-            cookie->stream.lzma.avail_in = 0;
+-            cookie->stream.lzma.next_out = cookie->outbuf;
+-            cookie->stream.lzma.avail_out = sizeof cookie->outbuf;
++            rc = zfile_lzma_cookie_init(cookie);
+             break;
+-#endif
+         default:
+             log_err("Unsupported compression type: %d", cookie->ctype);
+             return EINVAL;
+     }
+-
++    if (rc)
++        return rc;
+ 
+     cookie->outbuf_start = 0;
+     cookie->eof = false;
+@@ -165,10 +338,10 @@ decompress_open(int fd, const char *mode, ag_compression_type ctype) {
+         goto out;
+ 
+     /*
+-	 * No validation of compression type is done -- file is assumed to
+-	 * match input.  In Ag, the compression type is already detected, so
+-	 * that's ok.
+-	 */
++     * No validation of compression type is done -- file is assumed to
++     * match input.  In Ag, the compression type is already detected, so
++     * that's ok.
++     */
+     cookie = malloc(sizeof *cookie);
+     if (cookie == NULL) {
+         errno = ENOMEM;
+@@ -207,8 +380,6 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+     struct zfile *cookie = cookie_;
+     size_t nb, ignorebytes;
+     ssize_t total = 0;
+-    lzma_ret lzret;
+-    int ret;
+ 
+     assert(size <= SSIZE_MAX);
+ 
+@@ -218,9 +389,6 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+     if (cookie->eof)
+         return 0;
+ 
+-    ret = Z_OK;
+-    lzret = LZMA_OK;
+-
+     ignorebytes = cookie->logic_offset - cookie->decode_offset;
+     assert(ignorebytes == 0);
+ 
+@@ -228,9 +396,9 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+         size_t inflated;
+ 
+         /* Drain output buffer first */
+-        while (CNEXT_OUT(cookie) >
++        while (zfile_cnext_out(cookie) >
+                &cookie->outbuf[cookie->outbuf_start]) {
+-            size_t left = CNEXT_OUT(cookie) -
++            size_t left = zfile_cnext_out(cookie) -
+                           &cookie->outbuf[cookie->outbuf_start];
+             size_t ignoreskip = min(ignorebytes, left);
+             size_t toread;
+@@ -265,21 +433,13 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+         if (size == 0)
+             break;
+ 
+-        /*
+-		 * If we have not satisfied read, the output buffer must be
+-		 * empty.
+-		 */
+-        assert(cookie->stream.gz.next_out ==
+-               &cookie->outbuf[cookie->outbuf_start]);
+-
+-        if ((cookie->ctype == AG_XZ && lzret == LZMA_STREAM_END) ||
+-            (cookie->ctype == AG_GZIP && ret == Z_STREAM_END)) {
++        if (cookie->eof_next) {
+             cookie->eof = true;
+             break;
+         }
+ 
+         /* Read more input if empty */
+-        if (CAVAIL_IN(cookie) == 0) {
++        if (zfile_cavail_in(cookie) == 0) {
+             nb = fread(cookie->inbuf, 1, sizeof cookie->inbuf,
+                        cookie->in);
+             if (ferror(cookie->in)) {
+@@ -290,39 +450,18 @@ zfile_read(void *cookie_, char *buf, size_t size) {
+                 warn("truncated file");
+                 exit(1);
+             }
+-            if (cookie->ctype == AG_XZ) {
+-                cookie->stream.lzma.avail_in = nb;
+-                cookie->stream.lzma.next_in = cookie->inbuf;
+-            } else {
+-                cookie->stream.gz.avail_in = nb;
+-                cookie->stream.gz.next_in = cookie->inbuf;
+-            }
++            zfile_set_next_in(cookie, nb);
+         }
+ 
+         /* Reset stream state to beginning of output buffer */
+-        if (cookie->ctype == AG_XZ) {
+-            cookie->stream.lzma.next_out = cookie->outbuf;
+-            cookie->stream.lzma.avail_out = sizeof cookie->outbuf;
+-        } else {
+-            cookie->stream.gz.next_out = cookie->outbuf;
+-            cookie->stream.gz.avail_out = sizeof cookie->outbuf;
+-        }
++        zfile_set_next_out(cookie);
+         cookie->outbuf_start = 0;
+ 
+-        if (cookie->ctype == AG_GZIP) {
+-            ret = inflate(&cookie->stream.gz, Z_NO_FLUSH);
+-            if (ret != Z_OK && ret != Z_STREAM_END) {
+-                log_err("Found mem/data error while decompressing zlib stream: %s", zError(ret));
+-                return -1;
+-            }
+-        } else {
+-            lzret = lzma_code(&cookie->stream.lzma, LZMA_RUN);
+-            if (lzret != LZMA_OK && lzret != LZMA_STREAM_END) {
+-                log_err("Found mem/data error while decompressing xz/lzma stream: %d", lzret);
+-                return -1;
+-            }
++        if (zfile_inflate(cookie)) {
++            log_err("Found mem/data error while decompressing stream");
++            return -1;
+         }
+-        inflated = CNEXT_OUT(cookie) - &cookie->outbuf[0];
++        inflated = zfile_cnext_out(cookie) - &cookie->outbuf[0];
+         cookie->actual_len += inflated;
+     } while (!ferror(cookie->in) && size > 0);
+ 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 3f4a2aae03c0..94366537bd77 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 
 DOCS="README.md"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch )
+
 src_prepare() {
 	sed '/^dist_bashcomp/d' -i Makefile.am || die
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 46cf94d1cebb..d5e0ec3c9487 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,7 +6,7 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-EBUILD util-linux-2.30.2.ebuild 6077 BLAKE2B abd7234f5e2622b7a7d1489bd9f57fb3d33dce6556621cb8239ad8eb1260aafc4816cf878cbc5936893d50df263ff75073b79a49370ca9ef1b1dd9a8164c5332 SHA512 fdd4e1fdeef39a5cfdbe747a1e7bb2c35d4386efc8ed1264171156d85e00bc0465e9ec8b88a07e6cb7582659554ad98990f8bb728b581bfc41a3850121f1ce49
+EBUILD util-linux-2.30.2.ebuild 6073 BLAKE2B b6f3b9f6c73513e37f5971c3c995f523c086e8cfc33f18c032eea51d102cf2a67912b52ac7461f7407d50459709997972042c6249fbe3d38638de33686d97c9c SHA512 95efdfcee3b9e6dbae06024fd47bb3da4f316dfbc060f4e3e84f1ea227b1e316aa2e2141a2cf3c6ed4c627e2df6b104c1a6a6e45a4585fd22b527bc10a22367f
 EBUILD util-linux-2.31-r1.ebuild 6185 BLAKE2B 8aae4e20de31ab9161b78af51d8038a98f8ea4909277aa9a499b1aa47fe7c6821a965241a218d4ce166a462889c2e6375cda43e580922ac90ee805f196142ce6 SHA512 4bc749571b57a6720c7bbae2ca8b63d79ae8e2f46de686ff1978b35531d4945e1cab3afd61ec6b76718c31151e3838f06044e15b8bd7143c161a5f7860c74bca
 EBUILD util-linux-2.31.1.ebuild 6108 BLAKE2B 6c27812bdb0f88e254fb030dd85224788dd7f40704492d679fd11e26b50fbd7ea2b4ae8c85d960c79049f8e7254873326ca63bb40c2a3b78295bcd30264fff59 SHA512 6c98e8ef184d56fc383d9df07fac71763d106413ef053a158e993894ea25f1685eb57e0da94203afdd75868c15f184c9e307d5cfd5223ac3ec6c3a001b583466
 EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
index d5d2a35f984e..941bf4695f5c 100644
--- a/sys-apps/util-linux/util-linux-2.30.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 70fdc34d2106..5fec348fc8c9 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 6f2ad0e557a9..fe9db845f14a 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -10,6 +10,6 @@ DIST pambase-20150213.tar.xz 3480 BLAKE2B 7c59774bb8888fd2c4656264f1d8ea8cdd5fff
 EBUILD pambase-20101024-r2.ebuild 2872 BLAKE2B a91dfd6088cca6723fbf54b26ca57a3dd9384e11225ecb1eeb19019b1ce38ec28beecc46af859ec7571e96dbf693569043f385411efdd32f519b3b8641e239d8 SHA512 dae48108ff6a795c37206df6b21a1d67ff788881fc29df47e5e40bf1e2122d330e0d6a3117e87460066f28931d4ea17f54a9fbff2fb840cfa7af7f173db3ca8d
 EBUILD pambase-20120417-r3.ebuild 3493 BLAKE2B b99aebe17c021dea51820fc68eaa2a93ca24efad58cc1deb74a3c899246d1ecb7fab1b2bbc651483bec59cf2dfac32905ba7ad3c7f1d8ec248a9d395ef9c0072 SHA512 434ad0a1bbd1af08dc67a138b768c20d8ed3caae40dc206427d5e6496704ee874a85a727503ffd5319468a2adaf09247eb8872eff548231e1d3cd1df5a49eda1
 EBUILD pambase-20140313.ebuild 2727 BLAKE2B 18f5103496e3910bba1985bea7d49b46c9d4477b0901627638ecfa615ff0c178ce9ac01a30ebe2f776eecfd04d3dcc9c1948bcc1d04744c6207d153253a3cc2f SHA512 1b5185f2f8436d6c548186ca376d9f1aca1a9ea2f6adcdea4166706e9e6a2cb3ac963220d5dcd642b85b2b6b0bad1a28b9e2a095d17912becd725cf1916487bb
-EBUILD pambase-20150213-r1.ebuild 2923 BLAKE2B 75886c243a1e2518e43bd71c19ed76a2271b393c05b729dfdaad2e5f1658c1d447700fef833a6d7625c68b30cf028b4edd911f8861a05640f094bb06e8e8cf10 SHA512 4b09d69213d031f01e18b5624e62df6c6f18d9545f43afbafaeecc45a9e40a6ad293498bd959f34b36f86f9cdea31e7777edd43b65b63da93932d4d5639fbbc0
+EBUILD pambase-20150213-r1.ebuild 2919 BLAKE2B 72968c07ef6fded191ccacf473f64468cd359373bc9881775846da1ba269f3a74d568378e7e7eb33d593a5bd93642e8df15b2dd48b1ee68d56b6c6b6a04cfad0 SHA512 ba5e19b8fb61046211fe84610b8d842953aa79bb6ea647911683572a0ade81995739891afde8244abd63e28e8add0dbcc689c568790816c11d5c7c1191493c7b
 EBUILD pambase-20150213.ebuild 2850 BLAKE2B 475f9c8354c01dc2df8eb5c543273f869d030ba9358a9cd9307fefa376153211bb852f79103df5927af127311269ac220c6e0df65c18dabb7610252a7dce3668 SHA512 fb62cbaafba6033701462a664979c0eb1cff1e553966a21aa87d4b87a3c25ed93b8a3bd483caee23850f6528da8a82107ca0460d21ddaf920b630f6d6c213070
 MISC metadata.xml 4297 BLAKE2B 53d6b14f5e6cf707666441f1bef3c975d43f33387ceb482dd7c41e97b2771466a02efb3db1c881d354bcfff42010e1da47a28579972169e3c7edac33f43f565d SHA512 d717c2916e154630a756f7925794d43d43c5881bc9df53b82b35f86104366902a76f2d9298cf5a8511431084f0103fe91234c5e4172555677bbdc00db0a73a04
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index 612b2fec2efa..70909df20d85 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 178fbe6f1636..da6a722c15ad 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index 08f37a3eed86..b03f78571071 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -1,7 +1,7 @@
 AUX megacli-wrapper 102 BLAKE2B 15b4c1bcc7102e7c757527e4f8fbb30b4d6eb14773da3690450e010fedecc248b3ff9cfd7f3ad9751cce750de816df98b249ed8f32c9960ac5eef60424f3dede SHA512 b420a93bc930ca346cd76d54871929231d7a7d378c602523d291517c1861b925cb6226a27326559c13b572bc1f9494b6a0abba1526bc02141a8ba1d86f245ec7
 DIST 8-07-14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
-DIST 8.07.10_MegaCLI_Linux.zip 1543709 SHA256 631b58c1a51815c1c01db4d4d7b7b8c1099e3dff2c7ae6f1c2bf32a9aae6aca4 SHA512 ee83910dac54b653f5c33703555c51d37b33e1672c6de6473950ca21ff19518b7de921cfa07a50e1c7f26054c7075c6bc241b52f89757cc1e0e0f4251a07bcd7 WHIRLPOOL 5a045a113aee047b9d30f58029ba5c039c721f16d7e6ce0958de2273d0024e475bc1aeee786dfee95342f595fc13c050a7bb45a374851cc73dee60b335c276be
-DIST 8.07.14_MegaCLI.zip 7939395 SHA256 d9b152ae3dab76a334b9251702dba3311ceed91b58aaf52d916eb4ba1c2ab6e9 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3 WHIRLPOOL 6720e246590a89ca6914f38a87aea83fe78f3986cee931bc2b133185c686574b80cf298a805c0412de6fc8fdd4e14a56e70ea5591446a1547a15b5487af245ae
+DIST 8.07.10_MegaCLI_Linux.zip 1543709 BLAKE2B 6b42195d105faa5ce6469d6a36c37a1d84b9a814bbc0e85ba45d8d29914232868db40fef0572c281a2716041e98222923547d7c7f25a71217bd4468ac3031fbd SHA512 ee83910dac54b653f5c33703555c51d37b33e1672c6de6473950ca21ff19518b7de921cfa07a50e1c7f26054c7075c6bc241b52f89757cc1e0e0f4251a07bcd7
+DIST 8.07.14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
 EBUILD megacli-8.07.10.ebuild 2079 BLAKE2B 253392be248923c44d2976bf20613371fb62abe288aad803dc95ae66c0b91dd92f91d50524ee96d50e27fe571fdf2c817b30f729f948ecd154e478dd950ae435 SHA512 bd78ba3d2884a1b34f41decadba4dbfb1c987801f3195adafe6e4c79617987a608d63a6873fb799a58b12a326f4bc237583b56e4855c1a53e6c0b62d95d97d20
 EBUILD megacli-8.07.14-r1.ebuild 2501 BLAKE2B 0cecafa358d4cfe2e158549b345e4e22d35a9efa2c478aade8ad88e080153f910532088cce1584a588b43167391bad6a14ee6be6160207b8612004cc4f9b21c7 SHA512 f45b645ddd611917337688277c917c92032c81607d0a0bdeb8c197b4b1ed53403af1eb49d8b0ef72487311a0b5c641b53043ae1cca8e277bb42e9e8bd6b474a5
 EBUILD megacli-8.07.14.ebuild 2039 BLAKE2B a4e3718f206ee882cdcf2bbd24d9bc73963d18639cbef4345e2f6f6f36cb7df98c71ecfef008aca89e3ed1d7fdb476fc214f7efe7d8370591b2e6bac9161ebf2 SHA512 eb008a26eeba00b43230842c6e7a992a3d9237b09578d63ab012985349598346220655be44a80f7f901ca5241ea5732e4bd0c648153c21b55179f31e607d0a4f
diff --git a/sys-block/sas3ircu/Manifest b/sys-block/sas3ircu/Manifest
index 07184492d706..a5471dab7ce3 100644
--- a/sys-block/sas3ircu/Manifest
+++ b/sys-block/sas3ircu/Manifest
@@ -1,8 +1,8 @@
-DIST SAS3IRCU_P14.zip 6536687 SHA256 9766821f41fce1f2181383537172e52f93e4e0d0bfcf1815289e940410132ec1 SHA512 50125edf382b12aec88c83b6a11e94f766d0ecd94247e0f5e16f6dc3571c34e21ccfedf15563b41bc48983d881a216a2291fad66353370bc076f4f513863a288 WHIRLPOOL 226b28904d2288dd28380caf496ed96b01945aec8e928c9b66749c0f215bcf7c1f9006dd3274f117a2e653658089ce33e55d1dff044b499b78b824257bed216f
-DIST SAS3IRCU_P15.zip 6577897 SHA256 0fafdccbaa2809ed70b30e1715a7eaffeda5bcbd71781516271eae38d9b85e69 SHA512 d2020a4148a04109c82025dd99401d9c110201a294a4c03aca32483e8d54d179c2104fd12e427c577652b257ec9dbe9ea54089929bc35b5fd9cf1a166d6902c1 WHIRLPOOL 32a55558668abc64fdd9516464d0e4f71891a204e21a6789b78313cb6cf884f96fe8acaa9892a6d6a17d464b7c720fceffbc0bd79fb2be70da721b1817447045
-DIST SAS3IRCU_P5.zip 2655605 SHA256 8a05cefa544063c61a5eddd8030e48375545a74e0480c735ad5ed76a99c04d28 SHA512 233ec5ea8e32123652382a9072831fa35f496ce0755d8fd7113139f43e57837053e00eb7cae5f5273177510444f384fc6f08f7278232fe3d6601771ee214d9dc WHIRLPOOL 643f935d5b1162e91df6af820bf4b70930974630a89cb772cb003e3e30b98a50ca7c9c9c63a309eab5fdf4bd759cc7c11bf4bf925c10edbdd6fa92a600f61d5f
-DIST SAS3IRCU_UG.pdf 690245 SHA256 0920984018e0873d65c0587c1ee436d3e72e6de3558730d61c33b53f4fad64b4 SHA512 9e7a47f32bd19b708b1eedd63d7d7112a17c8da952b74630196dc2891cd14f758394dcc14b8be05666e6133a3bb10e77784bd62749fe4b1e2d7f7c71ae26fe2b WHIRLPOOL ef0f2dd0c5d807bd0f82ac56fcfec23d2c16b15a7567dc7a29d0c15b076d4b1f0aa160fe2d1c9cc679579eb41e51ab7b6639f1e35c3a5124ebf088536ba7d8df
-DIST SAS3_IR_UG.pdf 714573 SHA256 29f3c564e1a314807fa9ee8fc35fc1091f207f42526bc1836caf62a17c9f653f SHA512 4db16dedcadc3daf853e62531ac620af4a3e41d001b58fcd333692f9121d1ca3ec8b9de0113693506b31da714b9368ff55addb0398f2f843e4a6a1bf3d665433 WHIRLPOOL f5e155d393c08d3dc45eb8f5e83367356de96fab2ea2e5f274ead05af1024947eba5c23817f20fd97cc1af92e4dc5afdfce3cf6c6dff3fa0c84985377522ddf0
+DIST SAS3IRCU_P14.zip 6536687 BLAKE2B c8f5fbf9e92aa752baf173f23536e90920dbce94813ad4408a38a616ee4c0ab1fac302ca8ae324b5052813e2e1f025704b80a7f098176aa614f381017779cfd6 SHA512 50125edf382b12aec88c83b6a11e94f766d0ecd94247e0f5e16f6dc3571c34e21ccfedf15563b41bc48983d881a216a2291fad66353370bc076f4f513863a288
+DIST SAS3IRCU_P15.zip 6577897 BLAKE2B 8bb7a9deefee875f88f4ac7ac8432e9e5d7ac0122454a009b2946ba82ef48d6ffb1582ecc438a0fcda928780999c221c1475640d0a9b28be5fedbf3c4be8aba8 SHA512 d2020a4148a04109c82025dd99401d9c110201a294a4c03aca32483e8d54d179c2104fd12e427c577652b257ec9dbe9ea54089929bc35b5fd9cf1a166d6902c1
+DIST SAS3IRCU_P5.zip 2655605 BLAKE2B 78b7b3555d725166bad03b6619e890c025901fd41be80ac7657945acf9429fa05b91881fe98dd76061c676a373c95079c429196ba73b24407ccfae7f11f48a41 SHA512 233ec5ea8e32123652382a9072831fa35f496ce0755d8fd7113139f43e57837053e00eb7cae5f5273177510444f384fc6f08f7278232fe3d6601771ee214d9dc
+DIST SAS3IRCU_UG.pdf 690245 BLAKE2B 781ec32443eaa99dc0c7d30739ecde21deb62e013b6c08d617cd46567d3905913711a36cd26eccf6e260fda9ed1ec4c0aaffee4a434224ca864379519967debb SHA512 9e7a47f32bd19b708b1eedd63d7d7112a17c8da952b74630196dc2891cd14f758394dcc14b8be05666e6133a3bb10e77784bd62749fe4b1e2d7f7c71ae26fe2b
+DIST SAS3_IR_UG.pdf 714573 BLAKE2B 09a3a47abf6118343f023f4cdf85ab2f5f583f806e305dafa6397d1099fc01ecc33b331afd10d63ac8bb75a365d09c931c19fc673fa707b5171feb23d64f97bf SHA512 4db16dedcadc3daf853e62531ac620af4a3e41d001b58fcd333692f9121d1ca3ec8b9de0113693506b31da714b9368ff55addb0398f2f843e4a6a1bf3d665433
 EBUILD sas3ircu-14.ebuild 2234 BLAKE2B bb8a46577f80ad5b2b280d917cca37fb6ba29cb4e841b6ffb5b051972092cabce57010f311abe2f186cd2f22f63f72f5e8cf6e069c835a7e25776acd1b321b11 SHA512 2c77b9bd219e3ba428a3c9ef766040acc76dcf2cd989a7483d48608a2a83eb79c546af0834f577f348274d73a3dff69a2585444de8090dee978b9beab7457a58
 EBUILD sas3ircu-15.ebuild 2389 BLAKE2B 366925261aafc815d1bae3b629ebecb068ab1fac62fc49f8b8fd61f3851d5fea71c40a81dc845bce5b7a502ae6c20bb57dc8e6be6c0984dc39ec1af8399149bc SHA512 ffcd1d835673e0290d2178e7a93fcc897cb6ce0bc628b05088bffb6e80774b6b85d815467f4593517a80492f6532221de41985daf63d0b1cf73af2b84845bb12
 EBUILD sas3ircu-5.ebuild 2332 BLAKE2B 5fe1271ce9cbc799ab58935408bd18129cfbaa5f4925799d2e97e59cb4c125a2c98b951a1b11d0af117aec70e62755ce0e427812244b04f1dd3891e347d9d45d SHA512 e7fd27e91da910847d5478e2412b9bf332ea2b4ba5e0523f3253a724f1136e4743636056dc38a74f147dd416d08770c6cd95c1c4c5ec1aed72901e1d74a18258
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 221aedbb8bd5..d07552fcc9cb 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index eb49409d1aff..e6329697e2df 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,19 +1,13 @@
 AUX heat.initd 1349 BLAKE2B ebd912b20b9e78a92b30fe42f0617b1aa1f5d4bbf24b0684d0d15214a5ac66aa0b6fe8980057def7a9702c60af026c0b021c753bc3e84ffce461a23c9f86abdb SHA512 a2a2f45bb4268260ca88d7cb5c2df1e9d27041bf36fa59aadc7e39d85b79aad6992c70a3e8f9d580a493801c75299ab99191df23624ad70139f30758d8027492
 AUX heat.initd-2 463 BLAKE2B e9a795bbe1e8b5059f0169d6b04bb087f20af75beb31583b1157bf76e4ea7f3e94d026b193aa6b4b39be3bf997519478a0678f628fe39a8ede87a5129d456ed2 SHA512 8f92853d6bb21e6efae3a59bc2856bd496498297e43a5aa0350a3202e8a709cfd0791f77017b77d8b7845c3cf0d2b266273026c9cac869e3dbc749e36bf83c7c
-DIST heat-8.0.5.tar.gz 2309642 BLAKE2B 77e574368268fa1fc3c639266a4fba6c71901e7b5e4f50cf8e4fc5ec5f809fc5599345b4b8ff0d66969381d6ea17fc92a2e7002c083aabf8e45ca0289dc74012 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad
 DIST heat-8.0.6.tar.gz 2312653 BLAKE2B fe48fc6df05be1f41b2b8e1a3f42291573627a812e2deda02cd8ad3ed9fd49c566a44dbb6565843a3371878e79a6052d887d4b6cb29fa423397dec15ef4d62c8 SHA512 221c29aed02feb02d2d28e9fc754e859962e385e20a6796e90659e3c6e661f08c3f243031b7257635329b0119ca8fc890ab827fed9adfd9bbdf1557649dd108f
-DIST heat-9.0.1.tar.gz 2356475 BLAKE2B 1af0565b9462b095a9c9c2c7a20350c049eac6cd07b623c575118d339ec7d918bb7455530e99057615287f09e594d657cf72d429e89b1366c0391ccfbafe9d07 SHA512 93c813bf9b7948ab5d1d261ae67cb942e35ee2cec37f8e3bfc534659725cc4aff97c731e230c1acff9308451cba64295ea47b1aae3df4b392834faf42397c0f1
 DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
 DIST heat.conf.sample-2017.1.9999 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
-DIST heat.conf.sample-8.0.5 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
 DIST heat.conf.sample-8.0.6 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
-DIST heat.conf.sample-9.0.1 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 EBUILD heat-2017.1.9999.ebuild 5666 BLAKE2B e2ea89d7d4fb2c0858e168fbd38b039f36c95e63b1a61d48f5a71fe7be4d99f1fb0bd9c740d23671fac817f23b6a2c6786a6fef459fe0d5e753317f6f77d0c7a SHA512 3b99e7e4b8fa48d17e72b2e404c818da31ba668f63d76f4404ff42a6862f0918e4b9ac91fdc95977dda98c931ebd893cadba35553dcb437f563b75905b6ce058
 EBUILD heat-2017.2.9999.ebuild 6456 BLAKE2B eb38ccd3039c3c51a14a0e1450196610636e0c19f7938c8073c86b3ed947a8610b68e33d0654bbe882c4a6b12366ad7b1dc3346aaa1e22508730c4fabc196125 SHA512 5f57c8610494a03382c9f2e60716eb221b26e39f56354637960bfc2166437e0d217297911460c8d34a60b5f2dc00e2aa00d10f8b17d0d025c7d5341510e53a7f
-EBUILD heat-8.0.5.ebuild 5644 BLAKE2B 27ff33441c17fa00cb5b66d2d86f063424515b85d00b5149c057dd58666ed719ffff3580c1261421ec0a5f2d24ba2ee181535000e4a283f787a23d3482b7f292 SHA512 7cf53cd26567282869ce2aaf1b045cd30c16af63fe484fd238cae512ce8c8a04018d76d5fd7cb828a690d9d24526cdc5b259e7b3b0a4e786b090c41b290269cb
-EBUILD heat-8.0.6.ebuild 5646 BLAKE2B 3db8d7eef7ae99fdffe1a00c53ce954e65d134b6e04bf322d58cdb6729ce3ba124b3118f6e500149fe6fc191b6969e70e6529a01d5306c2c2e1a5b42aea9f38a SHA512 de3bdebe67dc127a7684cdf688b3625652d9c67ea0eaca1a301ebe67a43cda16c9289faa717b8aa8d737bb7580122efbf17d124b5496903b9caeac8f6f623bd5
-EBUILD heat-9.0.1.ebuild 6374 BLAKE2B f868ee02ab236c943e0cff4afe5325c1ec01a838847058017664267e8b722de028a14f3d8e0050e9dbfa96da6134ce3b7f2744c47d096c7ebb6acdd7acd09ce0 SHA512 00e5580c0cb6a14301029cfd6b34d244042e9a9d038a35b84137b0436de23a7031b586c521d24a5126a73bc8e3ef5bdcee26050377c473c488eda72476863ae7
-EBUILD heat-9.0.2.ebuild 6376 BLAKE2B ecc4441faec1162d7f4b6303e43eb3a950225f857a68d913f04b241ba7d6886f5b4029cdf34c43cddb051c91872f7a0e16b8b6a69dc543f2428e2798858f07fc SHA512 94501769b5d8300e052126f1a818d236d76dbf9be9819c9b329f1fcb9b3d30c3814e93230a0fb0022434d050fd5ee45aa8c1f7afa5db959ea654e2990f172816
+EBUILD heat-8.0.6.ebuild 5644 BLAKE2B 0e58731d3815d94140cbfd98962694befd0b8a6a48971a4d3670825a95394e7a5fa389bd8ddaa251f263568105dd40162e12ad2014e02dc69a7a08939641a5ef SHA512 92ef6c6188e0b6d8a3e643076801db4f8182cc7206355b148462a0bfe6028af86560d8af8740865721e8cb2d5c49f20895d10e5977f07867c43d8f68f33de314
+EBUILD heat-9.0.2.ebuild 6374 BLAKE2B 46140a92469b75b5c04d91541894bb26a1d467b2fc5ea315f67493a8f359e9c1ef441d7e71599aca904d011f59da732f1f8d1a6efaeec5a0c19460e5ef4d81a6 SHA512 51865ad11d08e6c3a4142bf24c31160bc172c9f3399b6d6f78c638e7d72231945f94b486feb431a356dad55d1e6e029fa14d182ae9bd1d1c665727b7fb6d6da8
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-8.0.5.ebuild b/sys-cluster/heat/heat-8.0.5.ebuild
deleted file mode 100644
index 450961936893..000000000000
--- a/sys-cluster/heat/heat-8.0.5.ebuild
+++ /dev/null
@@ -1,148 +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} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[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.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-8.0.6.ebuild b/sys-cluster/heat/heat-8.0.6.ebuild
index ea586ee6ec43..05a523589651 100644
--- a/sys-cluster/heat/heat-8.0.6.ebuild
+++ b/sys-cluster/heat/heat-8.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/heat/heat-9.0.1.ebuild b/sys-cluster/heat/heat-9.0.1.ebuild
deleted file mode 100644
index 782daec4a31b..000000000000
--- a/sys-cluster/heat/heat-9.0.1.ebuild
+++ /dev/null
@@ -1,161 +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} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.17[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd-2" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-9.0.2.ebuild b/sys-cluster/heat/heat-9.0.2.ebuild
index 82f683093c85..fe3f15b0382f 100644
--- a/sys-cluster/heat/heat-9.0.2.ebuild
+++ b/sys-cluster/heat/heat-9.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sa
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 36da3d64c679..545080a15881 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,9 +2,11 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
+DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 EBUILD kube-scheduler-1.8.5.ebuild 1304 BLAKE2B f20d59da590a4ddf2f6b5e870bfba2e0efa6c494becf281e471572e16f3bf4a8f426da4f9b5812db53fdecea4b2839f41ee47e43e5e73f60bed3147cc91aa151 SHA512 83e1990377b2d5ba3b7dfb8550e6ea74cbdaa8c13095d4a3ac1d5abe3c26506b1a63f5fae9a477da84a1bbe297fef1baf58d0200a80582a0da85040cb46ea9ac
+EBUILD kube-scheduler-1.8.6.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
 EBUILD kube-scheduler-1.9.0.ebuild 1223 BLAKE2B b9b7508abb2e5f1ddd11d82baa5afa40bb6004a7313ccae96cc40457d0ba4f2eb8b67fc08cf78c83bcfc62313fb6ce7e9d7a256c7fee2a43772be1e5ad02bef7 SHA512 e7ae7c36eae73cc67356a6b5c8e5a2177311247b184f88f7259acf855381d35638f4745911cb742ac2222aef6bf79cf7df37ff5323fd895d69d86f86fe90f6bb
 EBUILD kube-scheduler-1.9.1.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.8.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.6.ebuild
new file mode 100644
index 000000000000..739becc5ded7
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.8.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 23996b77eb4b..0b482b1ded0b 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index d7c8b13f51ba..80bce6c14a85 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -10,7 +10,7 @@ DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d17
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 EBUILD autoconf-2.13.ebuild 1521 BLAKE2B 745ce1ba4d39b75cf89ed701bbf102092854922f1dc0be421326c0f3a95f2a32aa69dae8ca4ac0e7b0e738f0e4c0553126636674571376df8870d77afa5e1998 SHA512 493ba0d22c90ed02e77e2406f76bc6e2cc6c9c56e824ca8c7ce73a2e3e265868de5824ed9b0261f457903ca12068e24ea55c77e2709f9d28366fc25c9ac13091
 EBUILD autoconf-2.64.ebuild 566 BLAKE2B a0488603af961a72257e96959d28ff6fb552de3b19a9773a8af845f8a0c5e0f54ee5f93c40192d3c3409b7d16489cd4ae5aaad8925404962fc0c4d9fe0357bed SHA512 9449a2616671cac6a34f632c965a0bb59f38d0c0694b4412e547769d5f957b7ab82cef995c77641814c7c6e0682df3f3b754cd48252f44e38ba71e7d72fc448f
-EBUILD autoconf-2.69-r4.ebuild 1557 BLAKE2B 259e3adcf47a32ab2d8e3352ebb7924664c2339f2d9c3d0ce3ebcf16542f2c8aa98436f94128c769bddaffff1a561f27b8ddc853748aea51b4f813d801801f1a SHA512 2fb1eec5a9428452591d99be92a484290db36997e664ba2cad90773aeadfb3847ac0a0a1781e02dfd70afe0619dde3ce9528b53ccea34f52490e24961eda5752
+EBUILD autoconf-2.69-r4.ebuild 1553 BLAKE2B 82579d50bca35fb8006d9868a3b8adf274fdc751c59f0a2ab82b3bc231a2272dc84b8bc2bbc104f0c8ef54c4bd11c1678f55235c280429e1396a1d41c546e939 SHA512 880dbb0f56b07d53d2e73309054d99739ce36866e1b2208df5e1eced9cc77e756157a4f96852795da17a802c32fe8c5f24635fff951e7f020c736d21a1a124c5
 EBUILD autoconf-2.69.ebuild 1517 BLAKE2B 0ffa84941b0f394404b767506cc3a0efedbc19e6b50e8cd3386ebbb75ae657e3c828791f72c01e95982670ab1783c4be301f7562884b93c1eca6c8d5065b912c SHA512 9ac5e366d81466493aa7e8202bc688670e219071b8bcf0801dec14df0c2977bd3520a95cd343b9658ae7327a4e09b5b9fe4e5c5f9faa4982260b83c1e4368cd4
 EBUILD autoconf-9999.ebuild 1361 BLAKE2B 70f04f869ac9481058e94197b617498fc5551ba3358a7f418d4fe2dd87a2263f47eeb431a2422e872a2e4d7fed903933a8914bfc19ba2e372e6a7b2285854a1b SHA512 cbd6d7f64866419b258c7f711eff2dff2f1dbb11847d80d2d7dfa3cadc11c37ec457e9e351ca56dadbeb73b0466e81d24efae4121a02751abdbf63c7595cbce2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index aa826be6365f..de76549b8181 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 9c1a8b5043d2..93ffa0cc5d57 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -46,7 +46,7 @@ EBUILD automake-1.12.6-r1.ebuild 2206 BLAKE2B c7c04722fbe9879d9c770e1515788f7e53
 EBUILD automake-1.12.6.ebuild 2136 BLAKE2B 28a7ba299808909bc488d8d83d64b9cbed4f1bf183539fc89357793dbabb5eb9b1f3ebc3218de8e575a08172c2cc69c7bee85a308f06a23d99fa9316bcf7d66a SHA512 93f0abd1cfcb93328a3473cd4300563fe05d0de1c9e6a700a39e69a5d531566065c9477920cccbd63b0435308bb98109d7f93f345e2ff6eea5f1aeba524df535
 EBUILD automake-1.13.4-r1.ebuild 2433 BLAKE2B a52a44d9257dedf75f2e70c4807056feb3ae42410738d30a4c9b87ab579ac8765c7844415be141e5a6d6ce0eee5467241c8ffdbf9fb33057ab533e11bee6caa5 SHA512 7819b9a8cb190a2dccfc1ed25d8a7afb52e79e5584035164133436603faa8e108cc30169ac7aeee8a54da21f9beef6a31e8eb4de85eb7b2586c1c2a7c00c3dc4
 EBUILD automake-1.14.1-r1.ebuild 2745 BLAKE2B 38575acbb0fee6557c192e8f2c523220a296d305d67cde01bc86e512124f48dde1bc7a16439df88205a0b59afd90ff57aeb4d7f94d130c27907e1cc70879502f SHA512 6fad77ae5acbbabfce37555d2f46739012708b135e7f4e8ad9ed326b087bd9ffe6f3878a1f6abd3253a49a24dfc849ef3d43ab20d413fab63f65391f93c3b3f3
-EBUILD automake-1.15.1-r1.ebuild 2926 BLAKE2B 736c81847d36c28d8103841f2ed609f9f37b7cd17e8ec15ea988708231e28efb99030e65dd035ec1d3daac5ad8e79d1fe2438296870e2005fd3c9601d13b47c5 SHA512 a3a570cb1e5d872171803dc4992ee6636e4608e370122d983f2b4e981f5d40b441ed1d34729854561efc8680de319d31f82f1c9dfe2a89eb6a7356149cc9ee66
+EBUILD automake-1.15.1-r1.ebuild 2922 BLAKE2B 888f95f905b6c0541d9c5d00f0329d5265c5d5c76c7ca8663c039d915a56a7c668a0902f03f97489f22c86db62b7834788de72131a63dfed81f5a1d0a4b04580 SHA512 554c2dfccad576f79fccba21948a9e015577404a402e103fc78a53e74aeec2b38bfc608efcede564ac48b6d45816bef6a41cb377643545a8e6013654966f27d5
 EBUILD automake-1.4_p6-r2.ebuild 2493 BLAKE2B 8b23e17f23f54dc17a91e54260d28a667ea2f12653d0b5eee320b5058a36019c00ac55c246d36951e437bae5b6faecd31002d74035ee5890425d02b35e95ae02 SHA512 7077f282076cb741cd54080654ab2098f6a4fe55536147c5c4c7a807e0e1b63179cac9aadb4220f92ae601455a4f231c045b6b85faa4c044408d4b0ba0563407
 EBUILD automake-1.5-r2.ebuild 2311 BLAKE2B 2138e2aeee91fee2f7a1ff7b35ea57e128117ffcddaac5b8b36309243aec0d116695a4df6463bdd4b6eade1fa460aa1a3d2a047d453de96d919b67ca5a94917f SHA512 68c46578ba7f8c7b81ab0bb723115f8f336cba2b7af6d7a5dc3726de34fe4dfbd810cb976363983b0737716ec46514b92c83666cbae0e0bb34590950c9bb9060
 EBUILD automake-1.6.3-r2.ebuild 2059 BLAKE2B d377b1b11491b20b208f1afde99309c80c3e892518b3b30ad8ba20e66a0ec3bd4ea8880376b651c9171e9e7e95f93f5e5368eb199e98b3742fdadb2709858987 SHA512 588753996cf13aa49b251fb55cfe9bacd9015474ff4824a988bbe38ea0826e05cb3e6079264d47bc64460e1cd44bcfc5a233af7cd769a6476fce29f4bdc2d4f0
diff --git a/sys-devel/automake/automake-1.15.1-r1.ebuild b/sys-devel/automake/automake-1.15.1-r1.ebuild
index 9c72a5654c20..0e92910b4dda 100644
--- a/sys-devel/automake/automake-1.15.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 59549a0366a7..e58236975647 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -56,16 +56,16 @@ DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44
 DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
 DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
 DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
-DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
+DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
-DIST gcc-5.4.0-patches-1.7.tar.bz2 32316 BLAKE2B e913960ae76931acdd93aaf4414b4da1d4d043854548f865f07b8f3df968e9c87783965e3aff2e89468f9433185029d66c2e2e719b492d747fa280861cbb0cd8 SHA512 a9da763a19a616a70324721013cb6f1749deb20a5d1994273683ea43436f09a97b5e9898b0f605354d5c0310e23a8a7b8c8ccd28631cefc240cebf969f18657e
+DIST gcc-5.4.0-patches-1.8.tar.bz2 32886 BLAKE2B 85879ba552ff21e198de568b2a1f2544d6cf542174af3ca571e41a504373bbc8912a87177a413883f194d909237eeeaf65366e6b93c2b917f803b3edd10bbff5 SHA512 10c1102a37d9d485665cca606318a1da6eec2188998d340b91a371c9defa6fae285619f9cadad2546de0b7f1068e9eaf653714462d3331db3197308799927a6b
 DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 BLAKE2B 6f3de9be0990a7580785821d8c85114a1907571c06bdf3a15ad91258f7c9e8bb6a4d2ddb8615f33bedf0ad036d215507e004fc095f788e40c824ae0ab3ffbb05 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0
 DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 BLAKE2B fa436d1c1d9c150714092132f816740f8218dfeb4f9a6a8c830ea54d211a020f209e6fd1fcc313b2560b82c7855120053d346af72b7c12c88a7a948379dd2356 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3
 DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
 DIST gcc-6.4.0-patches-1.1.tar.bz2 10762 BLAKE2B 13ea709b6816adb52d7d82540b55eaea87e9790b88556cba1065a28078f071a4287fad598c7b677f429fb1463ca20a0d05a6884bae0be2e0026c5e998573a35b SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e
-DIST gcc-6.4.0-patches-1.2.tar.bz2 13039 BLAKE2B 1616ea3bf164111febed28de5f388c65080b27c802a98aed7d40d694678878df4db7849ca3d7df2db857545e1834db238c3dd64daf13fc4010437256f4a02c72 SHA512 b91e990492e4f17e5a5b18d7cb37f9fe205d7cb2674c61857ab6b517650fa4a1a41c171bbd2f76c901e3bd00821a2540caf2c9989c9e1d4fa163d8d9c854f88a
+DIST gcc-6.4.0-patches-1.3.tar.bz2 13617 BLAKE2B 6bfb1d70397e6ca4359e5d190e36003c18c7a03a9be4f923461dcff11307601e6b3502a2e289585b53baeb919008d83c29ad24078f814aed9b331140e4687419 SHA512 91be7c8db0004cdd150fec0f8daa709374753d2f524c58087dcf45b6696dbd609972297e866f971fba1aa679464cf96a384dd111e104183c0939ab69add017b2
 DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 BLAKE2B 29ed4ff1ce6412a0c1a88f613377883ef5d391e7f681989295ac84dbb1950d99a17472d8b95a9351970ee5837cc3bfc4711101042c0e792c0bac3327bfa24d2e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
@@ -84,10 +84,10 @@ EBUILD gcc-4.5.4.ebuild 687 BLAKE2B 0cb42fa794ab8b1e4dc8075bddc288f888e6f79ee6d9
 EBUILD gcc-4.6.4.ebuild 768 BLAKE2B 9f38ecd86d75d9040e3674e4f33cc71e070c43d33a984b24e01e830d642546987dac29213534400f7c70890c86120bb95b353ed34bd79160539cb263fecc13e3 SHA512 a9d6fab6be0914a0ece96f42da9e2c84ef9d64cb480d9374b01ea16679c65129b49e9439a17d2c898d1e1bd33b7c03513df5b7172e91e3e682d6c475e9972fd5
 EBUILD gcc-4.7.4-r1.ebuild 1291 BLAKE2B 960d5072a4d03ee507cc5f7ea57f272165378daba273ec05e625dab2c38b0676f9261e46e6733649a49dc2dc50227449d480c90f8faa7af35a4cda8c2d4d7277 SHA512 44882746c9ee2920073722cf2847e717c412672e89656c6ee84e44903e935d0a84c6e7fdec327fddc8ba95cce1b8690d29847caff220f571e7d81dd556674b25
 EBUILD gcc-4.8.5-r1.ebuild 1401 BLAKE2B 669ceca836569aa02247049b00d1beb820b12a8fd08bc8da703b650a01629bb6b9b9607d83152889770cc7116a2ce9e058db7d5eee5e91921ae2342a32890c40 SHA512 22f68cc6733b59e3d4f43df088fa0440ebbb40c3cfbb88e538a1ccca849f1111a83c9a2cf0d0733eb16eec956e65c5accaae1c6598a8027a497d20f3293a2934
-EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 48679b12acbc9c4aa0db5451e36c156e351cae29f1978c82d53fdf926d2d98e77c43138ac3ca57c08af60255bccb7f1b360fe344617970282b1568438c10f558 SHA512 ad95c792c32ef356b3943bbcc4a1f16ba3e891e5f11ce872287d620d6d57aa44a8941c1e4c11a1fcdc10f4faf21f02cd513c6a36d210bebb7c5207a9f05d7b32
-EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B 4fd8f942a501d997b63b491b848782c568076899384f48a0a20bbd82d3a0cd9feb406a01f2b10fe7aedd7d4c70b16d26b3e11715632ad4989933dc10d0732c3b SHA512 ffc3067b6c0b0434c90c0c960547d848708fa494497b0691e4af324c0b0db97a034d5464b3baef2894c0881aa6d233842a7485169309eab1f0034e23c85b040d
-EBUILD gcc-6.4.0-r1.ebuild 566 BLAKE2B 8d30915fa47bf5428a39589c8ff3f18e841889139af9fed33ef0e0eb8a00cf1aebcfb655114c567cd4c13ef9349c81a558a14a5c7cd6b7807daac3045216390f SHA512 a82bcd5b478cb25489a6f528995cd94596c78ecc501db7c494f11a751c0bc09b8fe70227dae88e6ff27ae196790c51c2e15c2faf9072b65a4414a385e465932c
+EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a8786c7482328cdf4b0d7ab8a10045c2479b3ecf602ca934796e9c32459c9b421a3444a3333b79faf3026d SHA512 c0a443c8c0629b12047f1bdad0b62a23a423f2fad4408b765d5093f8cb2a4ab54b6470f6f4e2b2d4f444817a2e71c11568fadc8d11bfdcc068a8fb4b7fd826f3
+EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B 22b567881a1abbccc5622724141d50c5344c3da7c02ed58d59775e1b0861d556a01bf06de3908115f47d22a204468850a8a57f9e088ad241f05bb004a6bad295 SHA512 c5638c9a78270e06db2423acd6a5a109befb0b883d569ed8978ecd6c7755ecce5ff3450a91ee2fe12a3dda88717b31364dce0e621cd475307dec18f204fc8cfe
+EBUILD gcc-6.4.0-r1.ebuild 527 BLAKE2B eaf3faad99c6d490834ff16f60afaf12f0b15e7be881f09659c27e16d71653c7ac66fbe4cf4c4d41f2d2cd150ea34110a6c204bd4f58572e5b6c0705ae21e60b SHA512 3f7491ee199b0cae0b8d7f37f05a75b233987e88ff6471650bc5822b31af4edb4ed6ffa10b038fba7d84bd955baeba09a98468b52681e216f4b7129569dd69bd
 EBUILD gcc-6.4.0.ebuild 527 BLAKE2B 4d663fbea8169b0583374c0ec493b672aa8710641f5bf67fc5495861cfbd424b7cf32e7a3ab94cc9a790d5b8c93790a8835d8d2230c9ce8743683ff15d487a6f SHA512 5f0b4c8adf0e8a0c7a8d99ccad3dc3773ed9a07308d3def3c915b1328b8526d4097777ac3e3098c919a4f1779bb2d0d5335d6dd9a501a6c30357e58f094bcae7
-EBUILD gcc-7.2.0-r1.ebuild 575 BLAKE2B f2f5d98b778f52a0a748a615240fa823b791033a418099fd126d3300e9c929f9ae53fae18cb64641bc1a2962f8d596acac41f5addd546bc6df375bac3e06fb88 SHA512 a07e4cba8ec0d71de64856d63f34180e139e73e5f0c5bf5fbd57600ef63cda640f3f1f716db3272ef9d3e92e003b4cb54c49ef68dbe4dd496fd1090dc77e045a
+EBUILD gcc-7.2.0-r1.ebuild 536 BLAKE2B c49fc3fc2d74e828ede929ad94484371cc1a7ccb6e3198ff6127aa755f2af20ef56d1319d3ecdd4dc00c2d318c8b5406a5476eb2519c9358f99683db4f9b5896 SHA512 307cfe3c63d2b4238b8493d7047e7266430fafc48625f07ac1d850fa696a95411b5dd8f335a0f7e51fa17396f1ec3c644e240bfd5e086fff2a7b0eb2e68a3697
 EBUILD gcc-7.2.0.ebuild 558 BLAKE2B 64f93aa345b418bd324c5962a0edee943d0d07499702a3468021a15b63915ff1486a0f2d07ea7f1ba0899556d4fec4fc0b51abea662d8e5299fc7b5989a9fbd5 SHA512 3ffb6eefa26a967fe075879b41e9fb67f7d6d0175762aa8044ed466bf37adc19a4eb090109f16c7b03874db67f39a39c9ae77a26e2682f7e3b145b45711ee51b
 MISC metadata.xml 2520 BLAKE2B a0b5788500fdb6eb7c6d88def963dba88b67e4f0cb4a5ca0def3a25600601d9f5b339a2f48759ee7e2cdb7d46269d0b5d9a9f468e15f5977c6c0a2214f89226c SHA512 ffb6644c39848805fdc8571747be210a3057a6189e9007c6a0371d5448fc37d45615d4293fff0ddcf599c6369146b5a54bbbb091d250548a486456ed89806128
diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index 44597c4ceecb..b5030ce317fb 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PATCH_VER="1.2"
+PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
index 05af972986f7..754dd78bb1e1 100644
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PATCH_VER="1.7"
+PATCH_VER="1.8"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
index 5fd035bb54ef..d55c93326ffe 100644
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
@@ -3,13 +3,12 @@
 
 EAPI="5"
 
-PATCH_VER="1.2"
+PATCH_VER="1.3"
 UCLIBC_VER="1.0"
 
 inherit toolchain
 
-# unkeyworded for testing bug #641474
-#KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.2.0-r1.ebuild b/sys-devel/gcc/gcc-7.2.0-r1.ebuild
index 881f171fff72..e6437606334a 100644
--- a/sys-devel/gcc/gcc-7.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.2.0-r1.ebuild
@@ -8,8 +8,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-# unkeyworded for testing bug #641474
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index fabaffea9edd..9431877fba41 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,7 +4,7 @@ DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820e
 DIST gdb-8.0.1.tar.xz 19583920 BLAKE2B c22e314a0fe3ccb84cef6eca66c51af60914160ac9760cbe517628079dfb15ec73a623badf070b3162d4bd9e44937f717fd44e1d569edba4532853c82b31ac1d SHA512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1
 DIST gdb-8.0.tar.xz 19588616 BLAKE2B 148965e33a42787b5fa39650c2b6c48e28895930e36f11b44e8391366be1cc3bd4265ea7df932a7d650291fb20e3f66956c7dff1923025f889e5c035d3bf4207 SHA512 e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886
 EBUILD gdb-7.10.1.ebuild 6606 BLAKE2B f936b1f6fb0107c3b17db4833aba8cdd8f56060a62c644aafc96f05a274569856843d2f59f0415898c3bd547f9d69f6619fccf1e8743454a491ecfa6712878a7 SHA512 ac9409424ffdba44d825d16c0c9768ae0bc51c9deab4975845132f6b630ebf5cbb455344806b8a25425f9bb6a864ec06c3fc33f30abd0eb78e63e0af0f5d5665
-EBUILD gdb-7.12.1.ebuild 6622 BLAKE2B 92183f632d58055616f6a419869da18203b35182a72cea567a0e553e121f80bc68696575c721cc96a30af7512aebe0fbe162e9a4e7c89b0cee0b4036cd1da191 SHA512 55057ce019f5a9a97ea81e5f2b6c48dd669c1c90b7f7d53591fce50267b05112c6832a4e615671cee5cdb408a4fdb24da4cd6bddf10250696a72f0b4f9ac2aa0
+EBUILD gdb-7.12.1.ebuild 6619 BLAKE2B 242c000e9e32435b6aac5165c0e939da3de921eeb1eafd41f02ad2bb603f464f3ff5fad792a2d99e04ac03e909aefa17a0f334195abaa0970a53c8f980cc651d SHA512 5a8254939f70139ab28eeaaef5fe26825ddc438a7a8aacd84d917d5488ed6b224ae9d5b0b811d5257b1004e0c2413756d9b5bd415a6fdfbfc071954d043bec83
 EBUILD gdb-7.9.1.ebuild 5944 BLAKE2B 2065393cc5a34ff738626f997bec0a5e1e5d383d78bd774b04c85b683ff499f395fd87349917fc0bab911109ab6fa369176746b16fcfe40d3f996e85709fe6dd SHA512 7fe1fb5eba8ccb86f7b0fad0d433b7a5687421c9f8a57a4f6f393d09c840dd66e8f109873ff9772c2ea7209c5f4b95d2af6d8abe8e3e4c397bc0a96eba08871a
 EBUILD gdb-8.0.1.ebuild 6869 BLAKE2B e35cc00c17a74c32e5aabc6c5b8e9e728fb80e00d06785a5ed131210a38374c468649ec1d553b6fc3ce2c6cbae6f84521625de39b9b5d0d79f984af937bd9f45 SHA512 1b39521e365127436d90b58cd442da0cb5b17f35a4ba1ea298b799fb9f5d058ac0a8425f09702ad8be001e7cba0baa88843e51499513a88313504fd4aba31db0
 EBUILD gdb-8.0.ebuild 6811 BLAKE2B 6d0985b62589a687217ea37b8170cada7c789cd301d6a2c2e2b54695251b2d3709766e070cb4a5315cab34ddd3d6ddd616ce8aa169e6b0bbcf37e54de2b36973 SHA512 3d6f7ce0483625f2772223de9fcbfac47d083cbb7278064f226ffa8476f68d8e236f131b6748b12ebf23a438ceb28e6c29b849607cc2fcb9af424bb772c43ab0
diff --git a/sys-devel/gdb/gdb-7.12.1.ebuild b/sys-devel/gdb/gdb-7.12.1.ebuild
index 928e2912f4e6..493828f2db3c 100644
--- a/sys-devel/gdb/gdb-7.12.1.ebuild
+++ b/sys-devel/gdb/gdb-7.12.1.ebuild
@@ -57,7 +57,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	# alpha #562128
-	KEYWORDS="-alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="-alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server test vanilla xml"
 REQUIRED_USE="
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 345f0bf6d226..aabe7e997c8e 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -11,8 +11,8 @@ AUX libtool-2.4.6-mint.patch 1672 BLAKE2B 0a7eee18610dd1126d058360f8fdadb190c6f3
 AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178
 AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r2.ebuild 2519 BLAKE2B ea335c5ccbdc0de61e313790394c972786cb5de711704333012431429c3a7e877b68f9ec37479fc221d9b060e6373deb90dc711b83f46c4812bda1af5d16a657 SHA512 c375831d3eadebbf7de6ed933a4206c2b085118e94986083b9b4f4cb21d8c05f9eacb81ca3bcb937592ffe5239718a63c609d382d8bbf29afa4342d334935fff
-EBUILD libtool-2.4.6-r3.ebuild 2568 BLAKE2B 24ce2c4d790630fde18b92f3df3d78ac657290137ff394359a35401afa5b1dec72dba608e355452fec509eee050050e428365491d159c2e22297a926aefd2665 SHA512 27980b922f84b487f23edb8d7cff3b3ac341d20d37d23f8767cab5ecf6652eca5279acf5da4ad24150a3f6c5ee7fa42f6db1c50619b335cac39834259da85c34
-EBUILD libtool-2.4.6-r4.ebuild 3528 BLAKE2B ceebce7fc4a12ea41d2fb1ca4d9706fc382486e64f440051e3d17cbced863137507f11bdab161c95f8a0de9eeda3f2604da67290346399ef780c153b80899df0 SHA512 4bf267671324ff11f374bc46e2d7a5a615907e9dbcc9692eaf89fa5f967baae8b4d7acddfef90300e2d4e94cfb860f82ca19597321c9b9320f69de82763c2369
-EBUILD libtool-9999.ebuild 3170 BLAKE2B 3bcbba3b4ca84914fac3ab785efa3f5158ffb153d5c08e657228ad5efb15304755e5f9198de5eec391d536d48d0db2ce3a6d824b79954d8b0610c4d38ce1e907 SHA512 0bfbb34698bec1fe5de71de28f7415b1597c22a21f641f290d545113ab4db061c0e0a633442cc1d2dfe3c09087d0cf17e73e9b5fdf0a79fdaede505d113ec039
+EBUILD libtool-2.4.6-r2.ebuild 2547 BLAKE2B 3a5762c308aae0ad2295d4d015729086ca6efe9f4d2034dffd6b97d74299f1171040bd938cccec8d7eae2b9f3a48823905cddaefed358dab93e41a73be11ef10 SHA512 3546833302cd1130c2d4a49be47642a8466f5352e2ce4ff09b01048668487fe24c808d58fd9ded3ef9fc9348431a13c45f1e6544b514709db9354a00a175156e
+EBUILD libtool-2.4.6-r3.ebuild 2596 BLAKE2B 3efb75d7882bbeb5fdb69ae356e062b5454a9674e630a9d972eac4a12ad8542770c19c65a752294c27d8353e0baac9625f95c4efe9396a4b406da1739ef728fc SHA512 d76207dd0ba94025cd24abb69a39c46fb40c5cb0ebdf953f833bce351311b1fdce05735dc125dd3a6cc79543da2e3777d3c101ffdfc4814a4d864ffdbf705192
+EBUILD libtool-2.4.6-r4.ebuild 3556 BLAKE2B 8d98d53cb8545726d34712e9cc6366e287af7b960f5bc8c98d8ec4443504c77786364aa92e58e4b324c2e1071ae796b3d521877cf884633a2d8960dfde1fe0e2 SHA512 7995965f86aec4b0c70bb457d876d8ccbd8cda160dd5b29596b755d1a9fc2a04e1dd2d26b68ee40e7013979c1671c50d999ab83c7fc3e27e5e7e9366f314fe58
+EBUILD libtool-9999.ebuild 3198 BLAKE2B 7608ed5bda41e86c5b7db939b699837d1c175650bdb359a263b44d1eca696ce7dd6507f8d01f1e35bc1bcc8b41c53c768dbccabc1d7f30c7e66278274ad8abf8 SHA512 bd7c6cd58d53d61afbf65ff9b086a7ab0fedacaa11bd2bfd3705c677217aad2c820cf31c22ebd50b08062a7df753bc063c5e79daeb62201bcab5a109655dfdba
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/libtool/libtool-2.4.6-r2.ebuild b/sys-devel/libtool/libtool-2.4.6-r2.ebuild
index 22305f5c51f1..dc45b7e1ae89 100644
--- a/sys-devel/libtool/libtool-2.4.6-r2.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -27,7 +27,8 @@ IUSE="vanilla"
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69
 	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0"
+	dev-libs/libltdl:0
+	!<sys-apps/sandbox-2.10-r4"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
index a5d6ae853685..a6668aefc4e3 100644
--- a/sys-devel/libtool/libtool-2.4.6-r3.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,7 +27,8 @@ IUSE="vanilla"
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69
 	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0"
+	dev-libs/libltdl:0
+	!<sys-apps/sandbox-2.10-r4"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
diff --git a/sys-devel/libtool/libtool-2.4.6-r4.ebuild b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
index 4c96bca253ef..8267c48dec7d 100644
--- a/sys-devel/libtool/libtool-2.4.6-r4.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,7 +27,8 @@ IUSE="vanilla"
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69
 	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0"
+	dev-libs/libltdl:0
+	!<sys-apps/sandbox-2.10-r4"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 072057189265..75a255eea336 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-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"
@@ -27,7 +27,8 @@ IUSE="vanilla"
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69
 	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0"
+	dev-libs/libltdl:0
+	!<sys-apps/sandbox-2.10-r4"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 295d70d12516..a7a7309e6597 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 57a59958b117..960e5f93e62d 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -28,6 +28,6 @@ EBUILD intel-microcode-20170707.ebuild 1328 BLAKE2B d895077fb51ed4abcc2b49088ed7
 EBUILD intel-microcode-20171117.ebuild 1330 BLAKE2B ce06a3bbba626f8c9c8c0b6c0c9c8e2dbe2063f9cdb4ac984891396bd68d8f1e746b92e3748650a88977ac62baf58b87275d0513158bf6071bc0dabfb92d4bf3 SHA512 f2106b69382b5ff7c1635ea56c68a966a28c9b2a630f9fb07ecf0347c9c5d997b75b1516d85fe14922edcebcdffb30c9a082335b51b732f3c370c72a696be2bd
 EBUILD intel-microcode-20171117_p20171215-r1.ebuild 1155 BLAKE2B 12b179939ea6c2e80794f77ad77f0bd6c283b4a9891553283e3c6aab8b2cf73151a19e7f671af802c6b59f51550fed944bf80e0f4c208fa580636ec9541311a8 SHA512 38ca815b1cc6f2bd6f85bf38d1aa7ef544756fee598a5a608e2ffc489dbb24157e78a511e345732162050f62f0615166f60ef0273954048d627003d76b6f5b68
 EBUILD intel-microcode-20171117_p20171215.ebuild 1149 BLAKE2B 54add03072f87c0e1083a637d08143dc7457f1164958e5228e9968c762f24f4731a359a44d4eded63ff501faa9df9e3fd90d01131042da53f0fa411d47a53e7d SHA512 298d7d99b7d715abbd64d02f6762186b4fb556e05d9c2adef563c9c5659dee334127ac12e170a39779f466609500c2e74307799b6b8796095356803d3c194696
-EBUILD intel-microcode-20180108-r1.ebuild 2315 BLAKE2B fd3a75a037cfb0c37288ae4f9dfc1de57f34f279516d7bde703ae7cf757571a33c74dd4ec362d97669754ef9959a2ab9f3de131d944039b6d03b05463979008e SHA512 83ba98557be4508e037a2dcdf7079a442712bb0d0ec888e62d3e58cb8b9e06fe7e6a3c1ace7115c22f8262d4bd2c16e09a10336fb3dd792ca2453ee330e57952
+EBUILD intel-microcode-20180108-r1.ebuild 2590 BLAKE2B 7b27e37821f6831f5a1d53d447c2bd1f532456a53460b76787732435854dec92584d301fd897b02c1cf9d2534bf2c1caec74d17230f338e3cf9449b13d889640 SHA512 9c56b8b2d4dce67d413a6241e87e445b87fab5a13829c68fbb9765a9e1b88804a52c112ea01182a5ab435d632cafb029d426206c6366b011ca99d85e07bad820
 EBUILD intel-microcode-20180108.ebuild 1328 BLAKE2B 27e9dfb4283a5ed844514b1fc0df0afe793776454fd9748fd00b68947834465a667b86e9b262a4161d142b42fef80651391fcf872857abaeef66de5492528f3c SHA512 d6a0b50abe64c41bac70172e0672442e46458789ee9fac3df39f91c66f16011f4bd639dcb3cbe236429223d4d51c581ed345e2048bfce205c98a3b05a580839b
 MISC metadata.xml 570 BLAKE2B d49b45c4dff6e9116a388c1ab183461f609d31ed2f07c9145847b1cbb30ebf54922fb2474be2947d8668f7dfa5e06f4ac2beb7ab2b39a90976901a16862a3ef9 SHA512 f0c8094b68e2cb452975b01fbdb8c32f031fe1ef26971d518245dd886d2da8ab6c058d61cb4b4b9b1cb56a754cd08c3ef3fa30e280042675fa2d8705874a763e
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
index 60ae099579f5..a62d44a6a6fc 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="initramfs +split-ucode"
 REQUIRED_USE="|| ( initramfs split-ucode )"
 
@@ -40,6 +40,7 @@ pkg_pretend() {
 		ewarn "MICROCODE_SIGNATURES is set!"
 		ewarn "The user has decided to install only a SUBSET of microcode."
 	fi
+	use initramfs && mount-boot_pkg_pretend
 }
 
 src_install() {
@@ -76,3 +77,19 @@ src_install() {
 
 	dodoc releasenote
 }
+
+pkg_preinst() {
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	use initramfs && mount-boot_pkg_postinst
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1e506ec05794..78f13eac8dca 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 3cef2682e1be..3648728b596a 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -39,6 +39,9 @@ DIST genpatches-4.14-16.extras.tar.xz 17480 BLAKE2B ba238e249594e0a25d0731f69487
 DIST genpatches-4.14-17.base.tar.xz 401136 BLAKE2B b9e2a7604314393efd6edd9c143feee2742a5bf3a485de4a82ec8030dc802f24ee9a7b15e44314c5ea4e71f1345bf8552f38fbdd6b74558aad6b7606d3fbc292 SHA512 91df261c47d29c0e767a751ec135064df30f1ef65c1f100bcac54c571fcf2212d7bcc362975598480857966c58df9c9141678283b324afc1ad06d58673040d52
 DIST genpatches-4.14-17.experimental.tar.xz 5184 BLAKE2B bc2e6871e7d76e8781621328b5cb9c58162df3d7d51f5f460068368f3e98dd42225bb289ad9364c8344ec72b5e51d35459985dc0451b007b7e695d5d064b4812 SHA512 1e448e8c5846644dc8e21e99ed3e356f75c7e8e4e2789b329def21ad6af9cd993fcee418e93ac96cbea66a21c5d9d7b66d6710dea076ec66508f1fa12bd7a30f
 DIST genpatches-4.14-17.extras.tar.xz 17480 BLAKE2B 7cf764e9bf306b116a1e1a503f589603f87c4939a59fcb5f295cfa0e594a46fb8260920f6c5057ffffdb1b660773a6ff73ffd24929f3b331078379bc9ec4b681 SHA512 5c9a51e60ee8cce638ae6b21ecb16621b6c4b90502669675d9ddca48000d9e40aea8fdde16b8e3cf5188cdcbc88efd25121ed306bf2946986e2ca8a4104d3ecc
+DIST genpatches-4.14-18.base.tar.xz 411104 BLAKE2B 47dd66b96c07d0cbed88b2f661df3929ab534af4bc509c00ef1b65b2b183b5c427b990458ebd6eaf0b1853a817525a573efdfcbb21704a54153c3aa872f25d99 SHA512 26d28354611fca415e61e3634452b8d05fdda726c894bcad459fec1420c639fc632e389769ec24573bf61c48635fee641c53883e9e4cba64a1e7dd5dad9ab54d
+DIST genpatches-4.14-18.experimental.tar.xz 5184 BLAKE2B 059cedd0277ccace3fd1a4f420699ef78857ffd14667121584a996b185f62a6fb238d55dc859e134fe06fab7e914b10a4999fb64c4b264cc94a8281c45ee368f SHA512 6f525de7eabcde119d898a68ebe76ddf3d51de3b8f0998279a4bd34f6b4a4794faa246ea97ae8868124a47bc12138dc18ca79952a565656b8092bf60c6ca1703
+DIST genpatches-4.14-18.extras.tar.xz 17500 BLAKE2B c858ab443c96384fed01154b3665b527aa3a8f42529b943cd7d6711545da5c7f5b6601382b505a83187118f3850c638d602f2c3d397ddc5c156983ee3f7894a5 SHA512 da1d13c7cc9e5a1346e8af4bbf9523ab704b767de799ea1a74e11170ae55fb1b4bda59d1b8da607b3de0015d2cb860729d381be29df5f2de847d9034235b9e9a
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
@@ -54,6 +57,15 @@ DIST genpatches-4.4-110.extras.tar.xz 16460 BLAKE2B ba8a49590a0fd84e1cd3a8d8c157
 DIST genpatches-4.4-111.base.tar.xz 1654392 BLAKE2B 1522dc962aa9ef319d8f8af892d979df6e1ce3719edf201a5a1ff94028c9423ec74101e302f9be180d29e3bb8451385bbd4adacddd82b4beb164cf3e2f05cd56 SHA512 357682e3d487501ca3f8424748204f719ea1590987ab648df642e5dc28b3f14632c1da7c8082f57b2ff5b8bcf21f091840d54ef81934b20d4adf89f34678e2b9
 DIST genpatches-4.4-111.experimental.tar.xz 87768 BLAKE2B a36a628f63a65bcf7dcbe63d5426823af9baa64892d4c41433b5aa4ac7278892dd34cdaea7b4e21de70b9c8a66117d26cda53eae9b42e5dc3bebe278ff6cd1a5 SHA512 ee5939cc028d567afc8d99b22030efbf5363cdcd28c87ea992938eb3773720703a67e8c05ffcfe3f07b8531dde0238d9d7ccee96aa30270eec764131259f208c
 DIST genpatches-4.4-111.extras.tar.xz 16448 BLAKE2B 0e27191b8135012f70a223a22b5a4f8a1eaed5dcd41ecb7b372c2442d309f910631d4f373521222218f8af62771f9f410893f1276bfc011c77cb2afbcdeaa640 SHA512 1f231264bbc9fefd6dd71d363808b14a2f0d2ac57468d3c3cf0980ef77ddcc459b114394afa03fd1a5fde5a116fe5ec3f3800c3d0f4e2140acf722e0a6b7f1cf
+DIST genpatches-4.4-112.base.tar.xz 1668276 BLAKE2B c9b4a5a423a2ad7bdc731d4cb3fc4bd76b6605d99133a4f5865c2efac8eab5ecc12c2e50eaa6f84d8c9673cff2d0239cb867edb81171a2c6c44eddc0694a946e SHA512 206dd2adb48854b23b082a8fcaf074eb8762203c5495fe905073e37ea5df4b656f39d6816852f728c90fe26fa4b7cb3b7d6b80485d731bff6aa547b17a0f1394
+DIST genpatches-4.4-112.experimental.tar.xz 87792 BLAKE2B 13ad2e5a81d258ba0f84ce63318f8fa5ad2f02d5a2cc5ef47297a0e972e7a8b16546a82fc439cec1ce2308339c7be74db3b77bc1a77ec04ec6b44a3aef113009 SHA512 1255439ece64b36fd43a2e3d2539fd0d1e00ae3b409c9a8c970ae93d3d9e5783472f36ce637a122c0f2934255ad1cba2a22d0ff7ce6d5e5ca09d49762b5c0adc
+DIST genpatches-4.4-112.extras.tar.xz 16452 BLAKE2B d5afae8366b23a9c55db13e6e266184c3dd72c73c51d536e19fa317a1c613f03b371769579f7a0774bf484093c4ebf4907d6feb8404efe09919b5a6c9dae54d1 SHA512 a1c96aa2eebcba9d657de90abdce15a438d3584ddc4a55a27e39fcef1f19f89bfba59b6653ccb7d3c8607269494ffea9cbc383c7c40a7c4937a7db560b82ace5
+DIST genpatches-4.4-113.base.tar.xz 1687576 BLAKE2B 14bd6b1f64d1e7e1cdb1a6bbf90b1d7612217b08b5d9c9946a5af2979955eeef374fbbdfde256ac05a3c38f973c15178d4ceca7ee713df6ac13bd4f74f94b2c1 SHA512 fcd3e68b340ee535c1a5fff47cd68d43480fb54c72b873b197a54dffc6c285cb8867d1a1638d73085800d772662c536df56c078b74bbe1b8cc410fbb1603122c
+DIST genpatches-4.4-113.experimental.tar.xz 87744 BLAKE2B 18f956b749f71b477eba116dde801bc67edecee19baaaadf0c5f55546f18d04bb0f62e7fa6a90f9218ce70986f361b4876d13cd778dc833d6f7a04f8eba5243b SHA512 8e15026cfa956ab434f3c1fe1318bc05ae41cce7bb2331d9862838b7373025c567ae61c42f259b5469f4edef677eb36cc1ab9689582e608e34433323a98a6ab6
+DIST genpatches-4.4-113.extras.tar.xz 16452 BLAKE2B 62ece17a3e3379c9e05747bb2e8e16cb22e553f1c060ed3f2de873d9b6668f197551b285b6ca519023fe8d579a6f414f19c9098cca1e035dd6f003dffc2ae73a SHA512 f9787795089b694528566d9b0f1d5479874a1a589b20492714491b140b49769d0c04c1725e45b14e042d009861f9a10d870213bf62ee7daa0e956c0a832766da
+DIST genpatches-4.4-114.base.tar.xz 1691888 BLAKE2B e7529003017105d3cda92a43feb7b4b268a2c64b32897726301f7e4ade81a2e697aab026fc6bf6d180da275e56dbe2af892d4794fad57bc5fb97e5cba0bceb6d SHA512 1352f96e9312fbadce7f3812a7b0040971d332db3d00fcd71d779b354e912009916841dd5cf6fbf594b666d3bf91603d6bbfc7f6736d10ee8b5da4e6565b30e3
+DIST genpatches-4.4-114.experimental.tar.xz 87792 BLAKE2B 13ad2e5a81d258ba0f84ce63318f8fa5ad2f02d5a2cc5ef47297a0e972e7a8b16546a82fc439cec1ce2308339c7be74db3b77bc1a77ec04ec6b44a3aef113009 SHA512 1255439ece64b36fd43a2e3d2539fd0d1e00ae3b409c9a8c970ae93d3d9e5783472f36ce637a122c0f2934255ad1cba2a22d0ff7ce6d5e5ca09d49762b5c0adc
+DIST genpatches-4.4-114.extras.tar.xz 16452 BLAKE2B d5afae8366b23a9c55db13e6e266184c3dd72c73c51d536e19fa317a1c613f03b371769579f7a0774bf484093c4ebf4907d6feb8404efe09919b5a6c9dae54d1 SHA512 a1c96aa2eebcba9d657de90abdce15a438d3584ddc4a55a27e39fcef1f19f89bfba59b6653ccb7d3c8607269494ffea9cbc383c7c40a7c4937a7db560b82ace5
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -87,6 +99,9 @@ DIST genpatches-4.9-76.extras.tar.xz 17364 BLAKE2B d77fda48564a1993a34ba6f833b88
 DIST genpatches-4.9-77.base.tar.xz 1434412 BLAKE2B e12fa3e83ba930cc969f37ca74d078e8e34e1da777ac749d31e690b8f949cc854f1dd46d347c929717f22f95f517e84ac67fd682fcca29d47722ecdbc4ec37d4 SHA512 5a6b5b8d16c49a1f3068581e1bfb31ce926ae21d34182da7d8bb50fc5d1bad82aa921bb69eac86c3932cf7b4db195181a4e1a29d5c3b347ba49d171c550e30c1
 DIST genpatches-4.9-77.experimental.tar.xz 106384 BLAKE2B d549d7c735f6b509a199388017e4354257e27e1f65c3fed7d1aed0144abd2d81c726e5539af4a48d3cfd55bba0bfa0c93e5c630e244bfd713ca76bcf56944bf1 SHA512 0a6319be130c2122df871a0af43424f9640998099fe184562d58fb940849658f5b5eab1221be99d8d788b5950f1e0e2c19200b90778c5989814ca63dd5ffbf85
 DIST genpatches-4.9-77.extras.tar.xz 17364 BLAKE2B c666be38c1f3dc02cc87324a603598e62ceebb3feffe2e7a9b8e368ac933b982eedf385a87618ba4cdaff8eec85ddc8a4d1c76f984d3bcc6233ed88d3a141723 SHA512 c8df8e4c563a0add6ffa241978dd866102684055ee2b5bd9ba37f5f41f04b687e9b0fbd7cec9c6b365de84fb2c083b5c2ec210bd9b7348e972735cd071be652a
+DIST genpatches-4.9-78.base.tar.xz 1439100 BLAKE2B 83246625ab36915073ebfadc2f65fc8342c26a6cc63e4bb747d89d7effec7ffbdf732b306164365416c19d199e46d1f46d40325ece781150cfa71b3b1afa9d9a SHA512 51e9a9bab5ee92ebc5d3cd3028e2110b6e7a74b337d82c12dd8e0da06775cc0f986f1e6d49738dae5e1d9add374017b19c040ddd8298d281714a6544782001d6
+DIST genpatches-4.9-78.experimental.tar.xz 106396 BLAKE2B 64171f3f73be138e3e3270d90cfec2b59312868ff67f81db06d45456307d5efa72aa0e81d0908fe66f32ccc53de8f09b330fdba1f8790a4cdc7132f3ceeba40a SHA512 6f2d60ef1055036ccfdf2caff3eff3c0abd5d6481ef44ee6ff369748546b88cd849ad46ec8b33503e756ff2782829221dfb3abe7ac1dc56f44742cc0c0a90489
+DIST genpatches-4.9-78.extras.tar.xz 17344 BLAKE2B 846c60bc299c4617ce28b4e6b122d42f55d1ac0b73a692902453c0fb6149cda70fd5d62516a2c422cf6415f6c82ff2bb47e1abbb18bcf933132f37657498bdf8 SHA512 ad46777bee10b787100cfa5a66beff302832828db2e8cc144d9d544485e0f4e3ff66827d8ee7541d96b8b7499a508f14e62824c868033b986a641e3f414bfd3b
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -100,6 +115,7 @@ EBUILD aufs-sources-4.14.11-r1.ebuild 2230 BLAKE2B 1370fc90d64f88f1530211baf2985
 EBUILD aufs-sources-4.14.11-r2.ebuild 2230 BLAKE2B 8fbe05e9c35c1cce7a895a2f1c8384bd56cbe9bff461768be36cb7f3d9eed9413086c7b998683dd41d6941cff1edb740fa7b1d437658862e99a2c01e3d1efe4b SHA512 d7b9b5d17d74656e94569f1f41f534807ad719f37fa49f93b76466c3c60a6a213f06e7ce68fbd372f3ec2c6bc83ecb5ff20dca93eabf7f16d7517392cd4097ce
 EBUILD aufs-sources-4.14.11.ebuild 2230 BLAKE2B 988b2ea132f484b17ed5657c886485f0313bbd33b4808583eb70045600ff1e281d134de8e5267a3936ac397106abfbcb790e3a0c4f8a17560187116a1b7b51ac SHA512 d84469d21a950a4e0657a382b1315f1bdc479830c56b73b01d18089dd0066e53e83ea741fa200a5d339096f3c3b955e3f63351b191185a5dcab78e2ee44ace8d
 EBUILD aufs-sources-4.14.12.ebuild 2230 BLAKE2B 390b814e79e4b5c5f628ad27b29ecfb3c660a3396c94c961332ba2665a191633a2b203cacdb3ac9540f29ba36838bdd55f95b470a555be172148a04244aa0ab6 SHA512 2829f8d6da89728d1c8bd2a1fcf2197f7b83e865c04cfd69d5872ad6af2e318fac037a844d05d58f5c7ed60bfacc6cb680db001d6b4f519fe10e83947fc0a0a5
+EBUILD aufs-sources-4.14.13.ebuild 2230 BLAKE2B c1408efc0bce553e1d8384a1afa54ffc96efe9cb14f6f8b1de3b08374d8132b12051766db7afdfd517b481a71ecf080124f9784f2ed1bfe1585ea537c141e03e SHA512 214f9f9de1b429663252606e840ad3075fef634bb1befcb8212bfe333865d610839e286e54c7f611f06d7519c8d84a4980811e89529cd302def7fe5d28bfba04
 EBUILD aufs-sources-4.14.8-r1.ebuild 2230 BLAKE2B 173576704dffd0476803e7a07bad8d9670e60faa472c1f582c2a5d4a94370995350625d6dfe17740ce7984efdd0f75898e156ea2144761c22430e95014618798 SHA512 ff5f3b8e572698deb06e949e33e7226b9aa7987407035ff2407708b8e6d08b3cc04e34789fab9ab3c5a35cfb397d21f5ff8bd94a1dfd25a497ec4fecd691ff31
 EBUILD aufs-sources-4.14.9.ebuild 2230 BLAKE2B 7166b35c2e474d33df0e682dbfe318cc24dfb4c903889b1c45f93b99a9907b9eb4022560bed7b50814159b744523cf920e831856d9fdbcff18cd286a5c1136aa SHA512 aec54e61560e02bef6370d187cd0206c4e2d34f6284a4ff1645d85a47758d3d011dcb1f9e94de09cdae817bffe1563292355fd94ed99ecc3b12d91d6e46cafac
 EBUILD aufs-sources-4.4.104.ebuild 2230 BLAKE2B 7a9ca3e6cd72247427066785157924eca0cfb71a5100222bc88b36b43f9b0be69ed30df459210af4788de65c0612f4bb8d8fd9cf1f810c6b72972e8de91c5189 SHA512 e797e62f2b379585bab5c79c151819f56dab9b41a6af608615757f7731b5de8ce75dc2c0945ec797c62f1a287ed0ba50956e7adf252634c4f9e8ccf09f1c3549
@@ -107,8 +123,9 @@ EBUILD aufs-sources-4.4.105.ebuild 2230 BLAKE2B 1af796992d6b7e1b45888c3dbd9d35e8
 EBUILD aufs-sources-4.4.106.ebuild 2230 BLAKE2B ad0645144376521b1d2ce745a0f1afaad63e8a57d0ff9b37d393ac284a91da504ef817fc8f43c5567aac1c2166046dcda46f2872281c128a83a0627804e01a09 SHA512 b3c507339b0d09faf1c9b8b3b1cf1d5f0b7559329bad4702ce04c28124aa5b114a711560c762e130f8e236fef0e35905eac8442ce92965752b4a7ea5e10db781
 EBUILD aufs-sources-4.4.107.ebuild 2230 BLAKE2B 4034cf7a029faf6fd94cb1eeb39ad99bab02a7f40106fe59d1b30d3cb58a7b2302ae6adbf04b9c99474c12db37d74b4d68433e2db8c1be8ce675d6dec8b70c97 SHA512 b45ab2f1397a867b8494298d8dedcd6995f939e6a119d76e6a8d07cc184b83f8f6e84ee6efbf6f2ffe99f15cef1fd4d6761bd786bbfb9df66f505db7cac9193e
 EBUILD aufs-sources-4.4.108.ebuild 2230 BLAKE2B 4a756d25e750f44d724c3000efd430ed2a0fa310819b5b8bf124ad905c95df80c1f8d342f3d4df3b9b588717581cac707d047992ff48d2c0428d1b538a4ee1ff SHA512 2edaca6f44e09a0aea3692e07bd6795fadf0ae529b3fdee87f3c19fd3f38bf600fc86e42e9a4a9e69a982558e906603459149c33a8df458c9f35d836058799b6
-EBUILD aufs-sources-4.4.109.ebuild 2230 BLAKE2B 5d63a083afc07247ed5f112a20c5cb4c9ac78be71aff0ce956943535d073dfe0f7effa64821f8ed1c23919fecdd75176f3aa2408cc495e7a2994dac11a3feff5 SHA512 5e820080bffe795ffb9ee52850162a69b9907b0e0053a1837cfbcc610b940674fffe613e1dece34ce2ac94cd987458795481b0f09a762765da13ad2dab0b3245
-EBUILD aufs-sources-4.4.110.ebuild 2230 BLAKE2B 5d63a083afc07247ed5f112a20c5cb4c9ac78be71aff0ce956943535d073dfe0f7effa64821f8ed1c23919fecdd75176f3aa2408cc495e7a2994dac11a3feff5 SHA512 5e820080bffe795ffb9ee52850162a69b9907b0e0053a1837cfbcc610b940674fffe613e1dece34ce2ac94cd987458795481b0f09a762765da13ad2dab0b3245
+EBUILD aufs-sources-4.4.109.ebuild 2230 BLAKE2B d641fb38655c2f82cb846ea07a4ec908ad130f754323c312ef021680435c0c30491c143340846f77ebf29b2960faab74d4f14122b0a6ee0480f4a14e7a0fc7fd SHA512 fcd3ef7a3607e9d46f9b09f1bbe32c4e2092d6598bb10972fdd24e31cad84227b6c120c6a596593224409a5de142189e0dcc71525346afec0bd27d0e3fd914b3
+EBUILD aufs-sources-4.4.110.ebuild 2230 BLAKE2B 95fcc5389cb20696b4af97eade02c57e4fe813c9cab3d6ba72b36d9d7d61cf304cdd3e48eb954b009cc1f61ada35ec0abb150f2af08c6785e080976ddfa51e85 SHA512 f8f4a0ae3015d184db001dfef14a2c5cf8ac0ff7520b73f17bf3c41a0a558f6eff1d4b02446c8223365bcc20151c1d5efa663c2ae7437ee33bb8d63d0227dce3
+EBUILD aufs-sources-4.4.111.ebuild 2230 BLAKE2B 8968bf11085242aec2817ead4c7064d7b6ff04c1a433c03efe7caace53b0de19bb994996d82cfa715d66f52e8ad61e2f65e05e4d0f2233a53489d9200bdd2b82 SHA512 ff5f6e398f66a6d0f951352170285eb6d95058a98e3ab7b84c4bcc270687a69c29b035fd30093773313c9d1eafdfdf3874e7bbf2963fe93b59d2465411d85ebe
 EBUILD aufs-sources-4.4.87-r1.ebuild 2229 BLAKE2B c833f0bdf1e89ee3f3a3258de89a4e53c1d35cd7774fd2e93e1ce0cc532f6995f4ff99d1df83de37acd82fac150fd7f305b08588e4b48727ac865b5758889381 SHA512 f6caec63aba14857d6992cc9d2edd2b6bc345c93a2ab36efe6b87e5d6412c295d64d4777bf9174a71d3fdecaa90d5af7596c66343a2b875d5be1b6d1e64971a1
 EBUILD aufs-sources-4.9.49-r1.ebuild 2229 BLAKE2B 2b551c3767df65c6008704f6e4c0beee15b26fc255e5f11f126b8f82950dee9c6797d7cf216898c3e4b50b3638fc7ffa2b77721611db325138e08cbb9cdabc70 SHA512 5c0a4dd8fce85cf8db60366e3bb8bf851310e00f02b368890e7f2cdda8ec8adc40791e77160081ac664ab86a8350d1508783f8a738a11bbe12e0c31e95d2ed9d
 EBUILD aufs-sources-4.9.67.ebuild 2229 BLAKE2B f153cc37109461ad6b3a9cf77276b89caf45cfdf72ea3206c559594aac73268706a9d01e92e7333c42a3b8602b31fe8c6c76762cf6b13581dd0ee5dd65ea8a0a SHA512 7fa142870ea13dd4c24f5afa0f60a874b9416c005ba00e4a755b10e5708dc9f348eea56097d4a44df11c52099cd0238dcfd906f90b9edd1bed3f3c2dc6fe68f9
@@ -120,4 +137,5 @@ EBUILD aufs-sources-4.9.72.ebuild 2229 BLAKE2B 3d61a3886f2714e24576fa4dea00002f5
 EBUILD aufs-sources-4.9.73.ebuild 2229 BLAKE2B 16f502f67d0c46392f526ca5b8b82dfde2546f15ae155c5b05ba954795e4378dffef6d532a29bf7d7f9a618d944836b1a99e7d5179a4e242bded1eb2a9d2bea1 SHA512 9e92aa62a7d73e478d3c0b06691b94677653b40a940a529d3e6c236c149133ad92f7946f55eb900841a4fe609b002160da7791e365b659f6053e2d08a7c0534e
 EBUILD aufs-sources-4.9.74.ebuild 2229 BLAKE2B 17a7b6d1e198b67b760a00aef12555b3cbe7b43722a4ed28e8562293f0a718681e022c32191fe089b47e757cea87ed0ae661da46e5f25cfa8c125165a3839cc8 SHA512 3a605c5e8cddb72edb3900cd450976ea19413184a0839239614e7a12fddf6d30d2d2de82e6833938b4075e45e551accbb2f78421c0848d91406aa50ff4097e63
 EBUILD aufs-sources-4.9.75.ebuild 2229 BLAKE2B 9ff408aefe8e05d2b0518fcf7545f9d76c243cabb42764e2795f1331ea61a75dcdac7cb0d5af49d42ef1a8cdd5a70ae16afb14b2b4f733920d98ca3a6a5481dc SHA512 e123d7c0db26c0c8f8d5b349fa286098bcdc395a4493094bdfa32b0652e57a30ee4b910904489018f85fb94fa3c8a09993c0a27cedf1b0fb8471686b8d0dc1e4
+EBUILD aufs-sources-4.9.76.ebuild 2229 BLAKE2B 9d94d40fc813e29f986e517b247f0cf7158f4dcb1d2261e44bd972bd47e9c6405a332ac0928b66dda85d2cc0edc3ce1ea487e68b5f2cc3cd2a66940f7fa78722 SHA512 a3f09b0f91d4422255f00a4c8b3a378db79e6e9176dbb9b16259086c39e709f39403208765efbab0e3153d017eae18b2968504c4ec22a32b3642694c1b2affc8
 MISC metadata.xml 786 BLAKE2B 4a7ec566e14be79c65ccf8f9b04db4c66ef27e0940af8d3d870a3f08d96bbc8987836100aff699d90a5564a1986c929af02b9cb00553ed3f400378ca20f41fda SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.13.ebuild
new file mode 100644
index 000000000000..f526a513eb4e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.13.ebuild
@@ -0,0 +1,84 @@
+# 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=18
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild
index 9841bfdc7ac3..60df19f52e1e 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.109.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=111
+K_GENPATCHES_VER=112
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild
index 9841bfdc7ac3..c156c4b249f5 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.110.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=111
+K_GENPATCHES_VER=113
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.111.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.111.ebuild
new file mode 100644
index 000000000000..4d89a7e5aa3c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.111.ebuild
@@ -0,0 +1,84 @@
+# 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=114
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.76.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.76.ebuild
new file mode 100644
index 000000000000..c34d0a77513c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.76.ebuild
@@ -0,0 +1,84 @@
+# 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=78
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 623cc05b15b4..aa7b6c9e8525 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -126,7 +126,7 @@ EBUILD gentoo-sources-4.4.107.ebuild 743 BLAKE2B d5de9edda701d053218c7202e483e4c
 EBUILD gentoo-sources-4.4.108.ebuild 743 BLAKE2B d06c6fd0fc9e50f43b57167fd00357e32a09ee1ce95ef1b97bff746254e6c8abd9b859b13eea3f6721cb2844aeb7a62e6e2fc942d38a415ded3670316b0f9ee5 SHA512 08fef932fa8cadfc2200cd9c9470946c50b60f6074880d9c7ab7bfe51c34d51598128b32cec3db5ba867d34c668993758e7f2324f727328aa110be205480d2b1
 EBUILD gentoo-sources-4.4.109.ebuild 743 BLAKE2B d2f07b1daf99971fa57fa83274bcc489ce838fbab5363f270561cfbaa7847e0eadad8f8d964620c478135d2017e1abff4893575e0843d2dcd03594a5c4a130cc SHA512 3dff599c48976414d3a916b52dd892c3e6271d990a04432a442aadb70b8f6466e109bcedc3d3d14107115d8c4ede40758787403406d9f8fd82496d427d78f363
 EBUILD gentoo-sources-4.4.110.ebuild 743 BLAKE2B b97cdb80532d857229893737c3897de72b7d480826c5b2e5ac8d0f71879d15ebdf38d2bf99c0eba90f69200bd9087482a423fe0220600df1ac87f4b06b2fee74 SHA512 d8f68277462fb19f98da7a5185d4617c72a531727ed014bf08c7b2bb36252561f2eef85fa94024d10c6d0c151fd74414ac0d68da80406ba25a018fa501b566a2
-EBUILD gentoo-sources-4.4.111.ebuild 743 BLAKE2B 056a55dfb35a0ba7ecf78908c7cdee90e23756f9df93c803772908fc845368062d5117c0d0f98dc569db812721161e10084f311c7d6dd5c8387b78992d50b8f1 SHA512 a6b238120c4e158711bc9b2d8164c00396ae956344787c152d235dab88ac647f4215f700840c3a31c7693763318248ae93be6058773b2e16cbc620b600c8a976
+EBUILD gentoo-sources-4.4.111.ebuild 742 BLAKE2B c8af00e4daf6fd242b8faa175ec6741aa966ac1a62cb7a4fe511fc758ce8aff1891946af78b735b7e092aeaa9348f86c1c61b7e7d1c39d792c5fd357c04b8396 SHA512 d05b48ebb4543bd89a09c528840ba1925cc40bf0ad10d762a1ffc65b71028e1c04a66a7af8203bbecfe2943c4d3f997e70b423fcf47d3e0f31d4c742ce37e561
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -138,5 +138,5 @@ EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7e
 EBUILD gentoo-sources-4.9.73.ebuild 742 BLAKE2B 325a44a3bb59e8ccc3d02c6d18b6933bf3c3a980a922a4b49a13b7f4d9121a2dda03c73f9c82d0bfc1c447c06109f7dc5d30cb0e454710ec011aa100ca0891f3 SHA512 5ad5e8d5dc84ca2cabbb90767788a5b0698a21909cbd51161fdc8cd74ad7271aa16f9681444d4284939c5018f5001543a628da2067e5a0c16bcea2ced809f968
 EBUILD gentoo-sources-4.9.74.ebuild 742 BLAKE2B 54bcedfef6d735e75840d4c1934fa90fc9e496eb05cb2c7c6c3606e635f724494f9c228abe0a45e81328178c32eed3e70e4934e6476ea5825a8ef337c93972d6 SHA512 8df27d6463d6062623bea09d9a74e8ffbc593bcb40094806f01e00acc88b3d7da8c87d022d9d233986fd20f8edbf1d7566fa193ef6523823e61c6b4606579ce0
 EBUILD gentoo-sources-4.9.75.ebuild 742 BLAKE2B bc74daa96072fba3bdc880132b8c3ee089b922a783b83f5a05c88e5f34d5d0afc5c0e28509e97d93ed5109d4ce33d9af0cd5d8ca581688e4c2636b03387a3f11 SHA512 39b5b4306ecb1f4add091640cac1329b3c0b1e2794f980e09ef2a6c9dce664db655efe8af4465a6958f3113c7fa653b6811ba31a9ce1f99cb283f6dcec8f421b
-EBUILD gentoo-sources-4.9.76.ebuild 742 BLAKE2B 13fdfaeb398d927fae58887a23a667cace394e5e0cc8df41cc0ec949643f4da3426bf00b3eb61e8be6d6f7d44ca62a3e3299da82000b57b50b30d8c4fa0f5a55 SHA512 0813d003455d4c32da253d8c608fddf4f51c23d2f090f847dc4a5987ca5e7ce189394bcabd8c6a1956062d3a9259be37a344ce5f3dd9a1107ef5bc99cad3c3ef
+EBUILD gentoo-sources-4.9.76.ebuild 741 BLAKE2B 4ceda6a592c887c09173d606b2af6abd55a4a12971f5c0492ebf69956e9f9c7efb8f58c7621adc2f9860a04ed238703a634f2d571ec15348c7bbdfbfe5f0c143 SHA512 4104af66eff2c6142fd3316803fc51fd7b736ac1f2de5ef6fe158c946ea3bab5b8030739e332670c53dc8b47ebb0478d020c69070d8acf88de7f46969fe0b28e
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild
index 752405ea5d64..02f091d6949c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.76.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.76.ebuild
index 5e8a8d8f3643..f78c07cca8f4 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.76.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.76.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index dcbc707db065..4541f76d520d 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -4,7 +4,7 @@ DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20170314.ebuild 3294 BLAKE2B 93fdec863017044fd75ad16694bc1db473607c59d5d873ef21de651078b723d3607a0b40c7955a5e9154969dbcdcedeba04b17ea9c423437b47928dad63aa157 SHA512 1f038e50a2445fcd28a7abbe3f022ebdede0a04801afe3da06fdc0ae7104773c43810fef5b9484dc266cdb1c5a15bf326b7a1424744f1bd0e326ba509af89edc
 EBUILD linux-firmware-20171206.ebuild 3292 BLAKE2B 456e5bcf89e1c7aad7db0b7db03f5c9d6fd5b70377dd4fb05a2d790e6bb16474f48500b1786f44bbab00c6144b5f251a7f72af4cdc905b14a6e0e2a9eeea921a SHA512 228744b704e482d1389bb4ff56db95c397a213eb93952032c8d504072a68adf68d8a5864381240f9ad436c29c1cac82fd177f48556682ec99b59a61016976044
-EBUILD linux-firmware-20180103-r1.ebuild 3493 BLAKE2B dfbb7c1c1f9ee1285a58f6895125744fb9a020c7776c12dc444d4e542bbbeedd65179da1740b87056213f0db5b2e1d4de5f34946c7eb9a6177e764362055ce33 SHA512 f161ff6e40902da324b50b277b882e2c959fc6a5d4f6a4ce04fd4ee0ea41699935de24e318ca0eaf07f534414780010189d3c7398f24e305aa3f3063cda5522a
+EBUILD linux-firmware-20180103-r1.ebuild 3497 BLAKE2B 47c710b7cfbad5fa16b53fd035b0dda9d065c91aa524233c6a12488872382c72a949f98be21772cd5720e632f03f19a3b693b534f23179c7b9eb078ddfd62b86 SHA512 97246ef5d119ddf8a7e769d01019cb01af9efb2314ce61927651ddce6753c5f421ceea2fd160c51376cc960c09046dd873a064ef939000c89511fc3f2a59b398
 EBUILD linux-firmware-20180103.ebuild 3292 BLAKE2B fdc9d0a0dbeeb9a5b22c69d1bce7bef97af6eaa012430afdb9ddfc8e491cd520bb8d7ab542f97bc1dff5ec0237a47568eb6225e1f876ec8d768a0a569f0f66f8 SHA512 b2f6fa573c116e0f9514fecff7acc2ad95ca7e81bcbb1ccc6bb8f08ebaae34ad5aba8c264300e65444f6c3d9e3d93e4febc2d9b3585b70565fcb7c2c4a23ce7e
 EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
index 3a0c0e67d647..a0da2d99cd2f 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
@@ -8,13 +8,13 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="amd64 ppc ppc64 x86"
+	KEYWORDS="amd64 ia64 ppc ppc64 x86"
 else
 	GIT_COMMIT="2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78"
 	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/microcode_amd_fam17h.tar.gz
 		https://dev.gentoo.org/~whissi/dist/${PN}/microcode_amd_fam17h.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index ca435046d081..8886f470cc28 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -35,7 +35,7 @@ EBUILD linux-headers-3.18.ebuild 1444 BLAKE2B 420273f8046f2f94c43503d6674241636a
 EBUILD linux-headers-4.10.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
 EBUILD linux-headers-4.11.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
 EBUILD linux-headers-4.12.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
-EBUILD linux-headers-4.13.ebuild 1526 BLAKE2B cc455789d081dc7c4849daf4a1a857dc8371ca9bfbc893e5e17100e40ab34820e782c5f9e5320c3934c2266047925ff9dc0eb783c80fa9cf1aef486cf566bbfe SHA512 12a27d5c893b4f1d708af049966e5b8acb75b74fb7164d079827fc9c2bd2883dad0013ac5685e3274ca20d999bc9962df1b394c5f6fd7cb9014093829f50f094
+EBUILD linux-headers-4.13.ebuild 1521 BLAKE2B e07259417c3eadfd878224fe47e4a4f3e4300262f3a1964c7819d82f6ec38a52848e22834c38a149067375b5710e5a0b15129d3bf3735fb152df9bb921844044 SHA512 430153d7b472d9ba8363ac53b0c99a9a38af11d702dd8352abeb16e5dc1b8b842a964dfddb8acecb6ec76fbebce35ce672eacfd8effa60d148057806fad80395
 EBUILD linux-headers-4.14.ebuild 1539 BLAKE2B 8900db7ba2982d602920c18fdbc34340d624eb18d1477a59426170f8c5d82d88aaca5b1132a6211fe52dd635fe18d06c294d1e93e901bb6fde702ce83a229520 SHA512 412b3b9d932373fa4e3643d7cb14b96972d3fada2991f1150816365a0989fe6d802975882329afd6039809bfa49863a4e3043e596a4f1ff32e18fc7d5ba5bd6f
 EBUILD linux-headers-4.3.ebuild 1518 BLAKE2B 52d619f4780c15425f36e56137a9c92946f2819ad8053e737ab444bd21b5ef8012980ae83084038dfdf511edc039f9ae9b4538f137865d2a7efb5a018d231efa SHA512 a66be101c58288eacb28d46397a6f22c01b87b59057c527fc4716bc71f7b2ec657548293de60665bc4bbb7da14ada8270964a0f6e46ca5b349c73c4e446b2fcb
 EBUILD linux-headers-4.4.ebuild 1518 BLAKE2B 7aa19afb813093a903a3de6ac6176470baa3fcac408bfaae4adfb49d676b74f022bcf08ad719184dde1b947e6bd32246af220e9b30649556ded38b58c0833a62 SHA512 f4476f0cd952626fecdf8d13b28f33ad44bc9839d0918306af9dff1a97a65eee730421c906df5ea1f77be143be5deefbd23c985b135b330c15dc3188383015e0
diff --git a/sys-kernel/linux-headers/linux-headers-4.13.ebuild b/sys-kernel/linux-headers/linux-headers-4.13.ebuild
index 47a5d6165643..11e2bf649ba9 100644
--- a/sys-kernel/linux-headers/linux-headers-4.13.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.13.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index e45e87639f66..63992db567d7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 162c4e3d121d..c8875c3aec26 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,3 +1,3 @@
 DIST libcap-ng-0.7.8.tar.gz 447946 BLAKE2B a26af2dcdd1af26cf03ca668dc95eed7bc1d0344729031497f46bba865bcb23ded2f1ea2ca5cb500b9419bbbd7ed75501921485257a3c8930d156a94e0a2c1c1 SHA512 c32a4c5780c183b13611615abe9061221fd8987188b08828d1617cdaee338ad8de67b3430aa83bde60128efc76449a688546bfbf697f0847b6a835cb1a868756
-EBUILD libcap-ng-0.7.8.ebuild 2308 BLAKE2B 66a075448f134d0415934792969bcaf01887b8804c6bddc6071ecea459a57791891826d54c5d109051377e36d79430f58fe4b3ebb1ba7edd890057cd891a506f SHA512 b61063ef706671a2ccc15770d5687f2abc15a9b7c16ee7386db4b7e605f28094ad88b51c2d001cee018eb76900a10236b250eab741c8614e6541119fffa86461
+EBUILD libcap-ng-0.7.8.ebuild 2310 BLAKE2B b2fde822963ea165a83f199e687f089782b0762165b40959b87c41d9001fe41bb68b3f5d70aafd43b989f7a64602bfdcc7714950507dbf64908d9e78904ae165 SHA512 345277ff0bd4109088c96b274865e57cec6680cbf068af4439f095ce241561e72d1dc82bfb8e3936f2b98799a8a01278469b7c8e7607dbace0a8876e2729d0d5
 MISC metadata.xml 580 BLAKE2B 488341de9440c9cb0679acda14073496a0a1294380aa421496e4c622fa22a1c143b8bbce742214459fccf1825b9c1ef0004c9fec0fc3076b92a88bf557a63361 SHA512 51d670d97a94c8c668a4580bf6106a5b027b4d8d0c2f27ca88a508e60ece5a5390b619f0368c8111f2b843748a9ad31f1804c2a60df91ae1717a2c8b2a7aedc3
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
index 4d8132b1ac0b..6b6283bc78fc 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 19033da9fba5..f9c8b33836c6 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,7 +1,9 @@
 DIST libseccomp-2.3.0.tar.gz 546948 BLAKE2B 084ad3b0dd9833a5439ab4cfcf3ecf3bfa4f4943a20c249f02229fcfbc60024de18b1593235dd14fa5701d5ab53f29518b5d2fcb39b2b0054b1172238e8a2536 SHA512 398643af0920ff446b37a74e48f7a96ad2bec4f514e92fc6f8242b7515dcb8f5d06c2894790b22f62387c2d9b75efd54a4d5944f973239a05f06ec840f2a5a0b
 DIST libseccomp-2.3.1.tar.gz 552299 BLAKE2B 24460f29dff3bbbef809fb82c2ee58deb1b659ae236d369c554212dbfb8a27497bc44dc27fc76ad0eed6d1f9c50c52f05e52ce7f4996aa6dbbe3c0d960edae17 SHA512 246b30e1c513d5e1fa35a47905d99036e276c1e6483a96f3e79ddca536a8c6f641c11bf324ed10c9c8d18fa27d73667c9c72fc7459f827d2883926769ac1cb45
 DIST libseccomp-2.3.2.tar.gz 559238 BLAKE2B 0040ad977431ae9731dadcae11b0099d3ec788462f89cdf80c77b71405ce02c122c3859836aaa9469ec7112b0bf32cc87c9b102bb3e8b2e669ded54677db64d1 SHA512 0864a53ba2be61d0207f7361af94bcda4acff84a1814f915e6ccb19ab24f6ccc978da0eedc5cee047fa655dc1a583e2eeb7ab985ebfc77491c6a2606727b79ec
+DIST libseccomp-2.3.3.tar.gz 564546 BLAKE2B b5249379baf07ab2fef8a8659a30c9e87cbf05f99c38a07c1516948d2ede27d505f6670426f46422d2a927d7bfe97a33d8f871899ae9c30a26fbd10fba609df8 SHA512 845c7e0e916b5f5ad74da446ceff3250148b745c909185f6d5059e807d1b42fa6b74f356cce2a396bff0d4c7a3120e7cdad98d490a97d549327c7693fe1918be
 EBUILD libseccomp-2.3.0.ebuild 955 BLAKE2B 4f8809c66da37cb71217ed72bf36e8bbc8813065f1b812eeef1b309fca18b0a8a4a39b613a6a79d41914655778a2ed031f5948f496027e98fda62a84b190dde4 SHA512 cef9191e4a27650afb955eeef4ae61ac7bf5ed8e08fd39e4645d0fb7658c4fa6f3896b5f6105054da97eaf63158ef778f58f2cb735e46ea774537533c9726dd8
 EBUILD libseccomp-2.3.1.ebuild 962 BLAKE2B 0f260d292b8dfd9541f94ad860425805f615a08d0f6de9e7e39faee0ab46b48bb1d7bc820bb99dfe1fe6ffffe3c8b083f2fdadbdede05d3611ed7d9f9e177194 SHA512 58e7fd61a982923ced093c7a861b15838f38fb0fcf64fa87e3a6669985ba28e4b30896e76c0373b9be42a9bcbc6e71393dd31a50ed090441fde2cc707481a208
-EBUILD libseccomp-2.3.2.ebuild 957 BLAKE2B 8d74d354f73ba0b8699922f445b4610b31d5c57f24ea7e8d1e033d6578ee9b8da45ce54851b907d96b481cf0933b9ac77b4b4951c373523caec656154fefb602 SHA512 0c2367d7e52e642d689ca37246fbb694f22ee7de0858f96605ff2f89c775b7fe888889ad78beb0d3277db884e5c621ccccdb30ceeb73ef232bf3781667397975
+EBUILD libseccomp-2.3.2.ebuild 955 BLAKE2B 76fff8e11b0113a29570b803c7cdc41fc63b5da7b393d8f6471df7b0098a6f6cb0d7a6901407597d261466fd0e9fa77eef25d4ad318085566d202eb7a1c2254d SHA512 e9c95226208a53e73e57dce5bea09c74b0e66fd373d8ea5b3fabfb21af078add0c3e6577525c9b17d25699243ba157593f069e2067001be21e22a2347f5c9b35
+EBUILD libseccomp-2.3.3.ebuild 962 BLAKE2B b034890aa1e4dcbacb0e04c7a7a33acca727582de2751d2c0f70a5e8317934e344a50ab94505050246bf13a42c4630b9a168ee52186bcb3ec35e33217989bec2 SHA512 632feece839172dc327d47cb0367002f558f3c4d44de2ebcc69fe7068ee1d60c7de2424bcdd45887984aa9c812031de15d43d948d4786a2d871bff1a9f72678a
 MISC metadata.xml 305 BLAKE2B d660c00d553100c2dc8deb364d56acdef4771051f3d876a63e7264a501653ba539840ccab398e834428990f3c22accca16a34a9d64f433f5258656c5085a3dae SHA512 5b35970c91056a844e76bfd8e3040f58d38784390fd7fcbd881bfd3eb11e7c4c01c16cf4e320f19aaca494c715037b142e3ceddf6a28b1f272b7b01b95cf3ff0
diff --git a/sys-libs/libseccomp/libseccomp-2.3.2.ebuild b/sys-libs/libseccomp/libseccomp-2.3.2.ebuild
index 503a145f6af7..46e82ccd129e 100644
--- a/sys-libs/libseccomp/libseccomp-2.3.2.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ~mips ppc ppc64 ~s390 x86"
+KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 s390 x86"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
new file mode 100644
index 000000000000..e70326756c71
--- /dev/null
+++ b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="high level interface to Linux seccomp filter"
+HOMEPAGE="https://github.com/seccomp/libseccomp"
+SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+IUSE="static-libs"
+
+# We need newer kernel headers; we don't keep strict control of the exact
+# version here, just be safe and pull in the latest stable ones. #551248
+DEPEND=">=sys-kernel/linux-headers-4.3"
+
+src_prepare() {
+	sed -i \
+		-e '/_LDFLAGS/s:-static::' \
+		tools/Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--disable-python
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name libseccomp.la -delete
+	einstalldocs
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index c46eefaad8b6..2e5a16b99660 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libelf/Manifest b/virtual/libelf/Manifest
index aa558a366b88..b6dab8208397 100644
--- a/virtual/libelf/Manifest
+++ b/virtual/libelf/Manifest
@@ -1,3 +1,3 @@
-EBUILD libelf-0.ebuild 429 BLAKE2B 3f21df6faab2eb7607ef07887ba03a551d85a688d49cbf7287eb795846f4e2effa0027c99b100c7e03e78461a69543ef754417853b285c4cc9d87ab4ad008c1b SHA512 87747c79888f3c1ea6e24c665c0433e332d631dc0c36cfa6bbe576bccfa35633b570320596e405dd38b237c762f533a0a2d3b55fae06faa3b23171675021797d
-EBUILD libelf-1.ebuild 555 BLAKE2B 294db6571453cdf30d3894c7dea689c35c8137643a2cfde74146d19f326c276420f9f3b7ffda8c8c5b7086f847e3f5f7bf0e48ab161fc4023743ce268336772f SHA512 bb9adde1f643e075384e7c6b0d39579034ebcd18e9c5bf5dde271c23f178997268d099fc674cd16d934674bc87a880ae3068106b168241e228dc54fd50196aae
+EBUILD libelf-2.ebuild 427 BLAKE2B d94e156071f487e1caf41c9146092556000f781dd144b1fbd914c715f68430ca58ed90ec53b23ddfb1d98defc27550135f2e586852d4a343c1b4a633f27e6fb7 SHA512 598a6892eee1ab9465032a6aa3a582e5a69e320eb160cbcef647d36b8661f0aa6f30e147682eb4b1917db84a07f5d5eeb25cb060be60fc8d377d166f69d1bc72
+EBUILD libelf-3.ebuild 502 BLAKE2B 53413b2fcf08de56d8cce6282debbc7ef878062613b19ba06468f18866f13893f4343503d1c55aec5c29575390d1a52ec1c879a278556c7a3108700e6b62ce4c SHA512 c3011f21adc82e8e8276bdf144b8a6b61f56af4fd5a73556189e0ff47637ba7e0871f7688a4d8a0e0685ee9696afbc4f5cf5ebad38d6aa4b284e21a80f4c240d
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/virtual/libelf/libelf-0.ebuild b/virtual/libelf/libelf-0.ebuild
deleted file mode 100644
index 0b8e5336de81..000000000000
--- a/virtual/libelf/libelf-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for libelf.so.0 provider (dev-libs/libelf)"
-SLOT="0/0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libelf/libelf-1.ebuild b/virtual/libelf/libelf-1.ebuild
deleted file mode 100644
index b2acd4bb7121..000000000000
--- a/virtual/libelf/libelf-1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for libelf.so.1 provider (dev-libs/elfutils)"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-RDEPEND="
-	|| (
-		>=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]
-		>=sys-freebsd/freebsd-lib-9.2_rc1[${MULTILIB_USEDEP}]
-		>=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]
-	)"
diff --git a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2.ebuild
new file mode 100644
index 000000000000..1dfdf24937de
--- /dev/null
+++ b/virtual/libelf/libelf-2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libelf.so.0 provider dev-libs/libelf"
+SLOT="0/0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3.ebuild
new file mode 100644
index 000000000000..bb6602699907
--- /dev/null
+++ b/virtual/libelf/libelf-3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libelf.so.1 provider dev-libs/elfutils"
+SLOT="0/1"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+	|| (
+		>=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]
+		>=sys-freebsd/freebsd-lib-9.2_rc1[${MULTILIB_USEDEP}]
+	)"
diff --git a/virtual/perl-CPAN-Meta-YAML/Manifest b/virtual/perl-CPAN-Meta-YAML/Manifest
index 236822f6e0b9..71c7544a3880 100644
--- a/virtual/perl-CPAN-Meta-YAML/Manifest
+++ b/virtual/perl-CPAN-Meta-YAML/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-CPAN-Meta-YAML-0.18.0-r2.ebuild 604 BLAKE2B 4d216676b3a0b04526cbf07ab18fa778035c61f48c4a446cc9a7ed0d5e6f3383c0798ac4913b2d8bf5ee1a5774c10eb6bd1bb3d87cead1bcff3dba5f45710388 SHA512 618dcd2050ead503ef060b737d0caf9e943e6e8e58b99d41e1d5f033ca80d0635b64f71a998aa7d60754ddb0b16ec82c471323ad7a904ae8e6114ab9710963c7
+EBUILD perl-CPAN-Meta-YAML-0.18.0-r2.ebuild 601 BLAKE2B 9d6e8d37d6b2f1102c7522feeca320022c227130f02a652f6fce734ec78550de2c535c5ae20e3af64436b56cecc519ce1ab45bbc22d48c5c2152ab1b93c95e9e SHA512 3a53d8e2cfa9b44f70d038684345df6dc27946b84d5c640ed9e2157e89c54056a74ce40bc82cca083987739b79499b7f0fdd725f01886895a4b1469c08589ab4
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r2.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r2.ebuild
index 4e28e37defbe..4152d3bf49d4 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r2.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta/Manifest b/virtual/perl-CPAN-Meta/Manifest
index b8982ff47810..2dcdc1e52ccd 100644
--- a/virtual/perl-CPAN-Meta/Manifest
+++ b/virtual/perl-CPAN-Meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-CPAN-Meta-2.150.10.ebuild 723 BLAKE2B b52ce7ec05c41cdbe69c26e762299a18561ab96d8f4b236750b00cb15cb831f532bea9919912704f304ca41a830fec1a32afafaf73fd78138ace165fe0b4f910 SHA512 d6a9249158f41f11b98d72a2161c9e407c855738a7c02ed68d052b193cdecef70abe3227ec83520f2c5b3db747e49dbbaa52b902664433f1626a7a697bee5d6d
-EBUILD perl-CPAN-Meta-2.150.5-r1.ebuild 646 BLAKE2B 77f63ab4bfa9c2f52f5cc6d274d85de74976fac448e27178ccb6f0b875e7e0e609bc20071a24847d1dcc641693a6f1d02088b8eea59aac44e7753b662b835837 SHA512 946ecd1840e6e0f71c53c176cf70eed39c10cc36fed102a082c4b7dd33547816cb02a89e001301dff1ce6a792de41cdc56e4fba28a52455090348e350016404a
+EBUILD perl-CPAN-Meta-2.150.5-r1.ebuild 643 BLAKE2B 2352ee85466d7b6dd129e0e1b7939e60a7bbde9cdb70e7ec7130f8d5969a01b0e1809c4f5cbe4511ae53003aaa52e5977440fc126aea225314ea011a95860231 SHA512 f69552d6f3ac33bbd67138dcba39f3b6f30152fafc91a438566c87a6fe96ce1b2ab0c1c618db57be876e4a9fcd08edd997d9091006be35ccfc902bc9eeab1cc6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.5-r1.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.5-r1.ebuild
index 59c986a886b0..d4d2b5b78ac0 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.5-r1.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index 2507a2e91fb3..5ac0e3c09722 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Data-Dumper-2.160.0-r1.ebuild 572 BLAKE2B d34d421057e152f49b68d0bf4d5f2bfe175bd7748805744014cf9b9e2751f54f6f10dcd4485a2c7c05712919eaa058cf0c00d4afae85e5a59cd4bef153c3f0f7 SHA512 634cfaf2b90d4303e3eb6b09c0ee873332e612e2d4d076ed367e267fed9d2adbcccaf8268c14de0964ff489091b446b47fa931b7e70f6a9e26b36d68d13257fc
+EBUILD perl-Data-Dumper-2.160.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-Data-Dumper-2.167.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild
index c27e26d52914..81174d4e4331 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index 03b7e66a7797..7c87d2a18d3c 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-ExtUtils-CBuilder-0.280.225-r2.ebuild 604 BLAKE2B 4d216676b3a0b04526cbf07ab18fa778035c61f48c4a446cc9a7ed0d5e6f3383c0798ac4913b2d8bf5ee1a5774c10eb6bd1bb3d87cead1bcff3dba5f45710388 SHA512 618dcd2050ead503ef060b737d0caf9e943e6e8e58b99d41e1d5f033ca80d0635b64f71a998aa7d60754ddb0b16ec82c471323ad7a904ae8e6114ab9710963c7
+EBUILD perl-ExtUtils-CBuilder-0.280.225-r2.ebuild 601 BLAKE2B 9d6e8d37d6b2f1102c7522feeca320022c227130f02a652f6fce734ec78550de2c535c5ae20e3af64436b56cecc519ce1ab45bbc22d48c5c2152ab1b93c95e9e SHA512 3a53d8e2cfa9b44f70d038684345df6dc27946b84d5c640ed9e2157e89c54056a74ce40bc82cca083987739b79499b7f0fdd725f01886895a4b1469c08589ab4
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.225-r2.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.225-r2.ebuild
index 4e28e37defbe..4152d3bf49d4 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.225-r2.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.225-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 6152476de361..9080f20c083a 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild 631 BLAKE2B 3206bd7bf1c0724e7bd6b4a0efd311791abf2f866e57bf9e99dde6ef29ed330b34a247e64651d638e55874202b7239a286fdd0c921976dfb2cd4821cb23d8129 SHA512 a1c263fc717f4398edaaa51f4bd3c93a2bff1a30696c061e7e6a01af46ba19aeef3723843fdbf067cb278a7a92e0b18a90f4ab00b667acab45c74af52af639a4
+EBUILD perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild 628 BLAKE2B 9cf86a2bd4182e685495e5528462a57bfc12409be9d47abfcf78acba4b715d8895f339ef2f90d025db7770f3e4ffb0d508fcdcb7078fb6371dc0845081bc7cbc SHA512 df1bd2bc1d401063cb666b64b1981fa6ae0e38b5fa78873edbbfb8c4cdb7e41757de9c6fdbbf11749e4cf124cfaa99498c33cbefca482ac244a682a5f940efe7
 EBUILD perl-ExtUtils-MakeMaker-7.240.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild
index 15710a9d9824..50cda2a8094a 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index 9e6fae81186f..bee29baa0d1b 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-ExtUtils-ParseXS-3.310.0-r1.ebuild 583 BLAKE2B b4576b739d84a190225e6d2d8aa0849fb17171dafb3d05f74e182e67072b857c60aeb753c8ed28138046a2dd674fb8e5e8ea864204f80d5a8c477cf224eb6be3 SHA512 98e4460fe1c4918389cd708d867023ad560bb3ff8531b2c080393c2a3d7f6d8ee30f167499dae7f320cfae7164480b6024433047d1122980aae55afe828cc425
+EBUILD perl-ExtUtils-ParseXS-3.310.0-r1.ebuild 580 BLAKE2B f7c4714545c64c7e8d00b25b91b8513d40dc2ee5e9cc597f47e4f2930f902da424bdde442bedeb1995af8d4adc18bb6d1d9676741006daba6687da924f805237 SHA512 e0ec3920baa0c718da2a2203da7492d4b243dbc0a8393841c6ac02f05b06b44998cdaced72f38ebafabd534e152a769b6c01d6fc14f8890d12e0507a1a653b11
 EBUILD perl-ExtUtils-ParseXS-3.340.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.310.0-r1.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.310.0-r1.ebuild
index 75fc3ce60510..fc9869aba360 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.310.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.310.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest
index c1ccdfe5e61f..fe7296ccf03d 100644
--- a/virtual/perl-File-Path/Manifest
+++ b/virtual/perl-File-Path/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-File-Path-2.130.0.ebuild 544 BLAKE2B 403e8e25bc4fdbb261bf691015399f9e66471639c720a64673ecf9e4dabb2bb4697713fae680104247f13b964eabf06a2d8a4db07b3e18d97bc5c98d85d80ced SHA512 296cf6cb9909410a08fa5b43c877c4eafce8d6a65ffd54e877570fc0d3d6a8cc54fa6c5a94ba876c808dba5c7f61b091be1ce40546ba185f734407bb8076b8c8
+EBUILD perl-File-Path-2.130.0.ebuild 541 BLAKE2B e4701947e0923c6664635cc28e65a08421d314355a5e70e5119aacbebf39f458e42ac51e50fdbd623ecdea99f86c4f752f8e5efe9bfc23aefaa3e99ab2038ead SHA512 bdca0a240035e58a586a33a16ec9965add6d1134630f198bbc99832cff3e575f063358ab47074c58dfe25241c734ddc5583315f280a19399723ac5416136c676
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
index 7b56edf4bb8b..226bb71adddb 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index 25322c832c6e..58356b2ae12f 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-File-Spec-3.630.100_rc-r2.ebuild 631 BLAKE2B 3206bd7bf1c0724e7bd6b4a0efd311791abf2f866e57bf9e99dde6ef29ed330b34a247e64651d638e55874202b7239a286fdd0c921976dfb2cd4821cb23d8129 SHA512 a1c263fc717f4398edaaa51f4bd3c93a2bff1a30696c061e7e6a01af46ba19aeef3723843fdbf067cb278a7a92e0b18a90f4ab00b667acab45c74af52af639a4
+EBUILD perl-File-Spec-3.630.100_rc-r2.ebuild 628 BLAKE2B 9cf86a2bd4182e685495e5528462a57bfc12409be9d47abfcf78acba4b715d8895f339ef2f90d025db7770f3e4ffb0d508fcdcb7078fb6371dc0845081bc7cbc SHA512 df1bd2bc1d401063cb666b64b1981fa6ae0e38b5fa78873edbbfb8c4cdb7e41757de9c6fdbbf11749e4cf124cfaa99498c33cbefca482ac244a682a5f940efe7
 EBUILD perl-File-Spec-3.670.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild
index 15710a9d9824..50cda2a8094a 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index 909dfab991c7..b190f97b3341 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Getopt-Long-2.480.0-r1.ebuild 572 BLAKE2B d34d421057e152f49b68d0bf4d5f2bfe175bd7748805744014cf9b9e2751f54f6f10dcd4485a2c7c05712919eaa058cf0c00d4afae85e5a59cd4bef153c3f0f7 SHA512 634cfaf2b90d4303e3eb6b09c0ee873332e612e2d4d076ed367e267fed9d2adbcccaf8268c14de0964ff489091b446b47fa931b7e70f6a9e26b36d68d13257fc
+EBUILD perl-Getopt-Long-2.480.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-Getopt-Long-2.490.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.480.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.480.0-r1.ebuild
index c27e26d52914..81174d4e4331 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.480.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.480.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Metadata/Manifest b/virtual/perl-Module-Metadata/Manifest
index 53482379fbe3..bd935caec5b0 100644
--- a/virtual/perl-Module-Metadata/Manifest
+++ b/virtual/perl-Module-Metadata/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Module-Metadata-1.0.31-r1.ebuild 583 BLAKE2B b4576b739d84a190225e6d2d8aa0849fb17171dafb3d05f74e182e67072b857c60aeb753c8ed28138046a2dd674fb8e5e8ea864204f80d5a8c477cf224eb6be3 SHA512 98e4460fe1c4918389cd708d867023ad560bb3ff8531b2c080393c2a3d7f6d8ee30f167499dae7f320cfae7164480b6024433047d1122980aae55afe828cc425
+EBUILD perl-Module-Metadata-1.0.31-r1.ebuild 580 BLAKE2B f7c4714545c64c7e8d00b25b91b8513d40dc2ee5e9cc597f47e4f2930f902da424bdde442bedeb1995af8d4adc18bb6d1d9676741006daba6687da924f805237 SHA512 e0ec3920baa0c718da2a2203da7492d4b243dbc0a8393841c6ac02f05b06b44998cdaced72f38ebafabd534e152a769b6c01d6fc14f8890d12e0507a1a653b11
 EBUILD perl-Module-Metadata-1.0.33.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.31-r1.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.31-r1.ebuild
index 75fc3ce60510..fc9869aba360 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.31-r1.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.31-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Parse-CPAN-Meta/Manifest b/virtual/perl-Parse-CPAN-Meta/Manifest
index 8ec78fc1687e..4301026015e2 100644
--- a/virtual/perl-Parse-CPAN-Meta/Manifest
+++ b/virtual/perl-Parse-CPAN-Meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild 631 BLAKE2B 3206bd7bf1c0724e7bd6b4a0efd311791abf2f866e57bf9e99dde6ef29ed330b34a247e64651d638e55874202b7239a286fdd0c921976dfb2cd4821cb23d8129 SHA512 a1c263fc717f4398edaaa51f4bd3c93a2bff1a30696c061e7e6a01af46ba19aeef3723843fdbf067cb278a7a92e0b18a90f4ab00b667acab45c74af52af639a4
+EBUILD perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild 628 BLAKE2B 9cf86a2bd4182e685495e5528462a57bfc12409be9d47abfcf78acba4b715d8895f339ef2f90d025db7770f3e4ffb0d508fcdcb7078fb6371dc0845081bc7cbc SHA512 df1bd2bc1d401063cb666b64b1981fa6ae0e38b5fa78873edbbfb8c4cdb7e41757de9c6fdbbf11749e4cf124cfaa99498c33cbefca482ac244a682a5f940efe7
 EBUILD perl-Parse-CPAN-Meta-2.150.10.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild
index 15710a9d9824..50cda2a8094a 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Perl-OSType/Manifest b/virtual/perl-Perl-OSType/Manifest
index b96f6d482981..efe6a04d4e83 100644
--- a/virtual/perl-Perl-OSType/Manifest
+++ b/virtual/perl-Perl-OSType/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Perl-OSType-1.10.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
-EBUILD perl-Perl-OSType-1.9.0-r1.ebuild 583 BLAKE2B b4576b739d84a190225e6d2d8aa0849fb17171dafb3d05f74e182e67072b857c60aeb753c8ed28138046a2dd674fb8e5e8ea864204f80d5a8c477cf224eb6be3 SHA512 98e4460fe1c4918389cd708d867023ad560bb3ff8531b2c080393c2a3d7f6d8ee30f167499dae7f320cfae7164480b6024433047d1122980aae55afe828cc425
+EBUILD perl-Perl-OSType-1.9.0-r1.ebuild 580 BLAKE2B f7c4714545c64c7e8d00b25b91b8513d40dc2ee5e9cc597f47e4f2930f902da424bdde442bedeb1995af8d4adc18bb6d1d9676741006daba6687da924f805237 SHA512 e0ec3920baa0c718da2a2203da7492d4b243dbc0a8393841c6ac02f05b06b44998cdaced72f38ebafabd534e152a769b6c01d6fc14f8890d12e0507a1a653b11
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.9.0-r1.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.9.0-r1.ebuild
index 75fc3ce60510..fc9869aba360 100644
--- a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.9.0-r1.ebuild
+++ b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.9.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index 17ec9e5ff55c..b71bd8c7e675 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Test-Harness-3.360.100_rc-r2.ebuild 631 BLAKE2B 3206bd7bf1c0724e7bd6b4a0efd311791abf2f866e57bf9e99dde6ef29ed330b34a247e64651d638e55874202b7239a286fdd0c921976dfb2cd4821cb23d8129 SHA512 a1c263fc717f4398edaaa51f4bd3c93a2bff1a30696c061e7e6a01af46ba19aeef3723843fdbf067cb278a7a92e0b18a90f4ab00b667acab45c74af52af639a4
+EBUILD perl-Test-Harness-3.360.100_rc-r2.ebuild 628 BLAKE2B 9cf86a2bd4182e685495e5528462a57bfc12409be9d47abfcf78acba4b715d8895f339ef2f90d025db7770f3e4ffb0d508fcdcb7078fb6371dc0845081bc7cbc SHA512 df1bd2bc1d401063cb666b64b1981fa6ae0e38b5fa78873edbbfb8c4cdb7e41757de9c6fdbbf11749e4cf124cfaa99498c33cbefca482ac244a682a5f940efe7
 EBUILD perl-Test-Harness-3.380.0.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild
index 15710a9d9824..50cda2a8094a 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/Manifest b/virtual/perl-podlators/Manifest
index 741737a1784f..0ae56e3daa07 100644
--- a/virtual/perl-podlators/Manifest
+++ b/virtual/perl-podlators/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-podlators-4.70.0-r1.ebuild 572 BLAKE2B d34d421057e152f49b68d0bf4d5f2bfe175bd7748805744014cf9b9e2751f54f6f10dcd4485a2c7c05712919eaa058cf0c00d4afae85e5a59cd4bef153c3f0f7 SHA512 634cfaf2b90d4303e3eb6b09c0ee873332e612e2d4d076ed367e267fed9d2adbcccaf8268c14de0964ff489091b446b47fa931b7e70f6a9e26b36d68d13257fc
+EBUILD perl-podlators-4.70.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-podlators-4.90.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-podlators/perl-podlators-4.70.0-r1.ebuild b/virtual/perl-podlators/perl-podlators-4.70.0-r1.ebuild
index c27e26d52914..81174d4e4331 100644
--- a/virtual/perl-podlators/perl-podlators-4.70.0-r1.ebuild
+++ b/virtual/perl-podlators/perl-podlators-4.70.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/Manifest b/virtual/perl-version/Manifest
index deafd1025e4f..25877f24b6bd 100644
--- a/virtual/perl-version/Manifest
+++ b/virtual/perl-version/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-version-0.991.600-r1.ebuild 583 BLAKE2B b4576b739d84a190225e6d2d8aa0849fb17171dafb3d05f74e182e67072b857c60aeb753c8ed28138046a2dd674fb8e5e8ea864204f80d5a8c477cf224eb6be3 SHA512 98e4460fe1c4918389cd708d867023ad560bb3ff8531b2c080393c2a3d7f6d8ee30f167499dae7f320cfae7164480b6024433047d1122980aae55afe828cc425
+EBUILD perl-version-0.991.600-r1.ebuild 580 BLAKE2B f7c4714545c64c7e8d00b25b91b8513d40dc2ee5e9cc597f47e4f2930f902da424bdde442bedeb1995af8d4adc18bb6d1d9676741006daba6687da924f805237 SHA512 e0ec3920baa0c718da2a2203da7492d4b243dbc0a8393841c6ac02f05b06b44998cdaced72f38ebafabd534e152a769b6c01d6fc14f8890d12e0507a1a653b11
 EBUILD perl-version-0.991.700.ebuild 593 BLAKE2B 2c774481becb19cec0f0f7685f0a6231f1c420c5792d673212d5c35c587a6e941512872ab26d6fac2adc97eaded6ad16d2db28e20133772024a96c06d33ee980 SHA512 96fa3a6e4c1dd697948535ac8a9421802b5f00f6bbd6b0faa1201a11516a9f5cb6818d94eb577c4f1f2e28b0ac7944fa98589d3f8a2f31d1eb254d810099a41f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-version/perl-version-0.991.600-r1.ebuild b/virtual/perl-version/perl-version-0.991.600-r1.ebuild
index 75fc3ce60510..fc9869aba360 100644
--- a/virtual/perl-version/perl-version-0.991.600-r1.ebuild
+++ b/virtual/perl-version/perl-version-0.991.600-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 39a8e73d1e36..b350f7f7bf78 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d906f0101929..adee68d0dc4b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,9 +17,9 @@ DIST chromium-64.0.3282.39.tar.xz 482357636 BLAKE2B 7e7209aa1c4584210b552e82b29c
 DIST chromium-64.0.3282.71.tar.xz 482134720 BLAKE2B 691e33c396fde798985af96168a7b7aa92e3c90bc542c6e84df1b41a74ae0f8cb7364edfcf148db48971dabd5b2af422d884a36528b5549ec2fd52f5e6d7f643 SHA512 90fff36292898e47a2c47940efadc98b7099cdfdd8df4659b5e1ba327e26230919dc1e9e21a4496207cf88f9976d048dd2f200424224f2bc25e7ee9ab2755f06
 DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a
 DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
-EBUILD chromium-63.0.3239.108.ebuild 19803 BLAKE2B 73af81867e2ab507a278c3593f4afa0c909b17c9484ab099fbd66727e041e5b5d43f56eb54481d9b02337f01bc77e99ada86ac5fe2cea4eecfdd585780ec921c SHA512 b5618590a4692c81bca8cd92dea99788f51502fe9d7fe352a8d520f8733c5fed0ef0f3a456fcce6b91545550abd998f80cbd0fdab132bb9295a13d6169191939
+EBUILD chromium-63.0.3239.108.ebuild 19852 BLAKE2B dcdf02aa189a5a184395d69a4e4d854d1860453a257b59e0393104a628c3603c1f717fab4803785b87a22bc4d9ea66c3de88cc9f5f3b1b44e08871f210b04314 SHA512 889e192997c46188590b5ede0b79c1a5abe9bff0bc7b4e1464b6cebad494d26158977d942764d143c36a475063d97aaee925d7d1155e5cfb74d654fd82fc348f
 EBUILD chromium-64.0.3282.39.ebuild 20150 BLAKE2B 52ac5f763b1d62a3fa0b22401aadd7a9988945dc2ca1b1631f56f5f82df00a66a563aa0ac2b9e7a5f186dbb7bdbb1f945749e1c8bdc74d22dd51fe1e5c112c75 SHA512 fc1fc03574c94fb0b2e2b4e4e13907fa8724f01b1cb1f11869610e417663b6867ff994ecd95e508dff8f4e95c8127f36431368aa1b28b695e175ef1c92e2257f
-EBUILD chromium-64.0.3282.71.ebuild 20294 BLAKE2B fc41547b4c9db2630bdf2e1a63a448061ea7149cc717239c6019913c69da81c2f21a912efb7f45123cd9b344e857f0d543bb61374d7cff0a7047bdf61a101004 SHA512 262c28a43f1b33118fbb3523f884c1446aed69a75074db144ad0ecff8d239e9eac0c28e77d211159eaff5a0d97a203ddc5f836de16b429dc91accfcdcd535978
+EBUILD chromium-64.0.3282.71.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
 EBUILD chromium-65.0.3294.5.ebuild 20338 BLAKE2B a992c3d16e340f53ed575941b7ec48c8a254286be84f468f93e45eab707f95e13dde6c70c67296239e83defd5a7552cea527057e9733020ed575dd5aba8d7276 SHA512 f5b8fa9c52c98d601c4d0848c51789c6cfb3e18f6e0de541add26ef50a78c32fab1e6adcb483db9ad0af35734e77607f010ece461f4f88cce18e4633fae3620b
-EBUILD chromium-65.0.3298.3.ebuild 20429 BLAKE2B efb9bc4383816fa43d0e0f20d5279b5ff0261e272f0a2a86d2ad951a18a7d217ccee6f51025869a6f03baa8878b32f3d006bad23a56bae19c41856a1a1654555 SHA512 20c08e8cfe9453b70d774c5d086681c8936b77740f008978e1c6b3c2a07b8f2051c78298f8a26c75fd269da4a851e57186e8e3930ad100be70f5f3d8eae78e0b
+EBUILD chromium-65.0.3298.3.ebuild 20478 BLAKE2B 6a47301263f82cfbc260e6af2c4234ae70863b904cbdc9a069174ba8e0e195b92331662ff51f412e46a0d622bf9beb70a0900366dbcb54c24170cbdc34d85e13 SHA512 1341dbc98ae59d67db968bea7b41ef9be82e140ff17afbef9d0578cb91bcb82f74f2c411a80c50818dd77a9dd04d792c8a34edd76b485eaab96b9a9354fc6baf
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild b/www-client/chromium/chromium-63.0.3239.108.ebuild
index 3bbcd8dde5be..b696500ab6ef 100644
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.108.ebuild
@@ -611,8 +611,10 @@ src_install() {
 	doins -r out/Release/locales
 	doins -r out/Release/resources
 
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-64.0.3282.71.ebuild b/www-client/chromium/chromium-64.0.3282.71.ebuild
index 54365f906d44..f9d0c892ec16 100644
--- a/www-client/chromium/chromium-64.0.3282.71.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.71.ebuild
@@ -627,8 +627,10 @@ src_install() {
 	doins -r out/Release/locales
 	doins -r out/Release/resources
 
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/chromium/chromium-65.0.3298.3.ebuild b/www-client/chromium/chromium-65.0.3298.3.ebuild
index 9d1cbd868256..33ba5d9ef0ed 100644
--- a/www-client/chromium/chromium-65.0.3298.3.ebuild
+++ b/www-client/chromium/chromium-65.0.3298.3.ebuild
@@ -632,8 +632,10 @@ src_install() {
 	doins -r out/Release/locales
 	doins -r out/Release/resources
 
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
 
 	# Install icons and desktop entry.
 	local branding size
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index a322c81ef1a4..3559f10ce591 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,3 @@
-DIST opera-beta_50.0.2762.42_amd64.deb 52060614 BLAKE2B a27ec203f1b9b38f3ec21385ac54281c4d4b162a5c1b5d7e3f61fbaf7b472b1c1a9b9d40b142d75f4411c90807de6e395f9ef0569137b22bab6057fb06e50c67 SHA512 fa89268fafff3bc484f4b1031a8ade09efa90b53f20651a110468e07ae03008fa48b7c9177cde905c65d4e2eb566fa9f9c1284f70d737fdacc37d7a8d67cd1db
-EBUILD opera-beta-50.0.2762.42.ebuild 2316 BLAKE2B 16b9a357d95903194b5f9571ca6c5a79edf67f97a42910f42ceed7dc9e452f97ae73d8f744869e1fcd278b545b5d82b7296a01c2d7b399ddcda9199e7d43f106 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf
+DIST opera-beta_51.0.2830.2_amd64.deb 52241246 BLAKE2B 5d3430c78a31d1ea24a4ba6a0340ccdbe795f7100c34a261bf771720d0e72a402370b844757dd87fcce95b5816640936b33b9bf3c9fb6a14e098806fd6d4ae1e SHA512 9a1db683ddd72c8f0d8d7b4fad09b1dda2efe3a9734f440109e5701b3cbc0f8f64de62eb86e2f793ffb49928f269cba82093236a771590921db9eaa3ece4d587
+EBUILD opera-beta-51.0.2830.2.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-50.0.2762.42.ebuild b/www-client/opera-beta/opera-beta-50.0.2762.42.ebuild
deleted file mode 100644
index 96ac80993a41..000000000000
--- a/www-client/opera-beta/opera-beta-50.0.2762.42.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 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-beta/opera-beta-51.0.2830.2.ebuild b/www-client/opera-beta/opera-beta-51.0.2830.2.ebuild
new file mode 100644
index 000000000000..308b38bc8be3
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-51.0.2830.2.ebuild
@@ -0,0 +1,114 @@
+# 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/Manifest b/www-client/opera/Manifest
index f5117b136b11..5f3196161f74 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_49.0.2725.64_amd64.deb 51396110 BLAKE2B 30bb45495f444bc0a7dfa0c7c72a72ce9d586a1218bd54ac7485db06fb23f48ab5f50ca21ff76ef8fbf3ae1b86344f283b0972c6b645131a8cbb24a9d22ad055 SHA512 52ce18e0f7ac53b1c17997859dd358576b8798d144cb090fb628eeedb0076a130735488474da47c0d40ec1eb4d1429c76a43c8d2fb7bd64803bed74de87a5d5a
 DIST opera-stable_50.0.2762.45_amd64.deb 52047204 BLAKE2B 61bf2a04621a0cf27f9f73c61e7546544de57939ef29aa4e3b35f2f87cddeeb0ad3a9bcb3e1f2abe549cb5cd39618995c3a6a510a5cca84c70b92df9aa3c669b SHA512 33e2cc771e56c6cba40b7c9d8565f1fdfadc3b87bdccabc29015a879b89e64c5e6dc4c1232831c49be39c974a9f9bc367aaea9ef075320254a2cc141fd3bd5b0
+DIST opera-stable_50.0.2762.58_amd64.deb 52204642 BLAKE2B e06e3118b4e4b5b810aa9c62795dfcd4564edcd50fea95239c92a0d74fd7034f187d0c4ed0e31d7eab106786b50b8989fd77f3701372e7906dd76dea42a6f601 SHA512 14892a66bbd688bef8ed7b36f5bc7a6e2a9fe6d07356a093981f000bb81eb853ae18efd10c019bff9b52005542f7e15946fe7b54295bb6fbf513352899170081
 EBUILD opera-12.16_p1860-r1.ebuild 6115 BLAKE2B 6805a42231575003626bfc50af74664b53d007cc53cf99a215c764b85d68c1ce824a68c909b56c5b96bbcfda0f0d1caa6e21745f38571b563f2221cfda224da4 SHA512 9e280c4b9f15207a476196e103c265de4ecc3a4a36e5fae12d8330b12e85a774a39b6188ba4d13d028ef191b621b69bdecdd7e4362c0c49be689e6be69b46b1a
-EBUILD opera-49.0.2725.64.ebuild 2239 BLAKE2B ade5b050ad9bb2af7e981a6f1c57861ab44afe65605f221874fbb9b8b06e5a74f839f3516179b7b3a50cde40c46283ad7a853df2ebcc124e7838bea3b1578f69 SHA512 d19aa77e5d041a7d738462b2c0b61c8839b61531119b680d82643e599b7b5aaaf9ecd1b5b97515a515ec2059d7f80ec3a5f48fe5b6b35aab507033eaa96006de
 EBUILD opera-50.0.2762.45.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
+EBUILD opera-50.0.2762.58.ebuild 2239 BLAKE2B 48e7340be15efdb6575ba3d2d656ab8e65116a65c8794efbeb68294eab6d5a0dd1e68c4d87eba08d29bb2ac98fd8c7ade6d9b007b347845de8fbad0f990605f8 SHA512 4db8d4a415684f3ee61bb57fe2bfa95a00a7b512d585ab65b93303fccd28b7abb5710a66208a1358afbab0c09f443d60e63926a583193664e39d49e7e16de774
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-49.0.2725.64.ebuild b/www-client/opera/opera-49.0.2725.64.ebuild
deleted file mode 100644
index aead2f06e723..000000000000
--- a/www-client/opera/opera-49.0.2725.64.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 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/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+: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
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-50.0.2762.58.ebuild b/www-client/opera/opera-50.0.2762.58.ebuild
new file mode 100644
index 000000000000..139f6afa7c77
--- /dev/null
+++ b/www-client/opera/opera-50.0.2762.58.ebuild
@@ -0,0 +1,109 @@
+# 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/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+: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
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+
+	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/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e8f56aa8364e..d87d9b5e0e24 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 27aac3b5ee29..2d74ab579226 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -5,7 +5,8 @@ AUX gtkmathview-0.8.0-gcc43.patch 1437 BLAKE2B a4f0cd2d3f0a9efbd1d0dc9c515ca8e28
 AUX gtkmathview-0.8.0-gcc44.patch 263 BLAKE2B cbca90326ff7762ed5685d1e0992b2a50a81f6073792fd60687d4abef51d91bf1f142f56170a955a8d107fd297789061cc2f6952fd1a7f95ab2465080d35742e SHA512 fed98000cd4ac710f8b683fbf2c5a0ecfa4064d56af314e0367e6ae84a7c6fdcc56cefb2a2998854f765783b5c3ce6d930e6969087dd88acef47d4cfb26ef3b6
 AUX gtkmathview-0.8.0-gcc47.patch 3123 BLAKE2B 8d2d93dcc3d0935ee4bbeaaec699e7dc334198452993e71f4d3bdfd2fa590b184c618f450166c2743acfd831470f6b886e30cda3a77d6c5dd39aeb6361757544 SHA512 e5c7a1d32bd578ad56d5008bd46f99f49a1d292f46b1f525da8f6c4d20b3fde796d93c7520f5161f43dabba7e7275aa1daf990b08d1aad0ac3445af6b9989f5a
 AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de3111a5f12ef0ad0530c0ea6641e07b5fd5fd4cdb3984604ad887ad1b836ddba77300c3e383af0c23f04c15e9add74fba8 SHA512 c2a9d5b1bf14130ddea729a7cbe158f2029ba18ff5c3fd89882e1948e5eb1b903f4f4a7d3c02fb33f9fa9e3dff9db80516a6c3c895daa5f4b5612dfa2e5f4629
+AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9680c670ad51387c0d0f7cd67618fca11d54163b563431c3ae3853ea05ada400627c6dc45b8e00f79f07c050d118073 SHA512 550646e134f43a47dd185b9ac2bb7c1713682685c78feca43fd6371d3e6455d06cb105fac9cc69f624cc8c3fef14d06aeabe91dae35ecdd096901cea9c802b17
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r3.ebuild 1993 BLAKE2B ca3e63019922839bbd5b7634ad9f494a7487e32fdfcbffa9922660547ab311a40aeb3c1ad2395be7ca42fa6c13a7e97f1d8d0075ed5e2f5250f71ca714d17499 SHA512 f4167d1bdbbbb2a970cfc9286e7922880f9a158d97f19a646a2a92fee6abc39aa2452f0b56e6ce3fbb514648d980a15462f291bb55837aaf658ecbfa241f6e77
+EBUILD gtkmathview-0.8.0-r3.ebuild 2067 BLAKE2B 9bcab3945fa6d38b2c57c7d9c3a75939acb05584e0579d1cea09cf05909f0932aa59dfe3752bb527b495bf881ebfcc9c6e8e74474f3c47fe5eb12bf16a212f26 SHA512 2d8ced171ec564d631e1c6e3aefa4ffe4737793beadf3f38f386ac9f89fc73d2bfd6c4543c6ec99c548dd91bde9520e5e38fc9ee7ac051459e38a809029c20d8
 MISC metadata.xml 413 BLAKE2B 795e9acaab179d9cf4e0ab6f3232dbf079b418420a55ff58d06f5b81b2fa785121a6b4bb734f45f4df9b15435b3af8bf26abf773100b70c362a98805057f8a38 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch
new file mode 100644
index 000000000000..917f41bc2889
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch
@@ -0,0 +1,22 @@
+Patch from FreeBSD
+
+--- a/src/widget/gtkmathview_common.cc
++++ b/src/widget/gtkmathview_common.cc
+@@ -909,7 +909,7 @@ gtk_math_view_button_release_event(GtkWi
+ 	  math_view->select_state == SELECT_STATE_NO &&
+ 	  fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
+ 	  fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
+-	  abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE)
++	  abs((long)math_view->button_press_time - (long)event->time) <= CLICK_TIME_RANGE)
+ 	{
+ 	  // the mouse should have not moved more than one pixel in each direction
+ 	  // and the time elapsed from the press event should be no more than 250ms
+@@ -969,7 +969,7 @@ gtk_math_view_motion_notify_event(GtkWid
+       (math_view->select_state == SELECT_STATE_YES ||
+        fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
+        fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||
+-       abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE))
++       abs((long)math_view->button_press_time - (long)event->time) > CLICK_TIME_RANGE))
+     {
+       if (math_view->select_state == SELECT_STATE_NO)
+ 	{
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
index 07ae521431c3..1e4f1c3bf83e 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,6 +44,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-gcc6.patch
+	# Fix building against GCC 7, bug #639448
+	"${FILESDIR}"/${P}-gcc7.patch
 )
 
 src_prepare() {
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 98184db8577b..6a758d3e2430 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -25,5 +25,5 @@ EBUILD wxGTK-3.0.2.0-r3.ebuild 4539 BLAKE2B 2ec974f3cc0b2e4426030ca1a16564e2c9e2
 EBUILD wxGTK-3.0.2.0-r300.ebuild 5062 BLAKE2B 971833ccf9e6b4761f5760a6f9ea2e060df4efcf2ba36b19351499413dee08fbe573f18a2b044e18438639d663cda6ab4e67b40951818c20ebb50bb2b7f1eadf SHA512 666d0c45c7711fa5883e5b5b99a0b84e3e85ef1a1060ebff57e14f562c0f6d17de0605507bdb6c90483d8c516917d7620aad9ed213dcca613b1c1d2326799531
 EBUILD wxGTK-3.0.2.0-r301.ebuild 5292 BLAKE2B 9ff8380ead99e923c1fdb32066d9519400321918011c94012117be87dd524e787d418a9434f5a1eb6443c9b44db68f7360c725f8cc8869141027ccc394c6f5cc SHA512 309f9f41afc1fff5001f9a01189c022bb9c40a2f4bfb66dfc4f41361cff9e6214f68f5f5110364b53dab3cdb0c28c7b1bb96893262829c3f54301f5e8723a970
 EBUILD wxGTK-3.0.3-r300.ebuild 5176 BLAKE2B 80083420300535ba88704b9c25271931de3ce9da76ac40db0aae31cafccf5794fb737e10bb1ebd0f4a443d73a0cfbc510228d056ffc367ac8d9872beae59d870 SHA512 bc531ed938cc83bbd6ec1fcd30b71991f718cafdc6e6701ce9fa8b32e5f937feac8dbf1092fc87b3b41112ddb9fae5b7ba7dd95cb88b5df9f5da89588387fd80
-EBUILD wxGTK-3.0.3.ebuild 4101 BLAKE2B e1243c6ecc5dba146893ae111061d850a0a0b36c76a9d20ac5721919c3a809d26fd38cb113a445f8b6749bae6e30fb28a47cc908db3c8c60328400b28dd45593 SHA512 5e7c29b06aa73476935a76571448ec5a284b873e5ab469f2874fba7efa890b48dd9371784f733895ff3d237b333d36cd101f16be31c08dbd8123bdd3f2026d46
+EBUILD wxGTK-3.0.3.ebuild 4100 BLAKE2B 9dbb3627f0e19b6eb9be35c536adbba0af8523da99320759c7ccbf1e0862e7c1ca769662cb06f2e99e60819ad8dc484c26c7984be80fd0c30ba1cdd31f89b352 SHA512 d288ea76dcac332438e33ca3c72ab46fb9bd8dcd0ac42677638b60b094d4375419147846d4fee39885066ddec69ef9afb941e2d3c6cf9b9d9cf59739d5c38479
 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index 987bcd123555..135db8994cc8 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 48f83b079602..49fa92da78ae 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest
index fba522c0b069..fe31e7261344 100644
--- a/x11-misc/qxkb/Manifest
+++ b/x11-misc/qxkb/Manifest
@@ -1,5 +1,3 @@
-DIST qxkb-0.4.6.tar.gz 177857 BLAKE2B c0af941944f89920de4b8ffd903b06ab4762c0206e6678f857a6028579ca3c539507d08fe45bfa00b3a0ddefc67025057b3021fcc4194a2dca70ccdbe4111ada SHA512 8a6eae536291e0a0925d5b4ea47bdf74fb5809b892f3d204e7ec4ef6ce549f1f65693363dce0317d41e10739a1aa95aa200a706b40eb909c6e9baa96596e0da0
 DIST qxkb-0.5.1_pre20150305.tar.gz 176169 BLAKE2B 13b61c951b0cbbee025a78806afc4999e1d63dcc979f43d78218ff8ef6552a1f8057d704560dcf569863c0b2b46e8c3ce292e98fc77f7acfc3f92fc9fdc68a05 SHA512 bfb16af22e12977432a77814ad5d3e8f5ed91c46b885505bba242eb864795837ed09cdd97ac3161f9c82a142ed7fe1d4b37e8d3aa8990cedf956904da290ab44
-EBUILD qxkb-0.4.6.ebuild 595 BLAKE2B d386233552ef4dcb96e8ea85431ed3bef4eb954cab077b491b224a7425fa5f9a15aa4ec58eea71a8bc90ecb51d6c8b6d0644dc71f2be23e553cfd9a4324cd9fc SHA512 830c5116143ab8d83f05224e800d38cf02913d0ae3088587f14cb54857815033fa7116949138f0aafcc163fb9f109f3c96b2946633eaf81b8cbb2b35c473863b
 EBUILD qxkb-0.5.1_pre20150305.ebuild 739 BLAKE2B e80eb56a35df8dfaf173b15f2ac3a7ff273c85402608359a8fe1201d7c267338e242cdcfd905e7182485b26611d2b878b855600078476a4120638053d1f96456 SHA512 5b5da2f2de919bfe8318100060ba15c308565267685188b825aec8d1f6fae48863b88b215f4fb31025ec6a7b0a221cdfc7a7155adbf10ba99f63dc97c785a496
 MISC metadata.xml 323 BLAKE2B bafea289cd876df5467aacfe957ece4a4432d3d93bc8bd4b2bbb78f152fae1b661a0f8a8bc23fe6828a753f9a83c26c97b11378fbb75559cba0ae2417145e44a SHA512 57a0ffd3dd0fa5bfd23de1417c061bd7c2b21c7ded7ddedaf09cd807d9dac8708d3b868d20c0108aa94a228cf8296e45edd6562f7d520760cbf7ee0f25a93509
diff --git a/x11-misc/qxkb/qxkb-0.4.6.ebuild b/x11-misc/qxkb/qxkb-0.4.6.ebuild
deleted file mode 100644
index f9ae5509e25e..000000000000
--- a/x11-misc/qxkb/qxkb-0.4.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based keyboard layout switcher"
-HOMEPAGE="https://github.com/disels/qxkb"
-SRC_URI="https://github.com/disels/qxkb/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	x11-libs/libxkbfile"
-RDEPEND="${DEPEND}
-	x11-apps/setxkbmap"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index ae5946b0aea0..5afcd8424550 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,5 @@
 DIST screengrab-1.2.1.tar.gz 156692 BLAKE2B 481a989de626a8307544ba8dd55bde95019c646fa238657543b024c34ca9c0cb4ae502acf0dcaeb9a0db8af96e4cef068de20fb3919cfa2745f956a2444a7c2c SHA512 12892eaf33fe48875c1d0dccdc631cc64c246ba2ba10432539099b35e75c36f19c8ff8b97dee959575f214ea852d1afaa9cf46476f98e0978b379a05df101805
 DIST screengrab-1.97.tar.gz 161792 BLAKE2B c2f53cd3d7333d89737ae55753a03de2d3c39f7adcc85f278d54bfb6d734e6f71d9126f035184262bf437e4a5032350f4f7a07060a3eb4014dab15563f78db29 SHA512 4fea4fe68a212ef5436b4f2b2db64e6f830233e5af0cd28259ad84d292e5df6a38e22de1ba40efe083f18ffc973be78aafa0d9eed990229b5e2a8660d1b6ece1
 EBUILD screengrab-1.2.1-r1.ebuild 707 BLAKE2B f9f7ed2d34b20d75db942af7596007184b74c3bf06f0848cb1b6209035c4612768c5ff824369bef21bd9cea4e08da8f81fffecf5674554996066bf501853e935 SHA512 65cde44c9e4b59427eb1e612524ae6af87c666aac8e86cdc7ba7543e2f1e709a4563ffa60da2f08f91a67a4048fbadde5719d210ebef9271a9ebae84b0ac8b06
-EBUILD screengrab-1.97.ebuild 717 BLAKE2B 71db47faf7b6692e6478518138b305da885f5110c3738a2f038c27a75e234fdf0d825c0b08709e3a551a29fee5d37de5006acb81fbecd027130305e97ec5b83b SHA512 fba18f9484925df7c0a388ae73f5e01d6962dc7b31f4a1b5fe03b6b606b2ddfdf5bc15140d6788ec3379a2f31ea72adedf0a30e18ba46a1c2866e625cdaf3948
+EBUILD screengrab-1.97.ebuild 720 BLAKE2B d04845edffa7d7380476f0026cccbe2dbad20f9271300f0c30513f412f52b8b899da9333fab7f6c6feb5fb0ea3e35ad236adcf16916ba45bae04a9be27a299e7 SHA512 afb366bed856d58deabe293a591b29e774c4a65ebf52fe69d6a77e7891bce528a3faae78fdedee6183a0020fdee6a18adbc3b0679185281a732f0c85c8f1449e
 MISC metadata.xml 444 BLAKE2B 2fb0a84a26a3063f8bbd3b1ad9857b358935de8e262b5ad60be88e62f36568c4fc2e0f5f42728de6e414ee21ec14ea61b14515fee9711e10ea5ab9bb2b998e1a SHA512 7fd9195b7a9cf80ebcf7b845bb8a85adbf2ea5c83988ea389c10a7c56300fd0678ff901eecf907afa755500b3cf18b6a165fa2587ad9dcbd234f36a4c4254956
diff --git a/x11-misc/screengrab/screengrab-1.97.ebuild b/x11-misc/screengrab/screengrab-1.97.ebuild
index 65a4bfad7a1d..af621c5c6208 100644
--- a/x11-misc/screengrab/screengrab-1.97.ebuild
+++ b/x11-misc/screengrab/screengrab-1.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtnetwork:5
-	kde-frameworks/kwindowsystem:5
+	kde-frameworks/kwindowsystem:5[X]
 	x11-libs/libxcb
 	x11-libs/libX11
 "
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 2fb71ce4f9b2..2f6012f1e786 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 9c069484efa3..1bbc26350aeb 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,10 +2,13 @@ AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff613225
 AUX 0.94-session.patch 496 BLAKE2B 8cfa12992bbecb5e45a191728f592296052f517dc58040e0935eec2a20b71301fb13e84ecf9112d16a1a26f6bfd60f36de170e375cf51ad8dcc06108799835f7 SHA512 3a753cfe2be04132229327167d120c35814a9cdaf2eae2837eb4d294e90ce07ece7a6e4fbb69129474967fab3ad14e596d6c5a4eab55c909e234d19801aaaaae
 AUX terminator-0.97-brightness.patch 1622 BLAKE2B 96e276b181be412349289f579febb3b9c2cb2065a74665de1e0ce41a2f11391bc2be890071e9055ced87e9381cd5cba1929fd4b89146eb98ec80ff8cf754dbe1 SHA512 d87fbce864014d32ba57d3c81664384a13faacb7fb5b890b3eb524c915b505a98a86222700e22c6fce81031fa2b262d4830fb9ae608d5078608bb4a3507e4973
 AUX terminator-1.0-desktop.patch 302 BLAKE2B 37a78bce91534c98b79bdcde7ee2a73d25ac3cb14c90abc2d292d20e9b19c140d7c905ea4fa4b64646e97d9f66bd16281c41c6d473dd9cda218b6c1fc107c5aa SHA512 5da00b0117de9f8c56fee033685d28caaf2ca3b3926fcd9317113d397289fa79fa74912acbd9cd343efcac3fcf4b79d4374ccadf0f715de38ef046229e442a66
+AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 DIST terminator-0.97.tar.gz 5025337 BLAKE2B 2d220166d76d0d5380f3541f2a0817cf22d6b04272af6970d76bd2ff1cd0b120b9f2766ee79d099a9ccbdf4c78dca917a87907b02ee03a21b16e3cc2f85a3806 SHA512 ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470
 DIST terminator-0.98.tar.gz 6007243 BLAKE2B 852182a52470646dc11a44b6d2ba4e3002bcdaef3482117ff2d5da6c5b6f96d00f0bb3e5e051c46f98a8e5f59d81aab9ccef0942f45da355ca4d0e4418c3eb43 SHA512 c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573
 DIST terminator-1.0.tar.gz 881675 BLAKE2B 89c89f24c7950c7a7589a051d1deaf1198c519d31a4c887c0205df6ce30f66fd557acfa7c5d16a70c0a8e4e388efcb4f4125c9f7315aeb81fd4e98bac9b4d1e7 SHA512 5dbd7463dd8eca2f3554d7d51ae4b8745279485f39b3160feff93c8a02e5e753fff24ecbeaed756320e8ef3e58f14f2c367efa41180224176cff49eaed04d590
+DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
 EBUILD terminator-0.97-r1.ebuild 1265 BLAKE2B 191cbf1a093852ccf08896625dcb429cd0267b31d229e2d8f687896ba975a2871b697a96cbf4064a7e8b92e49c96211bee3b0f80768f8ec23c41efb54a54d06b SHA512 6c7e0b90ab14481f56ef9d62f2722abfca52dcd130dff9721843b4969ea7dfc2d8ff6e220a483b3d104683391447c38ec1c9899efce4abdcd0d1eef5bb2aaba1
 EBUILD terminator-0.98.ebuild 1472 BLAKE2B 43c51165bee42fb823370b85d3b2532c92197e7340076b9e7274aa31831b85cbc652e51b38b897440f4ebd58581c23864b605eca9b4940f9e903c76ee1baed5c SHA512 f51c25917604d8eeea36251dd633dc028464c140ace44fff8bead72f15f84958b571f77b1f18335d932e23bc543302c87d258dbe00e36870fa70236d83b04759
 EBUILD terminator-1.0.ebuild 1528 BLAKE2B ebaa6fded528b809a6275f1105fcff2fb8e7bf66f9173ce044c11987d8ca09dcb4956d1c15972137217842ef9beea65f77e14811f72552e7310e63b57452536a SHA512 4e77c853bba93727f04eb1b3c46d9086e1933d73e18fdcbf3441b7d7a5ee817d7c5eb76f4b558c0dbe4682aaa630722eddf1a76d9f01455bd543726b7b44d6d4
-MISC metadata.xml 724 BLAKE2B 3b37e0ff3700488ba09b40bff1ab1f4da02b124945611bf67ab6a791cebaf712d9f54f90e61391fa45879b3cffb066b4485577f98e6befa32f6a37a4cfa293e7 SHA512 368312b4fd4993bac07293d0884a2e9398c1e76577424558f9e9a00de6e1119f24f1c0f07a89a7606766ed01c5e5569ba50eac51c98229677ee4762a05ac1185
+EBUILD terminator-1.91.ebuild 1324 BLAKE2B d2791882a3c1e695b9925043f4b9d3db317ec2abec55e4771e0ff7e3708847718d10477be15f3bd824bae6f3beb34ac5f824f98fd0c09166f5b0ed2f5f74289a SHA512 36f14e66f1921550bac93f98ac94da8803c138e33a53bed25ef0c9830df804fea5b7f8b122672bb864bd807e3dffc2dd47b42e257fcbbf736507885da38d7c17
+MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b
diff --git a/x11-terms/terminator/files/terminator-1.91-desktop.patch b/x11-terms/terminator/files/terminator-1.91-desktop.patch
new file mode 100644
index 000000000000..4cbbfa4626d2
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-desktop.patch
@@ -0,0 +1,12 @@
+--- a/data/terminator.desktop.in
++++ b/data/terminator.desktop.in
+@@ -9,8 +9,8 @@
+ StartupNotify=true
+ X-Ubuntu-Gettext-Domain=terminator
+ X-Ayatana-Desktop-Shortcuts=NewWindow;
+ Keywords=terminal;shell;prompt;command;commandline;
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open a New Window
+ Exec=terminator
+ TargetEnvironment=Unity
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index c129c91cdf5c..44b22d322ad3 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<longdescription>
 		Much of the behaviour of Terminator is based on GNOME Terminal, and
 		we are adding more features from that as time goes by, but we also
diff --git a/x11-terms/terminator/terminator-1.91.ebuild b/x11-terms/terminator/terminator-1.91.ebuild
new file mode 100644
index 000000000000..727c4abd75ab
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.91.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="https://launchpad.net/terminator/"
+SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +libnotify"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.16:3
+	>=dev-libs/glib-2.32:2
+	dev-libs/keybinder:3[introspection]
+	dev-python/psutil
+	x11-libs/vte:2.91[introspection]
+	dbus? ( sys-apps/dbus )
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	libnotify? (
+		dev-python/notify-python[${PYTHON_USEDEP}]
+		x11-libs/libnotify[introspection]
+	)
+"
+DEPEND="
+	dev-util/intltool
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.90-without-icon-cache.patch
+		"${FILESDIR}"/${P}-desktop.patch
+	)
+
+	local i p
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		pushd "${S}"/po > /dev/null
+		strip-linguas -i .
+		for i in *.po; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				rm ${i} || die
+			fi
+		done
+		popd > /dev/null
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="esetup.py"
+	virtualmake test
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 53555ff16ffc..0e5d53228840 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,7 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
-DIST xterm-328.tgz 1264517 BLAKE2B 7ac6ff7b6e576c0c9a7fb5d096f9aabfd9cd7fe1ddb31a23322a510ce37e7d305231e85ac5085b1543cd0028eb53997c55eca076d22975901881454f1fb5ce71 SHA512 4f3381440394e0cd2d6c4d6645573ab2eac1c1c98e510eb0b3281ed4d2b1082e57ae58b7f756a03704eb275925ae497a1ae6c5907d6ba1b8ec95f92eaf939656
-DIST xterm-329.tgz 1265450 BLAKE2B acfe00128978aae4fd26d7a116137d1d08a8fdf3bcd1b0171ef3082919c9e3c1f07d8fbde8dc1d7f5cc0561fdada1ac8bdb1cae75e26e4a5a2c6e84ac857f4f9 SHA512 b6d68bde0796dc6848c02bb0f780b778226e110e7b495fd8c8d45870b1e78b1b91263a45748ef0fbfbd3a7262f4af78daeca07984c3f4cba4c5da67c4c3f0347
 DIST xterm-330.tgz 1273183 BLAKE2B 5a73e251d3c19ed8591962eb280922c89ad8c67b6970d33e83a8900c6aa349e042ef911ccbdecb8d00addbd0f748bca79c34480bccc746675f837313bab3bfd3 SHA512 3886745179ebabc10feea401444a153dc3f9e5f4c91da381870857fe21f514e0e975193af498b7c2b365602f833dd08e6c706e25cfc1e687d565125672136b62
+DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347
 EBUILD xterm-327.ebuild 2630 BLAKE2B aadb3fd9282689da927791112f29e4a7f6c702a7c2c4288619dff490f826b72cf1b626c262888430d8fb86cfa44e7d39aa80b42a81ace9c7a8eced115c9daf2a SHA512 e6a979b95b5df8a3abcaaffc5de491feec31b6ab0a24b338612605e4916eb8e7c4384912f2c33a1f47372c144288dff5c6ef6df19c2711ceb11513a4c78f1f88
-EBUILD xterm-328.ebuild 2639 BLAKE2B 650bdbd7a9303650fbee72b2c8af3746c63ba61d4099e836a51d66af8f22ae9e9c460595361d778c9770961ab662e4861e2cb37422bafb0b6b78c24b44fb06e0 SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501
-EBUILD xterm-329.ebuild 2639 BLAKE2B 650bdbd7a9303650fbee72b2c8af3746c63ba61d4099e836a51d66af8f22ae9e9c460595361d778c9770961ab662e4861e2cb37422bafb0b6b78c24b44fb06e0 SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501
 EBUILD xterm-330.ebuild 2639 BLAKE2B 650bdbd7a9303650fbee72b2c8af3746c63ba61d4099e836a51d66af8f22ae9e9c460595361d778c9770961ab662e4861e2cb37422bafb0b6b78c24b44fb06e0 SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501
+EBUILD xterm-331.ebuild 2639 BLAKE2B d312fa6e6771dec3f1da74bc094b28cfdda22ebbf67b1564e7b3a0eacfca34ef79c3bbaf141e76107739d05bd2ad20d6eafbb37ccd7a48f52764325f6e0b4d2a SHA512 eb9f13ef78487c7850aa1db64af74ebde33587d38954a5663d427aec7ad69a10ecef35dcc4d1341406718accd9821a70cdf8588c3429000e1c9efbdb3ffd70cf
 MISC metadata.xml 404 BLAKE2B 675f80c795392f88f38bde9e8cfc1a83632e830245baf8d35bc0836fb302897c0eb5065156733831e2b23da0ce916fe6353efa3aebe2b90159fc9b1e587264cb SHA512 2f6acf3970872f23aa82f12b76fce6758d579aaaf7d988b8a2b75d9d845528fef5d50faafa5de1d3e49262dda8b706107902beac035a5ff1fb171d35aaa2dd08
diff --git a/x11-terms/xterm/xterm-328.ebuild b/x11-terms/xterm/xterm-328.ebuild
deleted file mode 100644
index 1dfbec154c2a..000000000000
--- a/x11-terms/xterm/xterm-328.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-proto/kbproto
-	x11-proto/xproto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults="${DEFAULTS_DIR}" \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		$(use_with xinerama) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable openpty) \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	default
-
-	dohtml xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-329.ebuild b/x11-terms/xterm/xterm-329.ebuild
deleted file mode 100644
index 1dfbec154c2a..000000000000
--- a/x11-terms/xterm/xterm-329.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-proto/kbproto
-	x11-proto/xproto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults="${DEFAULTS_DIR}" \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		$(use_with xinerama) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable openpty) \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	default
-
-	dohtml xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-331.ebuild b/x11-terms/xterm/xterm-331.ebuild
new file mode 100644
index 000000000000..c9683e8dda78
--- /dev/null
+++ b/x11-terms/xterm/xterm-331.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/kbproto
+	x11-proto/xproto"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	econf \
+		--libdir="${EPREFIX}"/etc \
+		--disable-full-tgetent \
+		--with-app-defaults="${DEFAULTS_DIR}" \
+		--disable-setuid \
+		--disable-setgid \
+		--with-utempter \
+		--with-x \
+		$(use_with Xaw3d) \
+		$(use_with xinerama) \
+		--disable-imake \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-exec-xterm \
+		$(use_enable truetype freetype) \
+		--enable-i18n \
+		--enable-load-vt-fonts \
+		--enable-logging \
+		$(use_enable openpty) \
+		$(use_enable toolbar) \
+		$(use_enable unicode mini-luit) \
+		$(use_enable unicode luit) \
+		--enable-wide-chars \
+		--enable-dabbrev \
+		--enable-warnings
+}
+
+src_install() {
+	default
+
+	dohtml xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}