gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /kde-apps
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
761 files changed, 2942 insertions, 3379 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 8c20d4cfb1f6..90315d2bbde1 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 354d88dd4e89..228b0351673c 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-18.04.3.tar.xz 335956 BLAKE2B bc7e59e3065b7e7550aa88d0e0210861cb599a393bfedbc7121a4db93e8c7e1585f82d6542f9b21bbaf61021fc696bd045ddf834efa746db936e93ee36f9a0c1 SHA512 f062222a7accf95611296830ffbc0cb1a6ac1fa48e5eddbb9bcb6b9d8a5969e393308da25ac9a636cc79baf454ee75670713720fce1c5c270d7c1c3ca3e3f26e
 DIST akonadi-calendar-18.08.3.tar.xz 334940 BLAKE2B cb72c25a975b8934759ec0690d910ebf8592da0e304b888f270402103e93131dd7e35153f2f16e10641071b2c9d90652291eddf3c0203cd871369a79cd8b2a27 SHA512 809af85d7b2c5defa5fbb4e846008300e431a5a4c55844656256384b52db1f4e711b51c22fd3e653165b1d5298b43e86dba111f688ff4158f64778b11f32786d
-EBUILD akonadi-calendar-18.04.3.ebuild 1155 BLAKE2B fbd50b9902607eabe6fa5984436aefa4ba2ce15af282718ed1ddb526bf204c2d54c777bd7976aeaf746b8eb399b18b6041212b20a0a3fd2541ed1e4cf77827f9 SHA512 1e419fc8296447fac68f95291156d6e7d12247c6f67d4b1cd8907763b05cda30ad3599ad337a6db3c5d34424fb46994ffa6d1fb93e8b6246c649044c887428f8
-EBUILD akonadi-calendar-18.08.3.ebuild 1154 BLAKE2B 26cc1d4f844fa5662260aa5d71d402ddbdc850b6725a93836a566a30870f6e989b92677659723e53fb736f9b8825224ba70353f3b0cc9729899bd4ba6bfbafa2 SHA512 02206b95c7ea95f55dd9c1e9fd66318f352ec4fefc4c6a94f827f418ff1e1a2c05b183f912e052b57c60218d314aaede3ed96f3271e531c6406c217fe1adfb01
+DIST akonadi-calendar-18.12.0.tar.xz 333476 BLAKE2B ad4f8639bbb5cb1c3365a357f04781e6383d41a28ecbbb5c32db6c82ca09df0847815431e0b1866c38ef2d2d23d4d0d267126473d96829662ab29f5c012360fc SHA512 3c4bd2ee46696a0ba3c84ad49bf5a57d6d6f3c0d8df07c439925eeb8ef39c4e903f7fa41262be1d9545ce9af0b289865021182a2b538d9eae99fb78826243e0c
+EBUILD akonadi-calendar-18.08.3.ebuild 1152 BLAKE2B 5a2e26fb499e7a15a1eb8dcf5ad34dc8898451270a0f40ca130d9f510ab7e3ec3ab15e92daacc5965e9f83c5a3073844d001e7c3bee49e54f9d206a2c4b17235 SHA512 08fa09fc5ca863496af1fcf08680372b32023f178269e83d1b7d41a3cc8fcbdf40241c233de0a2dd5eac0eab0e7d6ad579e060bc90849790db469ad90199176a
+EBUILD akonadi-calendar-18.12.0.ebuild 1154 BLAKE2B 26cc1d4f844fa5662260aa5d71d402ddbdc850b6725a93836a566a30870f6e989b92677659723e53fb736f9b8825224ba70353f3b0cc9729899bd4ba6bfbafa2 SHA512 02206b95c7ea95f55dd9c1e9fd66318f352ec4fefc4c6a94f827f418ff1e1a2c05b183f912e052b57c60218d314aaede3ed96f3271e531c6406c217fe1adfb01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.08.3.ebuild
index 4bef336b1cb4..5f210f1253f5 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.08.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for akonadi calendar integration"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.0.ebuild
index c0094a6ea985..4bef336b1cb4 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for akonadi calendar integration"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 6c05e148e064..5a8e88dc4f40 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-contacts-18.04.3.tar.xz 392228 BLAKE2B e56204b67cc0918be38c543aee83cb1a239698d3a2e06e3ea1615456029210d8ac06481a0317158b07a0e801babbf68a5b539592ffb10a05779159656cc5e252 SHA512 3334bad8cf9ee9b79253260ec62cab527d8fe823131fdb212f1e2dcc120892715c24aaf0a5d977939a69d47e458034b405e8be4da27a12022b94488332ae7683
 DIST akonadi-contacts-18.08.3.tar.xz 390352 BLAKE2B 9e0cd84491cf55c92dc16944a0d0a174ab62a4e00c725ca929adc96fe29acd1f17b06079a6b944c3319c8a28d4f39de9712e25f1a1ea9e9479cc6d5f14467fe9 SHA512 8a0c524b896b204824f6d054c00eb07f1e650569bb2635b3a714576fae9ebb1b417d967193701ce1b3ea44f3d11cb336456174b26a6e14ee35adc9b78ab93f1e
-EBUILD akonadi-contacts-18.04.3.ebuild 1061 BLAKE2B fc6d584e48427474a9434d3d85e0702c6b7f2a5fcc8165d7aa2d875325dfe8fc6615cd34c124e3eed38ccfd6887d1604c65996deea1eae6f7dfa58bb2c27656f SHA512 1d24643b16f55976c3e48c0d6becb2416b07235b3c9ee41ca0c20620d9cad590fea4c602280f4bbc5a93ae3b64d2c33fa040efa6fb88b95b309179d838f87377
-EBUILD akonadi-contacts-18.08.3.ebuild 1060 BLAKE2B 515efe61d74f6a9979b657015761aa6b73337ea0709eaecf7677a2d506d2e502cda991ecd1dd89fd67a47eed0f7450a4c7f4fc348f61a428de0a866214f20679 SHA512 43effded22ba5ff3565f6c47cb47f66b8fd4b082f683b4c956d2c3ae51e9877bd7a413e9ac1482597a4c7608903c536c21c3ba8395b2a0dfa27e2b48ec7fe639
+DIST akonadi-contacts-18.12.0.tar.xz 390460 BLAKE2B 32f5f36ec26ca2dfb9982587f91a0c76a2e3d484c06e86543028a3c640c5dadf8cc6cba5883e3ad1df9fd837614cd1f1ca086766472338053fc7a15b7e943d96 SHA512 888b14521a4e40bf68178847b4410638893a4b513088fb1fd6f7a0c28293430289a39b2c2893aed0b2200694e90addf1f6f9ddd229cd7af46b94dcb256456535
+EBUILD akonadi-contacts-18.08.3.ebuild 1058 BLAKE2B 3072fb81ff7e2a85d98d422f7559809773b46ab35fc0b7c91d0c3f5ab2c31951870bf4de4dd997b6ae5fdb6f2f05c4c258804d371aca55a9293110b743316f7e SHA512 4e804fc2aedc708439f0037ab398fcf8f96f722e10e404073ca5125af906c53308343c44d70eceacccff38d96c3872b50454b05fe57e248fa7d693435080b547
+EBUILD akonadi-contacts-18.12.0.ebuild 1060 BLAKE2B 515efe61d74f6a9979b657015761aa6b73337ea0709eaecf7677a2d506d2e502cda991ecd1dd89fd67a47eed0f7450a4c7f4fc348f61a428de0a866214f20679 SHA512 43effded22ba5ff3565f6c47cb47f66b8fd4b082f683b4c956d2c3ae51e9877bd7a413e9ac1482597a4c7608903c536c21c3ba8395b2a0dfa27e2b48ec7fe639
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.08.3.ebuild
index c0e5111519df..992c1fd05708 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.08.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.0.ebuild
index ec0bf1c33489..c0e5111519df 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index dde14f2bbcc8..3feaf63c0b5b 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-import-wizard-18.04.3.tar.xz 436604 BLAKE2B e490232039c094272152b91e4158a70bc4a999de933ee6f76d85dfdea0eda9f7f011e394f050178b398ce1c5c47378cff0415b0f1ccc1a7b93fb03476161a545 SHA512 ca43762f84f2a8df30818ceec0225c105366a68e4d9c0407897c6d4974ff4e1ea40989a500d7c174f4ce94076766d78784dd11a6c60567998237b1477b9e0750
 DIST akonadi-import-wizard-18.08.3.tar.xz 439408 BLAKE2B f77a7ecb7c16dca3999c15fab7a56677b780d9441a746c942b97a3e22d8a296c025dbe0de303b44fbdb748bab64bdfed9f345fb7ff9f87c6856b7cc6c9ac31cc SHA512 603443051fc35e0347ab1f9c40d9f411ae08baca28dda45be76acf6af3cd82bedcbc68d030f88d5aea36df3af11c705e1b0ffa73cf5e81be29f0b614bcf42670
-EBUILD akonadi-import-wizard-18.04.3.ebuild 1092 BLAKE2B a3c04404c27a3c23943e62c613292d92c84b8b7d5dabd7f29e31000622d41f40cdd722413a48e295b75a656b289be45a8acc25fdf4c06c2a39fe179f379cd352 SHA512 850a96332b61d3054856ba2e35863d128a9ba3422fae734f405f273c7d309bdcabc780f6d201d3fc7824be9c6ecaf8c418e5632417229f7690f3f2d1afaed7f1
-EBUILD akonadi-import-wizard-18.08.3.ebuild 1091 BLAKE2B 7b7bc64204263c682ccf02bc601956f8f41a5c0812e9582d21e687a7b22563a5de341f18c5f8a4893ab957d89919da8ab85a2f75c8b3a33aa982eeb0e0298ab7 SHA512 8405d7f8ebb6cd9862688b79c82873938343c09d8906652dd1c529e67f8b3164f3a19683a0946bdca9f9444f5d55071ccec062f2d64d63fa77a49f965eae5600
+DIST akonadi-import-wizard-18.12.0.tar.xz 439196 BLAKE2B cb60cfde396d1de1c9e641725eced239bdef3763852e455dee32001f4c4e4415c826656122270af272c8fa0e7008a8bb3159708e202b90affebe707776206967 SHA512 9681e4bd3be844735d059d9645f0584c5c5a37df864b007ae9d458e10c4e5b5a6715332d9a6333dd3678582b1f1771a65998c1816711337bd8cc4463ce9b89a4
+EBUILD akonadi-import-wizard-18.08.3.ebuild 1089 BLAKE2B b874df23cb23ce80fca984ab385c68e36255fa857dbca8ca7d6d5f68042a0a2dd197deac5a4dea744cc8f1f997fcb280d2d5c8424faee51683329e45d4814709 SHA512 99cbc879dcd86c9987d806f4b275b2a023ca338f321815d16f4e30678d29f28e637865bf61c7485d35153fcd5b4e1c91a88d1057707cbac1a57686611d577d17
+EBUILD akonadi-import-wizard-18.12.0.ebuild 1091 BLAKE2B 7b7bc64204263c682ccf02bc601956f8f41a5c0812e9582d21e687a7b22563a5de341f18c5f8a4893ab957d89919da8ab85a2f75c8b3a33aa982eeb0e0298ab7 SHA512 8405d7f8ebb6cd9862688b79c82873938343c09d8906652dd1c529e67f8b3164f3a19683a0946bdca9f9444f5d55071ccec062f2d64d63fa77a49f965eae5600
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.3.ebuild
index c2952e662b61..14e041463671 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.0.ebuild
index 6945c5158840..c2952e662b61 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index b09951fabe4b..3c742a121762 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-mime-18.04.3.tar.xz 137320 BLAKE2B b25bbd2e20028924b3cbd1a0ca6196ca34c8edc224cb14b431b58f4a3091423398abcb290bad7206dd929120b6e792eb1d33ae1c1326e05999d220130e55fea6 SHA512 85160394bbf9e6d922148ae3adc9cec1d0204a826b05db3c291e81d076cb08a1c14aed1e7ef031da9e0bbf043524f4d314b7f5f23639717b41911cdc2f1c5de2
 DIST akonadi-mime-18.08.3.tar.xz 136796 BLAKE2B 98209c219682ce25a93c562e6f45dfd75c9e0b21f38e9085db51199ed9690f7b621be4aba56c9b13c36cbf791a86f705aa342ea2bfc6277315ee009b8f076e0a SHA512 0db5e96975bf3f295bb98aa5352edaa66fd8da725db2d246c9816362953085f528ee1792e1a1b1cb782d2a6b4aeb654e0ff641a067d0d92c2da9d85769ed6d32
-EBUILD akonadi-mime-18.04.3.ebuild 890 BLAKE2B 6773f862e5404c2d0b76be62be5fd19ba57999bc0ed8926431b4c4a13bb7848a4565041d83a87752aba4aaaae782113df4859d7f90072453f507894e3fe41c14 SHA512 fc86aa337a4295ea96734ace69c925bfd8a9f83bca3e62e4c4b6928d113dd88e22a13cd3cdce41f87907bf28ae03ab1bdaff46dbf04a0f242c7268a4d01e331f
-EBUILD akonadi-mime-18.08.3.ebuild 889 BLAKE2B ce7502540632a199ed05e749101af526b6efc4acc1ac58b0e63259f5bfa7d2d19d3668772bd35f3a92417126e9aff7ada18b23a89334aa0410e9618b49fd7b49 SHA512 319da26441961be7cdb0773de9a2573b0b5dcb4a5c913d3486ec546b932ea1eee68178ab04bcc10acdd67793aa1a9ec6e05982926f61ca23f61421c04437aa53
+DIST akonadi-mime-18.12.0.tar.xz 136556 BLAKE2B 45cf78b2039430faa7b6b3c9def9dca157aacbd9befecb941b5096dd5a109ce903171d9f4b7cc67dd4b3150d7131f238bfe010b021499c7b6c32c094dead7d61 SHA512 4b4d0ca51c20ca56016d8a2f4de04cc5091ae7ee41bf623c5efd72e67e2adb80f5436e35e3e1d0fec831236797bb87ff2c0103dc36715aac3586c395f93b2548
+EBUILD akonadi-mime-18.08.3.ebuild 887 BLAKE2B 13918865cf80b567586cabc31948ae328e081369f40de69b10c4d7cc8badd011607456722cad304833fee66d05ad460247766210d3bdff828357fa78545d36d5 SHA512 f79a651b139b712f744dddec6efa517f1f700e5aa4a0fb6f8b351c807621a097ed23a6f2e8697a93c504c209391b00032c3a3b833effb27f63b7c94d1a4fc6b7
+EBUILD akonadi-mime-18.12.0.ebuild 889 BLAKE2B ce7502540632a199ed05e749101af526b6efc4acc1ac58b0e63259f5bfa7d2d19d3668772bd35f3a92417126e9aff7ada18b23a89334aa0410e9618b49fd7b49 SHA512 319da26441961be7cdb0773de9a2573b0b5dcb4a5c913d3486ec546b932ea1eee68178ab04bcc10acdd67793aa1a9ec6e05982926f61ca23f61421c04437aa53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.08.3.ebuild
index 7c6913370b57..ddd8b18da629 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-18.08.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.04.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.12.0.ebuild
index ae93f2a1efed..7c6913370b57 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-18.04.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 9933d16634d8..aac0210580a2 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-notes-18.04.3.tar.xz 24600 BLAKE2B 4a711c483814e1fc7a7f9931305f472854223e93b931437079c1c11b277d7ac0543827a7403b5bb7c2d10f79e635c5364d24e1a701e0465914b6eb00ebed878a SHA512 0aecf012ae8bc03ffc2ba5ba68893486d4ea91cc2d6efecccc3fc60b7f03a51596475285e0fa2e1b9b025b3b046cdca4f4d248e8aa00fb08c0176269ca067177
 DIST akonadi-notes-18.08.3.tar.xz 24612 BLAKE2B 09bc197ae20d5a7e32c1325e2a21c250a7792829e7f355f6c9a6500ff9f8ef25d01fc8899f57a6499aeca75d116340d1087c323271275bfaebf030960ae293a2 SHA512 a986e64c4706959060d4c7caa897f9fbfbae262cdb4ce2aa687172f136ddeb500eb9a960509b1f573a44beb8f7e25d63075267633cdae7000493fd40c716a6da
-EBUILD akonadi-notes-18.04.3.ebuild 565 BLAKE2B 2c4c204454e138dd32186a05beb3fabdc9e52ab2173c3624c7b3b0eedd6cffdb78b6474731a16ae204d542263086c47e31cfea34aff9343714f856b8b76fe6c8 SHA512 2d16befdb5691c46a816b6c0b659d83f3dee26c9f02704870eeed720a1cbf78012690af2172a4e4194cd0929e71679f074bc6ea7f913663fe83cec665ac3dd98
-EBUILD akonadi-notes-18.08.3.ebuild 564 BLAKE2B 12494f9f224db7dbcee86f89f4e176884dfd4ac4fd41658c9c2d2539635bfb44649fa02550277883844070ab87eba252f783b2fa10c54ab592432f351974e478 SHA512 1c7d060be8957f01649d689123721d1e7f1cd5838c7335997876a04e116e4a56d946d3f11663f90027557a68ff50a7a1756ad10d81cf8fb3b6124e8dafdf1dc2
+DIST akonadi-notes-18.12.0.tar.xz 24472 BLAKE2B d89b2e0a5a5eef866f30c87c482027d62803c3009a8ab7fc80a360791210515cf0a247f8e293641dc05bd72e68f010628a144e0497e6588271010e47ecf0da5b SHA512 2739fcbc75dacb0fafdbf52f9163cb9de81c62ab9deabbd8d011b0da15565223954a75fa17e03c65a943891f985585fcf8bc71db621eae3603837800aff82969
+EBUILD akonadi-notes-18.08.3.ebuild 562 BLAKE2B a7da47b4c1ba282d181191df9c7e2ee98b516e4eeec553def1463ede56ba6d9071e32aa920d86c6ca11d568091ecb980894e701a2dbb6ca08984c86515dddde7 SHA512 8c700f186c11330c407cf6e0b3bd09be26aed0827a77fd2c56dc5d9bc248148b0ad4833d31b282811ef66df77131e4ed6a3c18d3b29fac70451faf08cf56ab61
+EBUILD akonadi-notes-18.12.0.ebuild 564 BLAKE2B 12494f9f224db7dbcee86f89f4e176884dfd4ac4fd41658c9c2d2539635bfb44649fa02550277883844070ab87eba252f783b2fa10c54ab592432f351974e478 SHA512 1c7d060be8957f01649d689123721d1e7f1cd5838c7335997876a04e116e4a56d946d3f11663f90027557a68ff50a7a1756ad10d81cf8fb3b6124e8dafdf1dc2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.08.3.ebuild
index a0fce16b3b97..7c1a9fa3aa3a 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-18.08.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.04.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.12.0.ebuild
index d5d264749f81..a0fce16b3b97 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-18.04.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 3915b84a4478..4b05baf89a68 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,6 @@
-DIST akonadi-search-18.04.3.tar.xz 82440 BLAKE2B 9bd8fb4a8c0e319d8606741efcda247fa4b4bc3c647ecd5dfb2746739bb954e3e2ca68394464fb7c696722eaf5aceeae21e3c68c322c870a1b8af1fd1cc1dcc9 SHA512 5b353542f6e32b9a71ddecf36a358a7e261626e8f58e011d40cdde71afdc7c03abfed5e1b2c047eb7f01a57744b7d2be0af8cf53398f4fabb31413224cb2946e
+AUX akonadi-search-18.12.0-cmake.patch 2096 BLAKE2B 6659077a290eaa582a2eb35df4a02d54d07c700baa833a952e6f59e01a0398fa0caf4d6fe62601683d7f0e7230ab448c67af1b5657a284262431f42bce50fd67 SHA512 02e8394cfaa1d4117a8b7e990779d54335741746cccba06dfd57ea77d2e674cf3b2604adb89198c94e762ed3f36165ba9f009cf737fc0b36c10a6b9177ece205
 DIST akonadi-search-18.08.3.tar.xz 82856 BLAKE2B 9d33e95aedb2b1146b9482d249ef581ab5c02985528de0fb042cbb9e8ace22e0b18f9315dbf8300593e422a5cd1d917fbc7e5e4109727020116acd8c9711b7e3 SHA512 c5808b09527008f73166333833ceec29c269b96f3a1efd47f2f56e8e3e8054cae5aaff6f5c9a58d0311df8f6c5da7f92c38333becb13deeb40ff4a9c925cf670
-EBUILD akonadi-search-18.04.3.ebuild 1073 BLAKE2B 61a3f53f239027c4635498c4c19bc31c70b8d977f01d99d809f82c8a9b349a6ec3bd29e38ed374b2e50cfe7bc77a7c3ef3174c833616a1573ce3e1161c028595 SHA512 2c199dacbba1ae04b6e37aaede09be77e777f2b5e572c961cf840badfe96a46739bb7cb4cb7117e9f770fa0e697978c2318ba1e047772a5bc0239feca1f3311b
-EBUILD akonadi-search-18.08.3.ebuild 1072 BLAKE2B 8b7b0e171b385c5f09e6a78aed93d5baa566723c379423f7234f4d15a135fc4da6e4511b6c1c7892eeec42933e28c3609a7d409068bfa51357d4cd6d4f7329da SHA512 6f06cc0021e6c3ccd7177ed46848c17cbd7b7e545bb798e9d6362fc05a02b6754a49b1bcae1b1d49e82fbc1bd786f08299b4d2f10554e79cfe86b71afbac8a4a
+DIST akonadi-search-18.12.0.tar.xz 82816 BLAKE2B 3d59125598a1a100b0416dba827126c8f921a69d68ac8fabec644d80f0f1eec4ec4fb156d528e1491c9c7ab498b7b80a355abe1eb394b3df11455f46dfe8da7f SHA512 49c6aab6f55eb34debb482307f95d422e7706ee257ddf90684c77ea4f45767282325d05d3284f1336289913f09dbeaa1acc26a6f8d92e303ced7d62bef74ee9c
+EBUILD akonadi-search-18.08.3.ebuild 1070 BLAKE2B db59cbd862c8e83e69989f4dd523a219a7a7382e7dfcb36ef1a21759a949c3822dd6d51c737c679644373d5cd685886363293f1c49a2515e1c6bdf7bf1d2813d SHA512 4f02e14d2a27a250027d9a2e504bd685839d0b23a6504b46e66bc1f0032ec8175e9b6cddf9349036d0deb2273266a2e36c7c900ab162aa10288dec4044dcd199
+EBUILD akonadi-search-18.12.0.ebuild 1116 BLAKE2B aa8757f82d261f09d645b300f34fb753451fc1458a12e163abc5d61b0552698c743cee34bbe88ebc96e3fea7dd19c92df851e2efca5d015f9c21dbc6ea63f734 SHA512 1d978fb1e70708725f3d3a246ef733edee81a68f3fc5aeff4d7b61e06a2ad974941bc5352b46dabea264d58003732e46662bd758a0160286bd3613b126c1beeb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild
index 415aae7b1a24..437596059cf0 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
 HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild
index 2dec1473b6a5..72104375caac 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
 HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -40,3 +40,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
new file mode 100644
index 000000000000..e6a6bd79d45f
--- /dev/null
+++ b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
@@ -0,0 +1,62 @@
+From f5af0d46904125f0c4c874b462c9f44d4688a528 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Dec 2018 14:21:13 +0100
+Subject: [PATCH] Use KF5_MIN_VERSION instead of KF5_VERSION
+
+Summary:
+KF5_VERSION is overridden by first KF5 find_package version found result, which may be higher
+than other installed Frameworks versions at the time, leading to cmake error.
+
+Reviewers: #kde_pim, dvratil
+
+Reviewed By: #kde_pim, dvratil
+
+Subscribers: dvratil, kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D17684
+---
+ CMakeLists.txt | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f54a17f..708a266 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,9 +4,9 @@ set(PIM_VERSION "5.10.0")
+ project(AkonadiSearch VERSION ${PIM_VERSION})
+ 
+ # ECM setup
+-set(KF5_VERSION "5.51.0")
++set(KF5_MIN_VERSION "5.51.0")
+ 
+-find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
++find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ 
+ include(GenerateExportHeader)
+@@ -39,9 +39,9 @@ set(KMIME_LIB_VERSION "5.10.0")
+ set(QT_REQUIRED_VERSION "5.9.0")
+ 
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test)
+-find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config Crash KCMUtils)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n Config Crash DBusAddons KCMUtils KIO)
+ if (AKONADISEARCH_ENABLE_KRUNNER_RUNNER)
+-    find_package(KF5Runner ${KF5_VERSION} REQUIRED)
++    find_package(KF5Runner ${KF5_MIN_VERSION} REQUIRED)
+ endif()
+ 
+ 
+@@ -57,8 +57,6 @@ find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
+ 
+ ecm_setup_version(PROJECT
+     VARIABLE_PREFIX AKONADISEARCH
+-- 
+2.20.1
+
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index cc865f4ffb47..fbe705776107 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
-DIST akonadi-18.04.3.tar.xz 1526416 BLAKE2B 094195355ee2906e85211bedbeb99eb4064b41a37c43d231ddec4e7295182d73fb5da6142fb123484108de0eddd79fb66c2439326cf0e1c0ea52be7a5c6d6173 SHA512 dc4111d2198c5ac8a11613c60e4cc330b1d337179c917354a059c3f843b218e5c465bb44ae924a9db712f985d0d044625a56634481faa474a0e92888d098e49c
 DIST akonadi-18.08.3.tar.xz 1538188 BLAKE2B 333c86802418f86f2336408d1e63ce16a9fc50267f7d5cb39f177eb6aab1ddc8479fa9384f323f8aad0ac4157d8abfe8de237bcc6bd058b19fe596442c7f20e1 SHA512 ba883902ad83c989bb480712c0b3871e683307ecb121f1d7b3e433b9211056cda209d9640a7bae520fb4b6611950863180b879269797a606af2ac25ae4f24cc0
-EBUILD akonadi-18.04.3.ebuild 2913 BLAKE2B 11de71f1612a4719b972280d9d5c790cba36f5e35ea84d7491518a69793df1d782b61ecc893b395c6b6ba510b2e32f78e361713b400d39784958fdeee8fc3253 SHA512 0dd8a2ba7c8452a00d4d349636b8ab42ade6da7c9fe9dfe0742301ce397a20aa811c6018a0a0c027f4b0a9c8583a616fbbcaf8d09f93fa4570b680cd92935699
-EBUILD akonadi-18.08.3.ebuild 2912 BLAKE2B 39f6a54ccc264bf450deaf74063aea4b90efcfde077d9910910ba9ff987e40276c0187750088c3b382f508bd6d6c9bfa8db7b9addc2e00209a3b07b4386d3203 SHA512 64759f5f407f95356387d034adcba3968873697752127281fd93af99aa93ae4713f2e30048b0042737d7e96b40c47a47f41e1db4febc94d4593c58c6fbcac6e4
+DIST akonadi-18.12.0.tar.xz 1552448 BLAKE2B 6c43baecee56ca5131f6bf58e9b6103051316f946a0d7609c5c1a99949ff86caa5b175be1e17de3a466119da92c133c5eae11449ae91c186d3297601714f2938 SHA512 1a37fe66acfe9001ec84849f0abd3a54b38c21421cbec537f86b0af0b30c2120eca8236afeb0d64e795bdfc4f116c6cafb1c2edd92d8ec6208ea5cc2ca642e07
+EBUILD akonadi-18.08.3.ebuild 2910 BLAKE2B 143b2567b8aac042106d3205c56428de0e861999c33e664f5e336aa2bda86ff613fdf51bb5e1535a8e9298caac54d3858e3ace678672a8a5807a075892f4938d SHA512 303dfa503615e1d3e83d66f113d485de8efdd4a1f882f60bc476beb416e2e1c8a55ebcd5383ddb31ce2172352aa7d8f81df8dca6d91eaef97ed8d291331e19c1
+EBUILD akonadi-18.12.0.ebuild 2912 BLAKE2B 39f6a54ccc264bf450deaf74063aea4b90efcfde077d9910910ba9ff987e40276c0187750088c3b382f508bd6d6c9bfa8db7b9addc2e00209a3b07b4386d3203 SHA512 64759f5f407f95356387d034adcba3968873697752127281fd93af99aa93ae4713f2e30048b0042737d7e96b40c47a47f41e1db4febc94d4593c58c6fbcac6e4
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-18.08.3.ebuild b/kde-apps/akonadi/akonadi-18.08.3.ebuild
index 27df4a99621a..6d193b074cd8 100644
--- a/kde-apps/akonadi/akonadi-18.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-18.08.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
diff --git a/kde-apps/akonadi/akonadi-18.04.3.ebuild b/kde-apps/akonadi/akonadi-18.12.0.ebuild
index a520b3ccc387..27df4a99621a 100644
--- a/kde-apps/akonadi/akonadi-18.04.3.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 6c277052c581..4195f5db2791 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
-DIST akonadiconsole-18.04.3.tar.xz 185792 BLAKE2B 7d9a5132a9ada0ff6dd8816e81b26aa21f72ec0a133d64f9d26dd4fe208bf2363477a9cf4c970ac714077c9cbfcbc46a4af6905b854cd5a7edc23d5353738848 SHA512 c413dfc858a6aa496e5533f1f46dc021c9c5e14582924dbc20a696da01035f2d237f30770a238cc33c4e91def9c1a18274e699185fb5bd6fae881c203687c2a4
 DIST akonadiconsole-18.08.3.tar.xz 193796 BLAKE2B ad59e5b0ae87a3fa037c9e82280c0cab44ccf78b9a52b391fdf2ce2bd6853d6c92558f839f4fe5f25d138916fc78b3f84b2a800b1fddeabbf6075c587c476d42 SHA512 73080055011030da4a56b7d4e20b96539913ccbae9fa01146a21cee343c9c9e87a702671f89bb1e09b83ce345805be521f7c9ca17c20c07717b4e87c805dee55
-EBUILD akonadiconsole-18.04.3.ebuild 1224 BLAKE2B da2cafafc1888ded773ab02c76c2418da2afe7c641384d262aba2fc14b6b6f4eb66fca4db394602357ebe383c3c51563f9c6178aa359d20271938b3ba7e72ee0 SHA512 f44f391290590e69a8870be7403864f78b9613c261a5bac3073aaea8d5e921857ff8a70628c3105d34ad97b27f9bad40ff3d1481cc5a5b9f3395048259a962ca
-EBUILD akonadiconsole-18.08.3.ebuild 1223 BLAKE2B 7ab08c5e23efd9b67af82e25e56759b3e17dab7f41377fa3a330484e0cdf90ae58a391f3e531b2d7b5e811abcba2fdad35e3464824b90796832b41975fcb1ade SHA512 8160c02d1043ba7a1f1cbce083ce81a2a4223c0d366f396e259aba23c48c3e19b5a3326cab6af68f3629afa5beed82f08c392ecabad0db4a8f0dffbc554c10ab
+DIST akonadiconsole-18.12.0.tar.xz 193828 BLAKE2B b74fe1f4c362e81a42b230c7af35fa98ce469f2c0098fab924171ad21a8461b9e9117f777e01406912d4c0303b7dfbf2d7f21acef459e3fb8c35ccf07a8efe73 SHA512 bc150f5132216be0af09afb624d3f026febfbaed3fe0c353d3b5ead6f8c1d77e1cb44bbe77bb4a9b5d526091637f461f9661447f9a2d804526ab6f1d9ba31dab
+EBUILD akonadiconsole-18.08.3.ebuild 1221 BLAKE2B 606a9b3851a4915ed72f4ed4b8bf0f0d872be6f1dad08f631c47daf154ba03138c385bacd2df48fc570e50e3c691ef649b7d4927a7c911acf6f905ea201b8ce7 SHA512 773246990be75ec4443c7ed4d0ea822d33ac922196bb27d813e4a70da59d2e49fb65148c35a9eaf53e634b74361e13d3ae272f1541dd98553367677bbeccbdbf
+EBUILD akonadiconsole-18.12.0.ebuild 1223 BLAKE2B 7ab08c5e23efd9b67af82e25e56759b3e17dab7f41377fa3a330484e0cdf90ae58a391f3e531b2d7b5e811abcba2fdad35e3464824b90796832b41975fcb1ade SHA512 8160c02d1043ba7a1f1cbce083ce81a2a4223c0d366f396e259aba23c48c3e19b5a3326cab6af68f3629afa5beed82f08c392ecabad0db4a8f0dffbc554c10ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.08.3.ebuild
index 5f0f8a8085a9..7801255add1f 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-18.08.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.04.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.12.0.ebuild
index 88ea74d72477..5f0f8a8085a9 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-18.04.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index e7f2cc8dd1c1..358ba71ec62e 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,8 +1,7 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
-AUX akregator-18.04.3-syndication.patch 7231 BLAKE2B 1d204766d0d15653fd56db22ca5400537819521dde933f0dd06db3a430b1943e8b8bd94ba8beb5df9b91a0c548ffc1d39431ce639ed707983446b9eeb4a1d2e6 SHA512 d084138db86daf60116252d57fdfc5988fb18f1bc6a75b7898ff73c6c4164e084806c879ce04513293b1c48644a47b74b3a69e867ce7854777e9b9e24cb21fc0
-DIST akregator-18.04.3.tar.xz 2251168 BLAKE2B 9c57a3e125e5bf191df4fc60b9eacb471942735f5f2890a74f8812a97bbaacdbbf537b070d58f73ca054dee6eb42a575168c3061717c0809e79316b74f80fc2d SHA512 d9f1385c1105be62a7c209510e66b8152ddf3928a55210bff82c679602ef630486f9b7cbbc36d4d28183b7f7667049a5b474d953af38aed0bbbe3c7b00732930
+AUX akregator-18.12.0-qt-5.11-crashfix.patch 2918 BLAKE2B c2fac1204d75b46cd4eeda1cbce77c3f167fb06ce0406817ba5c41a173c5d1fd0440755a51903793598c1324b00951f139ffcf8b37dc5edf8fed37de97fa93d9 SHA512 135b67de7c97aa31537553aea2c90aafb02d48427c784e74de1d01513c4e584e94f26923b9950f4bb537fa3468904978f7e334a5a9375d314abdaa5e0239d932
 DIST akregator-18.08.3.tar.xz 2254188 BLAKE2B 42215f5d43490d6cf95808d970ee66d14acdd29b62fb8c575587741ffbaf970b18f1bc67937385d469e39da78a86a1d22b8adb383d7ccb509873d5b0b61b969b SHA512 1033356de9ad97892efe875dd79501d9588f06b24c1ebf86e235851b522878bf46b93dfe02c9d5c08fbd4934bbe65dec9bc20201826fdcc3ed9e1f9b3ea4cdd4
-EBUILD akregator-18.04.3-r1.ebuild 1533 BLAKE2B fc9286fedfa6300d282276eefd037ecccfd75ed806bfabf45af3198886b0928056533b78f88129139089f24390aca448b13eb0e7756b98fe42ae13c35d0dde9c SHA512 9d3fb0f17debaace9481022773da58c672a45ffa525e74679466836c7a2bbeff36944960bfad2c2dde9df9b5cb75054f28fcf7a1720a0352a9efef76383875a5
-EBUILD akregator-18.04.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
-EBUILD akregator-18.08.3.ebuild 1496 BLAKE2B 2aa275f4140b341c7254464cddf083c7a1a8c43ccf2b4c51e6fbc1f510357438065dc4de06accf02611597628567cbc30db4eac97f0a0aaed230ff6abfce74f8 SHA512 37ae3daa459fd264cd157ba6ca97cdb322fda3944c650e4ecdd1fb6d1ca68011fd836175cecb8946699419d24aafb33009a1576ec4c07059900fb3cc65f812b0
+DIST akregator-18.12.0.tar.xz 2189036 BLAKE2B 2b48bce3cc65a0d9a34697f982906cd91a1cb4320a8669dc6453531490de90bae642f4c4bb882b84cdafbdfb0ef2d03e52207e777213ef75153913ed91a085d8 SHA512 b94b7893a5e741848179b7048b21080512be3d7ea0342e870ca413e7f8313a3687e97afda5b20f36ef5ae0ea332fadec294139d9dfd8030dd230b9f0efdaafe2
+EBUILD akregator-18.08.3.ebuild 1494 BLAKE2B bcf2cbd9ad2f7814d17293f44e8e2d6de049844a2360178e46bbd6d861913b163915e574caa6059ddcff29ae81e87fcf127c8fa68f39f7a1c1885d07d74c08f1 SHA512 c37f3316b460efb72a1ba1135c5aea30b4d36beb4d3431e2315ee4e66e908aa5d482b075089abc010e330a847c1d69959acf1d76c64a6a2a4d617bf2fb302b6c
+EBUILD akregator-18.12.0-r1.ebuild 1495 BLAKE2B a4f407b36370d95d33407d894a240c2fa1254e67d20fc1d4128d3c53557088eb623bbeab27e7fd5aecb53719193ddd6296aa1334041eb1c2afe05be1bf58879a SHA512 ddaabdc813be7e4aacc99be8f30ea621730edb65923a5144f0a9c4876f8688fb8006f21c5c126bb2825903645aff0133a440b600aaf869ed319f884ce487607c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-18.04.3.ebuild b/kde-apps/akregator/akregator-18.04.3.ebuild
deleted file mode 100644
index 85f0ff3093b8..000000000000
--- a/kde-apps/akregator/akregator-18.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
diff --git a/kde-apps/akregator/akregator-18.08.3.ebuild b/kde-apps/akregator/akregator-18.08.3.ebuild
index 2f189164e53f..a4fcaa200bfd 100644
--- a/kde-apps/akregator/akregator-18.08.3.ebuild
+++ b/kde-apps/akregator/akregator-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://www.kde.org/applications/internet/akregator"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/akregator/akregator-18.04.3-r1.ebuild b/kde-apps/akregator/akregator-18.12.0-r1.ebuild
index 0458b89e5525..d1132436997b 100644
--- a/kde-apps/akregator/akregator-18.04.3-r1.ebuild
+++ b/kde-apps/akregator/akregator-18.12.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://www.kde.org/applications/internet/akregator"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
@@ -54,7 +54,4 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-17.12.2-crashfix.patch"
-	"${FILESDIR}/${P}-syndication.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-qt-5.11-crashfix.patch" )
diff --git a/kde-apps/akregator/files/akregator-18.04.3-syndication.patch b/kde-apps/akregator/files/akregator-18.04.3-syndication.patch
deleted file mode 100644
index f20f8fffa93e..000000000000
--- a/kde-apps/akregator/files/akregator-18.04.3-syndication.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From d2797fe48b6d4429cd30163fd75003118400511f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Sun, 22 Apr 2018 09:13:45 +0200
-Subject: Port away from remove Syndication API
-
----
- src/CMakeLists.txt         |  1 +
- src/akregator_part.cpp     | 10 ------
- src/feed/feed.cpp          |  3 +-
- src/feed/feedretriever.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++++
- src/feed/feedretriever.h   | 54 ++++++++++++++++++++++++++++++++
- 5 files changed, 135 insertions(+), 11 deletions(-)
- create mode 100644 src/feed/feedretriever.cpp
- create mode 100644 src/feed/feedretriever.h
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 86af10e..312daee 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -86,6 +86,7 @@ set(akregatorprivate_LIB_SRCS
-     article.cpp
-     feed/feed.cpp
-     feed/feedlist.cpp
-+    feed/feedretriever.cpp
-     treenode.cpp
-     treenodevisitor.cpp
-     utils.cpp
-diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
-index 74acfab..afde53f 100644
---- a/src/akregator_part.cpp
-+++ b/src/akregator_part.cpp
-@@ -259,14 +259,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &)
-     connect(m_autosaveTimer, &QTimer::timeout, this, &Part::slotSaveFeedList);
-     m_autosaveTimer->start(5 * 60 * 1000); // 5 minutes
- 
--    QString useragent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION));
--
--    if (!Settings::customUserAgent().isEmpty()) {
--        useragent = Settings::customUserAgent();
--    }
--
--    Syndication::FileRetriever::setUserAgent(useragent);
--
-     loadPlugins(QStringLiteral("extension"));   // FIXME: also unload them!
-     if (mCentralWidget->previousSessionCrashed()) {
-         mCentralWidget->needToRestoreCrashedSession();
-@@ -361,8 +353,6 @@ void Part::slotSettingsChanged()
-         m_actionManager->setTrayIcon(nullptr);
-     }
- 
--    Syndication::FileRetriever::setUseCache(Settings::useHTMLCache());
--
-     const QStringList fonts {
-         Settings::standardFont(),
-         Settings::fixedFont(),
-diff --git a/src/feed/feed.cpp b/src/feed/feed.cpp
-index 87ba473..774f506 100644
---- a/src/feed/feed.cpp
-+++ b/src/feed/feed.cpp
-@@ -36,6 +36,7 @@
- #include "treenodevisitor.h"
- #include "types.h"
- #include "utils.h"
-+#include "feedretriever.h"
- 
- #include <Syndication/Syndication>
- 
-@@ -681,7 +682,7 @@ void Akregator::Feed::tryFetch()
-     d->loader = Syndication::Loader::create(this, SLOT(fetchCompleted(Syndication::Loader *,
-                                                                       Syndication::FeedPtr,
-                                                                       Syndication::ErrorCode)));
--    d->loader->loadFrom(QUrl(d->xmlUrl));
-+    d->loader->loadFrom(QUrl(d->xmlUrl), new FeedRetriever());
- }
- 
- void Akregator::Feed::slotImageFetched(const QPixmap &image)
-diff --git a/src/feed/feedretriever.cpp b/src/feed/feedretriever.cpp
-new file mode 100644
-index 0000000..62526c4
---- /dev/null
-+++ b/src/feed/feedretriever.cpp
-@@ -0,0 +1,78 @@
-+/*
-+    This file is part of Akregator.
-+
-+    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+    As a special exception, permission is given to link this program
-+    with any edition of Qt, and distribute the resulting executable,
-+    without including the source code for Qt in the source distribution.
-+*/
-+
-+#include "feedretriever.h"
-+#include "akregatorconfig.h"
-+#include "akregator-version.h"
-+
-+#include <KIO/StoredTransferJob>
-+
-+#include <QUrl>
-+
-+using namespace Akregator;
-+
-+FeedRetriever::FeedRetriever()
-+    : Syndication::DataRetriever()
-+{
-+}
-+
-+void FeedRetriever::retrieveData(const QUrl &url)
-+{
-+    QString userAgent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION));
-+    if (!Settings::customUserAgent().isEmpty()) {
-+        userAgent = Settings::customUserAgent();
-+    }
-+    bool useCache = Settings::useHTMLCache();
-+
-+    auto job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
-+    job->addMetaData(QStringLiteral("UserAgent"), userAgent);
-+    job->addMetaData(QStringLiteral("cache"), useCache ? QStringLiteral("refresh") : QStringLiteral("reload"));
-+    connect(job, &KJob::result, this, &FeedRetriever::getFinished);
-+    mJob = job;
-+    mJob->start();
-+}
-+
-+int FeedRetriever::errorCode() const
-+{
-+    return mError;
-+}
-+
-+void FeedRetriever::abort()
-+{
-+    if (mJob) {
-+        mJob->kill();
-+        mJob = nullptr;
-+    }
-+}
-+
-+void FeedRetriever::getFinished(KJob *job)
-+{
-+    if (job->error()) {
-+        mError = job->error();
-+        Q_EMIT dataRetrieved({}, false);
-+        return;
-+    }
-+
-+    Q_EMIT dataRetrieved(static_cast<KIO::StoredTransferJob*>(job)->data(), true);
-+}
-diff --git a/src/feed/feedretriever.h b/src/feed/feedretriever.h
-new file mode 100644
-index 0000000..3a0ff3d
---- /dev/null
-+++ b/src/feed/feedretriever.h
-@@ -0,0 +1,54 @@
-+/*
-+    This file is part of Akregator.
-+
-+    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+    As a special exception, permission is given to link this program
-+    with any edition of Qt, and distribute the resulting executable,
-+    without including the source code for Qt in the source distribution.
-+*/
-+
-+#ifndef FEEDRETRIEVER_H_
-+#define FEEDRETRIEVER_H_
-+
-+#include <syndication/dataretriever.h>
-+
-+class KJob;
-+
-+namespace Akregator {
-+
-+class FeedRetriever : public Syndication::DataRetriever
-+{
-+    Q_OBJECT
-+public:
-+    explicit FeedRetriever();
-+
-+    void retrieveData(const QUrl &url) override;
-+    void abort() override;
-+    int errorCode() const override;
-+
-+private Q_SLOTS:
-+    void getFinished(KJob *job);
-+
-+private:
-+    KJob *mJob = nullptr;
-+    int mError = 0;
-+};
-+
-+}
-+
-+#endif
--- 
-cgit v0.11.2
diff --git a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch b/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch
new file mode 100644
index 000000000000..f13512117a90
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch
@@ -0,0 +1,81 @@
+From 91a4ab57a82970bd75eee4a7aee61a7e1c1321ef Mon Sep 17 00:00:00 2001
+From: Andras Mantia <andras@kdab.com>
+Date: Thu, 13 Dec 2018 17:32:52 +0200
+Subject: Don't crash with Qt 5.11+
+
+Summary:
+Based on the patch from https://bugs.kde.org/show_bug.cgi?id=371511
+See also https://bugreports.qt.io/browse/QTBUG-72260
+
+BUG: 371511
+
+Reviewers: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent
+
+Reviewed By: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent
+
+Subscribers: marten, asturmlechner, kfunk, kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D17563
+---
+ .../webengine/articleviewerwebengine.cpp           | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
+index 2463fdf..174c09a 100644
+--- a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
++++ b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
+@@ -46,6 +46,7 @@
+ #include <QMenu>
+ #include <viewerplugintoolmanager.h>
+ #include <QWebEngineProfile>
++#include <QWebEngineUrlRequestInterceptor>
+ 
+ #include <WebEngineViewer/WebHitTestResult>
+ #include <WebEngineViewer/WebHitTest>
+@@ -57,6 +58,19 @@
+ 
+ using namespace Akregator;
+ 
++class AkregatorRequestInterceptor : public QWebEngineUrlRequestInterceptor
++{
++    Q_OBJECT
++
++public:
++    explicit AkregatorRequestInterceptor(QObject *parent = nullptr) : QWebEngineUrlRequestInterceptor(parent) {
++    }
++
++    void interceptRequest(QWebEngineUrlRequestInfo &info) override {
++        Q_UNUSED(info);
++    }
++};
++
+ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent)
+     : WebEngineViewer::WebEngineView(parent)
+     , mActionCollection(ac)
+@@ -64,10 +78,16 @@ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *p
+     , mViewerPluginToolManager(nullptr)
+ {
+     mNetworkAccessManager = new WebEngineViewer::InterceptorManager(this, ac, this);
++
+     QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
+     mPageEngine = new ArticleViewerWebEnginePage(profile, this);
+     profile->setPersistentCookiesPolicy(QWebEngineProfile::ForcePersistentCookies);
+ 
++    // Needed to workaround crash in webengine, see https://bugreports.qt.io/browse/QTBUG-72260
++    auto webEngineUrlInterceptor = new AkregatorRequestInterceptor();
++    profile->setRequestInterceptor(webEngineUrlInterceptor);
++    connect(profile, &QObject::destroyed, webEngineUrlInterceptor, &AkregatorRequestInterceptor::deleteLater);
++
+     setPage(mPageEngine);
+ 
+     connect(this, &ArticleViewerWebEngine::showContextMenu, this, &ArticleViewerWebEngine::slotShowContextMenu);
+@@ -494,3 +514,5 @@ void ArticleViewerWebEngine::slotActivatePlugin(MessageViewer::ViewerPluginInter
+     interface->setUrl(mCurrentUrl);
+     interface->execute();
+ }
++
++#include "articleviewerwebengine.moc"
+-- 
+cgit v1.1
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 0b1777065a92..364fdccfb10a 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
-DIST analitza-18.04.3.tar.xz 331744 BLAKE2B 41f2716cc8b4affb63ef38abccf51f46141588d27dd4a4980f185b02003489fa239ac659d5c030640796473e3adbd37f9579575684dc36ff8b3214fda0252bf7 SHA512 1eabdba287830723ad6d6c30299c6bebe902a5d0236c70c0435a9abb83442604010fdea064e91a023e7fc8a85e32c6ffc83dc9ae31d287cc71a828cd77dd83e9
 DIST analitza-18.08.3.tar.xz 332156 BLAKE2B 6b87393b53e0abe860b218711eab4331efe3dc5b14850c438b6817ef4cfcf097c40027b558e7946dc5c0536e66d76a3a7d83a974e99e2f319bfdc39c4148ca29 SHA512 d511878b34ce8c84a9b637bd095f89f274c13d9bf5f38c5ae9162b576e3639affa4d1c66b30cce403b4d8852705df040c8ad27a8163a4942d420321f43fd8a18
-EBUILD analitza-18.04.3.ebuild 812 BLAKE2B 266c4304bbf2c641f6c7a920266a96c9b318de14cffefda537d363a1daaa14e841e994ecd0aee5f81a28a4b582cd0d11cf91dde00cf2332e7af5a747ed6d33a5 SHA512 d3605937b54067d575f07d1189730ca18d0df4f6d33d2f011ef691a6a48892ee3340da088e873bbd4c4b2f2dd5fab2eab9ed010ef4603aaca881259464cc3ac1
-EBUILD analitza-18.08.3.ebuild 811 BLAKE2B f49dea4e0561473c161de71d3130d95a9f7364acbb23d96bfc2c9cb479c60767ce8756a9e6251a8da33cdc87a112b91a45d722b6e81277c5e69f865d2d89285c SHA512 1e360d8f97c9c750bfece28bad906b24db42fe5ac87a30c6879b8a90211dfe920d663221fc329ed2ac686884ef2f9a6c3004a0e16e1c1f518a40c8b7dfdb8119
+DIST analitza-18.12.0.tar.xz 331900 BLAKE2B 3f638a596e96a840a7253de5f624959d8a728f1c17f0a991649aedadc525586e28df7d1a3a7705ba4cd740be7a64f4df74d9db69a02e6108fb76c6490e199cb1 SHA512 552f391db2482cf3698d6087721ad399db14a86412eb607278112e36b0c6c5770daae34282aaae3e70ca48ea03d600a4bb42f46df75b6302407cf38a89684f75
+EBUILD analitza-18.08.3.ebuild 809 BLAKE2B b40dc166e172592dfb4d1afcc58974bc4c70ca37ac396582fe67e0fd9ae8d59f5ce96044d35f80876894996cd8cc673978fbc3f8a79949b9c3ce8989c0137e35 SHA512 34c7288f71def406a42f8d83457d215342554637fa78976315f29c693e1b886b16110583adc4b22ba08b728873c7c096980a98c3cb3e4ec0ce3bcb62f95cffe6
+EBUILD analitza-18.12.0.ebuild 811 BLAKE2B f49dea4e0561473c161de71d3130d95a9f7364acbb23d96bfc2c9cb479c60767ce8756a9e6251a8da33cdc87a112b91a45d722b6e81277c5e69f865d2d89285c SHA512 1e360d8f97c9c750bfece28bad906b24db42fe5ac87a30c6879b8a90211dfe920d663221fc329ed2ac686884ef2f9a6c3004a0e16e1c1f518a40c8b7dfdb8119
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-18.08.3.ebuild b/kde-apps/analitza/analitza-18.08.3.ebuild
index 9abbdf4500fb..4bb9552e4d60 100644
--- a/kde-apps/analitza/analitza-18.08.3.ebuild
+++ b/kde-apps/analitza/analitza-18.08.3.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="eigen nls"
 
 RDEPEND="
diff --git a/kde-apps/analitza/analitza-18.04.3.ebuild b/kde-apps/analitza/analitza-18.12.0.ebuild
index a942068a8389..9abbdf4500fb 100644
--- a/kde-apps/analitza/analitza-18.04.3.ebuild
+++ b/kde-apps/analitza/analitza-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="eigen nls"
 
 RDEPEND="
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index b9b0f1bef592..be05c92b94cd 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
-DIST ark-18.04.3.tar.xz 1973656 BLAKE2B afa413156233a31a1c7d102799b347b6879453a4c0a870511cb9040c9160c4da4eab30722ad9ec07ec1e9b68e942c137c464e0054738d8ee3632546b49c9dc93 SHA512 39348d3cbd3ed044ecc40a235c3e93dacb638e3ea867f814c722630786fbf7ea48643f967fb46f3358c64966a250306f11ab2a76c9147bc135ba826bcce9d33d
 DIST ark-18.08.3.tar.xz 2580200 BLAKE2B 7ecfcc542d25c0a6ba8639e4a5cd353358d5188077ca309c6fe6dc07288c071083ff7a025d71d489d3fed412c63d69f33d480084afbd015b6c45b64cf08a3286 SHA512 56ec9a592cc0862dfe39dbef424b1fb09e8d32050448558c402b864756e00ba402e9fdec7159e3bd5b7013217f6cf1b33cdd4b0d663a11b8bfe5c4c76535f820
-EBUILD ark-18.04.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
-EBUILD ark-18.08.3.ebuild 1941 BLAKE2B 15f26558b916a7cc7254d2c917f897f98b4e194bc508128c89a965ee7165800ee577328126fe5a3abb0f5e1603204ae953e1059ade52e78b18c6b83276293887 SHA512 dc3c27bfa6c0daf9ec1d01bddd9d7ec6fe92ada7eef5cdc9b180bd06285fd315688693fcfd17edfd4cbc27769df20824e05628676fc64c6b5e75709cd04ff56b
+DIST ark-18.12.0.tar.xz 2580244 BLAKE2B 79f1290ca4dcc40f9b34a838d4fc0165f8d7eb69ed3cf54ffd517b59df5e2df6dc2c627ff0a17db67fb34275638f9d808be512e0faafd89c814c82f154df0989 SHA512 015ae8c9fa8e955c627ff206e9d946ee9f572735f8e05a2a428a029811594eebb5f6354320060b4eca15c7e51d08bea33f8da5ddc8ac4a79fa6901f4b2b597c2
+EBUILD ark-18.08.3.ebuild 1939 BLAKE2B 2d29d45cd0641f924464fd7114d07efba9e7ee1f8263c1d51acfe9d9eb4a60524902e9b27d9957b59ecad1b0ed7c83203eaa0d774cbeca614fa0ec032dab32ca SHA512 2b264044f2c39f3719f62279a83723ecb768bc044c9ecc4aab0a31b1e97cf4da3f7e9f1c404c698d12c73f80399b3cb0a3fecc09952c7c0c6d3396a222f7caf1
+EBUILD ark-18.12.0.ebuild 1997 BLAKE2B ac00df5e9ca6d7986397f28e281615efb883754bf2c5410fa9115905f35935f03f00dcb96aaff2eb11f3bafd3209bb45d1c1fced345f8c8f28042f3fdd445209 SHA512 56f98683635edcfcc8be91418352955d1710e4886b064af836176dcd601343baa6c37ebfa58d785f93bc18c5f69b146cfd8a7df36f708e308c8f5c3914fdc2f9
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-18.08.3.ebuild b/kde-apps/ark/ark-18.08.3.ebuild
index c6f3ec55fd70..d8cacac9ed3a 100644
--- a/kde-apps/ark/ark-18.08.3.ebuild
+++ b/kde-apps/ark/ark-18.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="https://www.kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bzip2 lzma zip"
 
 RDEPEND="
diff --git a/kde-apps/ark/ark-18.04.3.ebuild b/kde-apps/ark/ark-18.12.0.ebuild
index cdcdabb24632..6ed461e7c98b 100644
--- a/kde-apps/ark/ark-18.04.3.ebuild
+++ b/kde-apps/ark/ark-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="https://www.kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 lzma zip"
 
 RDEPEND="
@@ -60,16 +60,18 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
-		elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
-	fi
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+			elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
+		fi
 
-	has_version app-arch/rar || \
-		elog "For creating rar archives, installing app-arch/rar is required."
+		has_version app-arch/rar || \
+			elog "For creating rar archives, installing app-arch/rar is required."
 
-	has_version app-arch/p7zip || \
-		elog "For handling 7-Zip archives, install app-arch/p7zip."
+		has_version app-arch/p7zip || \
+			elog "For handling 7-Zip archives, install app-arch/p7zip."
 
-	has_version app-arch/lrzip || \
-		elog "For handling lrz archives, install app-arch/lrzip."
+		has_version app-arch/lrzip || \
+			elog "For handling lrz archives, install app-arch/lrzip."
+	fi
 }
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index f6fa4d0779d1..8315d6e06bbb 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
-DIST artikulate-18.04.3.tar.xz 3748684 BLAKE2B ba7c6a78c6e5fb074b610beb60dccbbe3b159a9df90ef2c65e9e7a2d4c44ec6665ef1ca1644043e104624a31c17c4a4e9f8dc9baafb17bb7b9a356d4d6933135 SHA512 4fa7c6d24d0dd13bb3810545426a626d1c84c72b083e410b70524aa4cbe621f577494b8f60c309dbecdab036353cc9fffb6c8fcf71a3607f13469001395f474f
 DIST artikulate-18.08.3.tar.xz 3748568 BLAKE2B f337512c8e2ba7fc1defd26d8d3c9c906d1c5b9851589abe146840317572873a5aa772cfd460e2eccdb17008ed9a1316e51db74ec296f9f7e9d9e8be15d468a4 SHA512 79029c470422ca95a87190bd006e0764382098688bbff6d36fbc114508f89f85e9104fda53176db0e18b9e874cd4cb0b632d2d6a2bedc53e1bddda9418492ad1
-EBUILD artikulate-18.04.3.ebuild 1117 BLAKE2B bdd3c88ff3d484548cca21867c77ce376faddce842e2f6597843b70cf2b1618cdec825309ce1a64ff0d099dcb1943ff9636812a39620d0e2e307041cdb7d85b6 SHA512 4e4eaa3064916cd463b6c296f4e071295496bdd6bfd916ae60f20393cd1673773991b7970c629f19522eafe21086e1c41a45efc20b283a85c3d6cc220ca79a7b
-EBUILD artikulate-18.08.3.ebuild 1116 BLAKE2B 2772ae3f5bbf6c1c2a01f74b80dcbaa6656ac9e12090137c83da5fa6d97a99e3d277bd85483ac668e1c41a80da44607802b088d2edc0bd6634553f5899cf0af7 SHA512 6924740313fd6bc588a7c97e611f91f5a912c01ece715abcb79f9072710361d901414be94bdb882241577acdd265c2fe7c6aa90d900d248d6be73c8c6eff31bf
+DIST artikulate-18.12.0.tar.xz 3748728 BLAKE2B 0092a6f31048e1d0e11f82ac43be7a7c1313c823a75318cf202e326c20cd2e68d6d1cb02b4e75d0396169df02a01a059b9a86729c5b0f200389c183683bd1959 SHA512 2dcd18ba9b790b37c086c5592337a59af4f1d265bdbf81bd7a5ab52e9a596f9d24c2c55b5bb4b10cea75a723618ec3d6c1f420ebff318d4e1b259938c1df7287
+EBUILD artikulate-18.08.3.ebuild 1114 BLAKE2B e7ae99db866fd39af3d25dd3350a21a5dcb343573c70d1f6bcad84e5bd2c139ca42b8a84f6e07fb7df08f3cd55af9bca6d27ea5d2fb7236cddceefa0c876abdc SHA512 c7dd75d18531626dbfaa4d23b9c265956500506b0f8f4cc8463485b6ee203e15cdc3c0d493b97b672d33f76d09bb71c49479dfc955cba83340d674c2818bb111
+EBUILD artikulate-18.12.0.ebuild 1116 BLAKE2B 2772ae3f5bbf6c1c2a01f74b80dcbaa6656ac9e12090137c83da5fa6d97a99e3d277bd85483ac668e1c41a80da44607802b088d2edc0bd6634553f5899cf0af7 SHA512 6924740313fd6bc588a7c97e611f91f5a912c01ece715abcb79f9072710361d901414be94bdb882241577acdd265c2fe7c6aa90d900d248d6be73c8c6eff31bf
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-18.08.3.ebuild b/kde-apps/artikulate/artikulate-18.08.3.ebuild
index 0f9f392da82a..53d3290a2e10 100644
--- a/kde-apps/artikulate/artikulate-18.08.3.ebuild
+++ b/kde-apps/artikulate/artikulate-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gstreamer qtmedia"
 
 REQUIRED_USE="|| ( gstreamer qtmedia )"
diff --git a/kde-apps/artikulate/artikulate-18.04.3.ebuild b/kde-apps/artikulate/artikulate-18.12.0.ebuild
index 6e2d98f96922..0f9f392da82a 100644
--- a/kde-apps/artikulate/artikulate-18.04.3.ebuild
+++ b/kde-apps/artikulate/artikulate-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gstreamer qtmedia"
 
 REQUIRED_USE="|| ( gstreamer qtmedia )"
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index a9b06736ac81..92fa5ca3f6a0 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
-DIST audiocd-kio-18.04.3.tar.xz 248668 BLAKE2B e4cf5c7f944f6dbed42af6ae749d3c24f48f974086d03494934ec1c9a394304e885177b277bd83ca9a29d07a11cbd53bf79adb7396f4e1d354088382394d4ece SHA512 a7f8a090019420e735471ed0ae7988145701212b453f958f0da3643e85503de236245a3bb24024449bb6fc50883eb475f450cf8674aed2b166a7e4ef4cedf32e
 DIST audiocd-kio-18.08.3.tar.xz 248720 BLAKE2B 5ab0241ff09488d2e6aed8f611b84e0db257b3705590871e80e8cc5cac45e8df916c62f4fc13aa8bc12b15daa894c923a86199ec57a42ba3bfd70fcf1ac93174 SHA512 471919ad32cbeb244543c31fc03307dfba26adb9090cdb5c8352f01a2b14126b081571f8002e4a43319e2d2d6f4bb9b1b16965d37f8515fd4682778f7e7e1a61
-EBUILD audiocd-kio-18.04.3.ebuild 918 BLAKE2B 04107dc6d19aa76d37d8d58485141014a54a8615b8e3b86e824a5fba56dd46eafac8282daf3c85ff8a4c7063a75a468a138af2eb18999b66dc2e6b84cde05f94 SHA512 1915e62b9cedc9f91237e26e31a9f16539635181dcf965c5bb72f5fda12b34dd1cf7294bfa99a6a717eb6f26abe8912553b64af7e4af083b3de79468871c9a26
-EBUILD audiocd-kio-18.08.3.ebuild 917 BLAKE2B fd87c7582a5ed2c08146d4421c795e7c526f91d88f64882328a9577e3e9799c5388479ffc5713de47a914d77020a9abc0efb7974faf2ff7dd6c58d68d56bf264 SHA512 627e22c571644df4784b3da7aaa30b670c94cf22f1f92e15276d69b792938c454442d221e2cdefbb3f44dae9b938578ffdd86c7f69c3235f289c4f283eab67b6
+DIST audiocd-kio-18.12.0.tar.xz 249952 BLAKE2B 5a73aaa91b1b58aaf06622f3c2cf1350bb1bbc270cc96f0c46f78f1147184120af548766821613f70ab4e5cdee91194acaf42f72dd62e7d83a099475d15bc2dd SHA512 da9def4b45759420a83ac77a780e1f5c7ddb41a1b5edc099c2beb21b4eb066d5baa279526dd619b70cc365bcc8bb6a26ed3fa38c30ddaa8185a50d54b14e631e
+EBUILD audiocd-kio-18.08.3.ebuild 915 BLAKE2B ff8f2a32cd8f66a5228f128a0cb29c80f2d6de54f9ccb934e74229458ff8387e3e1a5a2c03a749b9899d2db396bbc99bb7d100cf922ff0441a2b34dc5a5b0521 SHA512 143314da13427f5ff24fd3f5866b72deb2df9133134c249d316a323fdda222b2fa0dae9c22e2dcc1fff68936670b78872d116b03bf3cb4bd3b87a96941ebb5d9
+EBUILD audiocd-kio-18.12.0.ebuild 910 BLAKE2B 3cde9e8da4d4830e8cfde913e5e6e1c2fc5baf3eb97c77ee92a7e72a743c53e6b9db56ab3933b447e2367293bea5584534ce737f1accf79bc09aff396bcca8b8 SHA512 d51d0e93dcdb9bbeb9c3a54dcad283daac1bb4662b2849b655ff4a3f0be680616ad69b2d6cc2c2faf2f15ff6df1fa4f90675622f88ba7c6fff14b2b11189bd54
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.08.3.ebuild
index 24722a1c1872..1ef8b3e1d34a 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-18.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="kioslave for accessing audio CDs"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.04.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.0.ebuild
index 4efdea67c043..5e279e2ce0ce 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-18.04.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="kioslave for accessing audio CDs"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="flac vorbis"
 
 DEPEND="
@@ -16,7 +16,7 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_kdeapps_dep libkcddb)
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 6f34c2358c50..4bc1ffefa600 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
-DIST baloo-widgets-18.04.3.tar.xz 244960 BLAKE2B d8b9d80e7a84958ead24d5371a582c7de8fbe6adaa05faf49c66a4613c03daabd12acbbf9288df80a922e8ce3a611728cc2059a1814cd03d54a3c3e584d29112 SHA512 d267d43d75a6139f78961f47b12882e2cd4dec17e31a60de5b0d0d133a895a36b12bafa68b121f84b7a15f692ebd1219b055197785183fc1b86e59b754eb5e07
 DIST baloo-widgets-18.08.3.tar.xz 244776 BLAKE2B c8b653d44d6526dd84fd346774350aba865517272ff3a6f9c0320acc6abdab54504aecac1d0d60915076c7e51889c6fe83a0867b142558d01a5383ec0e6d2255 SHA512 7ae26b437c76c2a676fac2f3ddf4fb436eb8a9205d5427ea40fb8c849fb6bbe0043429bb7dc1eec4de24975cf99f3ee695b68516de00a736aa90068ee2d11b06
-EBUILD baloo-widgets-18.04.3.ebuild 597 BLAKE2B a074d5793edd74e8ce736898612bb7eac439e782c64f522db5b133b84c7d8c107ad2ac9ea11f7a0a78062940fa802fe3aa94e1e79bfd77c878ad5d80be520343 SHA512 a3905e6ca2dc2ac8a3b4b8f03fa3e335820e9a24639af4cd9ae0586abe4e870223783a027ec525e68cdae9f1de91c8b050bab71c4bd3d49d498924ba7b5550f4
-EBUILD baloo-widgets-18.08.3.ebuild 596 BLAKE2B c2559e23063d6dafcb62bdd255a6baaee079531a02beede7e851dfa00086402b13b47311140879ee2d0e88313ef356bf13fa8cd9270b3d034d85fcb304dfeb1f SHA512 27359ec0005c7f4df7a3c7a0c33e713a73fe9186bc2e02aee7db67a4b0227baa6d8cf5cf123f6d12b29c4b7ebc40b9e43d2ee10a6882af67ea20d87a605617cd
+DIST baloo-widgets-18.12.0.tar.xz 245492 BLAKE2B 7ce5f76c81669a58b6a7281ce335e4b6460c705a5f6c52dc1f4e2471ebde1a0d30515b29f45015b2dad0200a8b5065d3240aeb9a4d42331fcc7d8d7a7e181ba1 SHA512 eb3c5cefc3108d856cc96d2632eae6de93d0de148246c7f892a71d9f8058c60b1442fb067497b1c919128e657c35b60dae024bc055dcb1ea68aaf9cb08c69f57
+EBUILD baloo-widgets-18.08.3.ebuild 594 BLAKE2B bf197136cc23b13345708c5d3b1930eda789d3bbdb3f29d4da16e7d18d9adb02cdf8f716653a39f3c64db931b727eacfdb3af49a10c6c0e2d47023177c59285b SHA512 3359289cce51e360334b896f72af3aa0a86e76a7190f23a757542154265598e52826a14dd619b41e6968faa00d97d78e24f5042c2957f3bff63f7b4f10b73bf9
+EBUILD baloo-widgets-18.12.0.ebuild 596 BLAKE2B c2559e23063d6dafcb62bdd255a6baaee079531a02beede7e851dfa00086402b13b47311140879ee2d0e88313ef356bf13fa8cd9270b3d034d85fcb304dfeb1f SHA512 27359ec0005c7f4df7a3c7a0c33e713a73fe9186bc2e02aee7db67a4b0227baa6d8cf5cf123f6d12b29c4b7ebc40b9e43d2ee10a6882af67ea20d87a605617cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.08.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.08.3.ebuild
index 2938ec7d849f..64be9b79beb8 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-18.08.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Widget library for baloo"
 LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.04.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.12.0.ebuild
index 795563e67f4a..2938ec7d849f 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-18.04.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Widget library for baloo"
 LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index e5fbf44db2f9..7c0d8e8e838e 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
-DIST blinken-18.04.3.tar.xz 2507660 BLAKE2B 0b002c616bffba1716837e23aedc31f7401842589d3d8d4f029df5245c81eaa5a0213345619234ac85e0e1ff97091f2daeace65c59b5911f70d35addecb30966 SHA512 55a02b9c1041c8cf554431f338f4117300a25c5976f01c6ba3a3b28e66f0ea9742fb0dcd4fd25cb69a3ba5c41ef3b7633ae1259672a8e8175687ff17130920cc
 DIST blinken-18.08.3.tar.xz 2507512 BLAKE2B 5b2ed3ea697939ebfc468d68c8b1ec7979947d6069262df3a8e6ee298fcd14af5634efa3ca4ac13dc9b5fcb2026f12273aee224c16bbc56401255a44ae70cd08 SHA512 2e6c77d1f295535e584ed6f462246c7223833e9d473b99a006a8c5ba0518cdb3b3bc847c8d6201f9ff80c5672d088b21db1be1072992c91ea94b90752d080ba8
-EBUILD blinken-18.04.3.ebuild 768 BLAKE2B 02653f2ed7d6bee097378e0afc3e88947aa978bd9027d13bab05aafa1da424e9ef88a4ace0424f134686a207c4a286cc570f708308503ab525c2dbd782940a05 SHA512 9ee30d940c1a3f3cbf398063047ec11fc7406c48751c8e70abd14a54d6fe3febc25118097734ecdc409f80a856274244453e54ec75ec6b6d702ac6fcf923ecdc
-EBUILD blinken-18.08.3.ebuild 767 BLAKE2B ba7929db815a2cc834fb77ffd0e16a5ddf71b8979b17d9f334c20957929a11b342047b10f15f7b44f809ee1cfae87f0a570d3f6fe09c6fec3cb16ed54314687c SHA512 088f1076e8ef48d9bc29f44804a322fcf55e0dde93fe91b38d0ab8db054993eb999772188796b514b042a20b13eeb13781887d7a5ee3e6084ab285645f02d735
+DIST blinken-18.12.0.tar.xz 2507576 BLAKE2B a3696a62a7e4624677fa040e1a9b55599d83c240f18bf415aa2b14658b0baa5d8f704dcbfe7db46f3e4cb449e78e30411a5b24f64408d614a079cec1c8f03547 SHA512 679b97d432a61e7640e871179b98a603bc56e6e076355147936dcf29ad86586eee9999887a4f0681a2a5eeb9138ea92d8040934896d515ea5cb7d8873e184b83
+EBUILD blinken-18.08.3.ebuild 765 BLAKE2B 4f604ffb1299adc2ae065dd183896e3bff9e9d2823816caa8912497f52b4661275281fd11a8086f3c731ba3037eadebe3e13587d5c3a510124eea0fb2fd17cdb SHA512 74c8cc6658aa5f6294d0ec3dfe86e9ba3684869e137507f455b15ec697e630ea38d8a7402922f4f2e9c8ce8a198468783b1e585fa70015e28a6ab7c588f836df
+EBUILD blinken-18.12.0.ebuild 767 BLAKE2B ba7929db815a2cc834fb77ffd0e16a5ddf71b8979b17d9f334c20957929a11b342047b10f15f7b44f809ee1cfae87f0a570d3f6fe09c6fec3cb16ed54314687c SHA512 088f1076e8ef48d9bc29f44804a322fcf55e0dde93fe91b38d0ab8db054993eb999772188796b514b042a20b13eeb13781887d7a5ee3e6084ab285645f02d735
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-18.08.3.ebuild b/kde-apps/blinken/blinken-18.08.3.ebuild
index 64c03ecb966e..fcbc3d751a18 100644
--- a/kde-apps/blinken/blinken-18.08.3.ebuild
+++ b/kde-apps/blinken/blinken-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/blinken-18.04.3.ebuild b/kde-apps/blinken/blinken-18.12.0.ebuild
index cb72c7438d78..64c03ecb966e 100644
--- a/kde-apps/blinken/blinken-18.04.3.ebuild
+++ b/kde-apps/blinken/blinken-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 333356ff1faa..5ceb18e7aa9c 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
-DIST bomber-18.04.3.tar.xz 754288 BLAKE2B 5c30c435dee98ce851fec3723148d62db815ebc3aabc7a76aa5f9ed4357cc55fd2a2d695cdeb68f729d2d93132d1804b0df79ab895b00094d6ff2703c9dbc443 SHA512 40297bfa9c3fb543a8f8903a70fe7e7987d9fd5ba063ab1de2cf58801ced0249f4b9019aa7492ee30f027c74cde8c0fe268888835e37ae56b0621dcdf8f30811
 DIST bomber-18.08.3.tar.xz 819108 BLAKE2B d39e9a18d3001382d3d17077958c7f40036e9e287675c1f86b79f631205d87b19fdd6a81599664387e020d6a3dbd87e544db47cbc96fd505e4ef4292b1ceb8a3 SHA512 6085333814e1a427feda8fcdd5569601241ef6fc2d22f7d219540522866f2ebb911977a3bfffc35127d996a3cf1cbd895d4081bc0513da484327bcbe531e46e0
-EBUILD bomber-18.04.3.ebuild 685 BLAKE2B b62f0b52aca8404743df8150b990b75228f9b67ce1aae9345f33ae10f53e15c8617df73966be6c880852c1b36dfc4f2522aa986550edca71274973f42fca44b7 SHA512 2858c6a02e8776a651d23bccad7b432bd4f3bb5386840d39bd11275a0154d65ae73aa0fe264a77f5fa1912b8b57898dc69bf68951ce0aaf265e8257188ef29f8
-EBUILD bomber-18.08.3.ebuild 684 BLAKE2B 9dac702b0134a1b757abf7514f4e80bf38f8edd474a9e35c007d858be911adff58af66023b2787d5050fa7f011e0309b405689c98c6d22741c4e983febab38d9 SHA512 122619c0d6e4b1d0c502287d6ac1a78b5782e9f84da3af8ce067e27c19b717cd32242d8b4af8b2a6d0c2c7675fb34ab036809e6d68d9ae3ebd18e113d23465a2
+DIST bomber-18.12.0.tar.xz 819496 BLAKE2B c05124bd6ac06eb2801c76f5c1b62ee85ff4627462d5ecf4e67a418d5c80c7785e33372f865b83a8419c8e072909b03b0a91974a30cc55bdfe6d4eb55a803ce6 SHA512 4956061d017a993410a0049693f3985d9592552729b88321a5c4dec441ded6b7b7d1dbc2e187fac5a7af369b9f853a508602dd92e8efa94e75e8ebdfc64a1ab0
+EBUILD bomber-18.08.3.ebuild 682 BLAKE2B 7dfb76a6adbb98b779a15aded5ca79dd21761e6b58ae7e47111ddbee53237b8c2b9cc960e057baf35ff4517ae7bd9b97fb05e19036d86c8c42414930f3cc2b3a SHA512 14e4774fae739f26b748791048bdaa1c238d0f8ae7e8b8eae11540e98529b772aae6d38fa7f7d924f4934b69ffaca82bbde45fbc7dc1500c6a7c3bc49b5fc010
+EBUILD bomber-18.12.0.ebuild 684 BLAKE2B 9dac702b0134a1b757abf7514f4e80bf38f8edd474a9e35c007d858be911adff58af66023b2787d5050fa7f011e0309b405689c98c6d22741c4e983febab38d9 SHA512 122619c0d6e4b1d0c502287d6ac1a78b5782e9f84da3af8ce067e27c19b717cd32242d8b4af8b2a6d0c2c7675fb34ab036809e6d68d9ae3ebd18e113d23465a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-18.08.3.ebuild b/kde-apps/bomber/bomber-18.08.3.ebuild
index 1d4bb83a5856..a06947f34e4a 100644
--- a/kde-apps/bomber/bomber-18.08.3.ebuild
+++ b/kde-apps/bomber/bomber-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE arcade bombing game"
 HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/bomber-18.04.3.ebuild b/kde-apps/bomber/bomber-18.12.0.ebuild
index 5bc17254c158..1d4bb83a5856 100644
--- a/kde-apps/bomber/bomber-18.04.3.ebuild
+++ b/kde-apps/bomber/bomber-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE arcade bombing game"
 HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 67ae904a51f3..558055dee7d8 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
-DIST bovo-18.04.3.tar.xz 186428 BLAKE2B a11d7a44b0d1489c677b1d5fe102ea7e1f5b8680f74c8dfb316c01044e82b87cb6c8acc42529d5948bcad74034f2392a698ebedfb442a0eb040d0ad00ea374a7 SHA512 f2efdb2e1f929febc0c1e7ed896d0067e61b3f8cc08616396718e9b79c60737921ea352d8cd4450358ee7b06d74d7130f5890fa993a4b23ecc35681ca3fcee8c
 DIST bovo-18.08.3.tar.xz 199576 BLAKE2B 3bea0c14a2f5f63ff79bfc20f36d4e6212c6dd41ea5cd9f79ef45189b4b53d43e656f0df12e582a185cc97ad9f8f5a899d790fe87de40aaeb21e8f6798c2ac6e SHA512 7053c1597c94d3c98c6008b071b43968c49a20f86a51260b4df2b94334ffb2f499885fd7cd395aad48eb80bb21cc201ed60b1c9792be0950b33db77f65eb3963
-EBUILD bovo-18.04.3.ebuild 702 BLAKE2B 85a85acba350d651339bf61165f7b0de15cf9bf996f3ae942e6267b0a35ab58a73196f92e5c249ead409f6814f6f16b7de8ac90d451dc3bc0c2f5763e5fc22f7 SHA512 ef0e3d99b0ad580a20be16a3ee18c2316f00cfa8d54c88f2135cbaee3c4c288d10661739afac12f5ca84fa3d77bbeb10896b4d5804e7be3138ceac936b370112
-EBUILD bovo-18.08.3.ebuild 701 BLAKE2B fc6ffa0f20cee0e9238b69fc6d449a295eff6669f173cc2079b942343a0b51d5f13948aa6ec74bd3302a22f19e0cc2dd06bba6735bba8cb95e8ddbfea0fb8187 SHA512 e7731bde5bc60c386771814145abfbea4ff13b9e383f0f21872f8ad362be15d892968e9f0bbc3c731ba2b7a795d99c6118e6b1d6d365df34e1eddca8f3c29452
+DIST bovo-18.12.0.tar.xz 199560 BLAKE2B e3679e62ce4e302edc6fd78813b22185b913bcf365d26ad996298b9bd1f9b88152f9553e3e724e0ce7fb11b66486128be2575fa66603470741fe7ea5f72b3742 SHA512 64533c1fefc4cc761c02a346abfc07ffc775ab7d3c02ce4b47a2e5ed806828fe1d3142444b840291e9985013230a8adba903a69f0baba378e97fd87ae8c9ecfb
+EBUILD bovo-18.08.3.ebuild 699 BLAKE2B 8ec09267ece378fa446aa93694b6e7402304ef9031264bb3105bf365fd905eb4c4c72006f1321e7dea5b9742a236d4e786bf02a188dee44e25fc77767ede978e SHA512 815d8b1acaed014ce5d3788df62e681fd12e64638770bd54b54592c8273c852ad4278907b6855f00bd16226c98719d5a370e63d4b9e9920b4795902c09693066
+EBUILD bovo-18.12.0.ebuild 701 BLAKE2B fc6ffa0f20cee0e9238b69fc6d449a295eff6669f173cc2079b942343a0b51d5f13948aa6ec74bd3302a22f19e0cc2dd06bba6735bba8cb95e8ddbfea0fb8187 SHA512 e7731bde5bc60c386771814145abfbea4ff13b9e383f0f21872f8ad362be15d892968e9f0bbc3c731ba2b7a795d99c6118e6b1d6d365df34e1eddca8f3c29452
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-18.08.3.ebuild b/kde-apps/bovo/bovo-18.08.3.ebuild
index 277760acb49a..dd86ee3b34ad 100644
--- a/kde-apps/bovo/bovo-18.08.3.ebuild
+++ b/kde-apps/bovo/bovo-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Five-in-a-row Board Game"
 HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/bovo-18.04.3.ebuild b/kde-apps/bovo/bovo-18.12.0.ebuild
index c6f17a590619..277760acb49a 100644
--- a/kde-apps/bovo/bovo-18.04.3.ebuild
+++ b/kde-apps/bovo/bovo-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Five-in-a-row Board Game"
 HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 0d96a0d3fd9f..937f585fc476 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
 DIST akonadi-calendar-tools-18.08.3.tar.xz 225844 BLAKE2B 7c0e6689049a7bd022cc5b9e1201244997b20b944f9e350e71ea0f9cd7954e2e07a3ebf431c455c925f7180880d127ba590debf16ca2544bfa762efad33ac547 SHA512 f858d8eb2b79b999459d04ccf8e8a05c53c7275b6b3cd2f80224da42f280a4d2a4d6738a235c1f3bb4b40e36d605310cda01097678441b5c4a94698fdf42097d
-EBUILD calendarjanitor-18.04.3.ebuild 1029 BLAKE2B 19aac37a01db2716f31fcd2a6082a68eea84f8b8fb7a35d76721d2d72cacec48e49fbd08cbdafbb74f6346ed4a8f1084f3e0c62450f04740a9112568b73cdf94 SHA512 beda41c1e93490da51240a8abb47d028f2f1a3cb5b5daa6a11fdbe7e61b58c70941a9d62ddd577a2d7921199787e1dc29c15bdc6d10859214e199fca1f5de55c
-EBUILD calendarjanitor-18.08.3.ebuild 1028 BLAKE2B 9f86cbee0b77d62cb211d579c1c6c8508200303757359d159086ed278f7275c65ba540cb5a2045a7a1d2f1e48a5c9630885615c447a708b04b799b2d679931d2 SHA512 d4194278ea9c4c98c1669e1921170d7104b6c21dd00a9e02904dee4f1454d24a8e209a9b525eb83c32316f5554bd6fb024e287abe232b3159ccf3d8a621e0519
+DIST akonadi-calendar-tools-18.12.0.tar.xz 225048 BLAKE2B 9cd9f65b11a7bf848c246e5ee627e3ec9a7dadc21402e86821d2db9443f9fb8d8fc2763b28dba8fc4bb8b82352d0130e05ff93b804297c68c3c72669200bc2e0 SHA512 e230bd5a71ab10ac7cde4696ce29e46f06011826b581988cc29d5703732dd3be1443f9ec686fafa08fe6c769a5b05d1fc66b5f0fa99aa0c932177ec09f472ef6
+EBUILD calendarjanitor-18.08.3.ebuild 1026 BLAKE2B 25e765c446cd24d4c415e6d0e9672fae275ddb6abea3c5dab0f62d77ac4de2bd23dbda59b17be1ea8fd64cd5dbaeb03e31358d17ce8dd9d9b40d4786771e1850 SHA512 e9521466a6b6012f2f9c45b7c428ccf8b547cb1d15cc6801d85d8c2f006bc35c49a5927f0a7b487d0796dd6fc5b6f1b90d02a233c2b0327b0a8b4cdee8aaf659
+EBUILD calendarjanitor-18.12.0.ebuild 1028 BLAKE2B 9f86cbee0b77d62cb211d579c1c6c8508200303757359d159086ed278f7275c65ba540cb5a2045a7a1d2f1e48a5c9630885615c447a708b04b799b2d679931d2 SHA512 d4194278ea9c4c98c1669e1921170d7104b6c21dd00a9e02904dee4f1454d24a8e209a9b525eb83c32316f5554bd6fb024e287abe232b3159ccf3d8a621e0519
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.08.3.ebuild
index 140957cdc060..a4e354b54031 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-18.08.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.04.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.12.0.ebuild
index 4fbc9eb897d9..140957cdc060 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-18.04.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 4bb1a1cdb9f9..dfe80643d2d2 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
-DIST calendarsupport-18.04.3.tar.xz 647108 BLAKE2B 8088fcf42474e9b876e57135dcaccad97fdf4f433f57fd72886c1d94d7086471f1b76a08aff5df24f2cdb9891da041dfcf444951f908837ebb3aa53bc58b332d SHA512 7631d81bfbd3282448d4d78cf05a4714392736a74e23155b4c75f288a906975ea1bd32e3412e03b8ff74778e85560a071a11482c35cf769a738675c4fedd3e6e
 DIST calendarsupport-18.08.3.tar.xz 647540 BLAKE2B 76e0ddb739b74d378af0f91dafde28f930c3224fd4f75377632531ff510ccc47c1cba91e78304545af6e3ab723c758adbdeda3f0d613503ace2a8e71fd45a860 SHA512 7b4d7229ce54146bd4746fb78c8079395409228f87013820de31b5d1a3288c8312c4f489b6dcb2b3bd0f4cdca51fe8deb48e51a77a22d7d41473819dabd3a41d
-EBUILD calendarsupport-18.04.3.ebuild 1099 BLAKE2B 6b8b8e7fb0c51e9820cded52e47369ccf5051aa05b3dd014efbf1536d773db9abc7dab18e9d9e579bdcd5164db30c280452aedeb7def43e6e5a504b6141c8c42 SHA512 5b0abb1569c17da4c776639e006fbe19b52b6080801aa0d4273f48271848d9c4334a2a713b2d08801a64bfe5adb6c47cc635e32629d6fb19b60756eefa927ac9
-EBUILD calendarsupport-18.08.3.ebuild 1098 BLAKE2B b26c94a84ddf82c6bcca40c702eeb6b13c950224ae2a49d48a9cf460b23f85b724a71c0cdbe043358683a30e079d07f261a950a52ea57e2f30256e25e59ebe3c SHA512 2f257ddff2c9a0980f6695fa11fb00993c2ae390ed6ee9df0ea4ddda9f836c1c2d71cf98baac3cad854d9b03033c0622b01b0e16ca799f779a8b0d91d8cf9b89
+DIST calendarsupport-18.12.0.tar.xz 646352 BLAKE2B e3b7c796f7d2304e5ffce6b9ba8b6682cb47f1e19e2d7069d19115ef72f6ee1757a1a66edbbc3dc423de58787c65ef248fc4933b712767e83bfc92d31782780c SHA512 492f353f9cb2d7c1f1296fb81afdfac8b68b477dd458c8242fdfb4379f5e317c7feeb90ce7f3533186265cfb27d4d5433cd1e43e1622efdf8c749dcb3093c844
+EBUILD calendarsupport-18.08.3.ebuild 1096 BLAKE2B 53f9497d59eb6ce5540ff38d607d1511693a5539404d105e0e5392b9009b994ff47d1149320067236f0aea5a7af271b9da5d5b5507da031a612de9b640866993 SHA512 56000f568d689ec26e97280267d98dc4ebcd48f9ad1f71cd21f99e439551cb4d60ecc18e7136c9b9a07fa95945e2f7dafaf99c5da3153da069ff222f769c2bc8
+EBUILD calendarsupport-18.12.0.ebuild 1098 BLAKE2B b26c94a84ddf82c6bcca40c702eeb6b13c950224ae2a49d48a9cf460b23f85b724a71c0cdbe043358683a30e079d07f261a950a52ea57e2f30256e25e59ebe3c SHA512 2f257ddff2c9a0980f6695fa11fb00993c2ae390ed6ee9df0ea4ddda9f836c1c2d71cf98baac3cad854d9b03033c0622b01b0e16ca799f779a8b0d91d8cf9b89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-18.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-18.08.3.ebuild
index 4a6948a768bd..69d19ad102f8 100644
--- a/kde-apps/calendarsupport/calendarsupport-18.08.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Calendar support library"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/calendarsupport-18.04.3.ebuild b/kde-apps/calendarsupport/calendarsupport-18.12.0.ebuild
index 7cc918976b65..4a6948a768bd 100644
--- a/kde-apps/calendarsupport/calendarsupport-18.04.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Calendar support library"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 5a41643c08dc..aae9d65497ab 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
-DIST cantor-18.04.3.tar.xz 2179372 BLAKE2B 1f6055359d239bd3f49d4a95975a13db710bb7aabb708b3e045aebc2b95ae8d9ab875486ea6735104d8df6bf53bfdccc6349e627e7ab32596bb0cfda83db31a0 SHA512 2493d2570f69d0f27489dd86b48a11fa454c4b0d42b821a52ee6489ed6914af826b94a152098144cda40122ddf98d7b121b03c2e4e4b46dc85db83643873d2bb
 DIST cantor-18.08.3.tar.xz 2181020 BLAKE2B 43ce8e60d44d07c1a74219dad3322d23cea89eb9ba199c240d7e95473a79dcaa2a8a2ea08e05a04da00e6bc2fce6cef70b3266c28dd6f9424401bf87b1bfb6a8 SHA512 b6a3bfcc6dce8792fcad9bcaec6b30dfe50ab42b0781a3d33477b2fee1773c20400f4de069176bcf3ae6bfb232a32aa0d5f2e6e9059706f9da6aa65f63a018ec
-EBUILD cantor-18.04.3.ebuild 3179 BLAKE2B f65cd049ec6997ea90b23d95ceb780f253abba21471f951cf42c1e9f6d5800261743ff40307c754486ce50f976da3ece31acfa28573bd75ad2834dc86002962b SHA512 6f6c02bceb62668e6deae92804f6de12a842234a8bc2597f65b93f202ae756f18fc91ab4fda4bc82d396030bdc9bbe8b76cb425386293a2f09676c5d12740e49
-EBUILD cantor-18.08.3.ebuild 3152 BLAKE2B fbf3781010d0fd31c56184ff566bb8ad893d83d9191198213ed97d31d465025c148fb59e000e7510a83332b340563b34ebff23d04ed896982040e6d2d47ede96 SHA512 303a109555f83638c17af5871e1abde198dcef4fa10c35ec2695c17e18a8c73ace16255192d855383957c780ac6d8db2133ef7fcb9df2877385e672441e12949
-MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
+DIST cantor-18.12.0.tar.xz 2240772 BLAKE2B 0d6627f8f41b5cfb211e732ad173a1926396f5c59fb4e4b3c5dccf35fbb9d95ecf0e4cdd16bffbae04615dcb933b1e7da050e6fe2655749d6e334d627ffc8f74 SHA512 d1d2daad69bd982da0ae2b82512e0fe3d15a93406c7d24d28e8587514518e4bebe5f807a0c0eafccefbafae06701dd5cff7fe876f863792ff9a98e355d9aae77
+EBUILD cantor-18.08.3.ebuild 3150 BLAKE2B a846548bd1968dc13764e210aeb76da431594ff42948dc5ac99335e0f94a35450b48992e9e03e23333e612d71c9def189fb84282945057fe46d33cf5f5cac0e3 SHA512 9ebd1fd3b01e929b089eb9e802ae630acbbb30d2179f73962dbbae326d797d7c8efad1f3a4f8063592d54d0793d4b65065fd50cad42591f360881b5cd6c26c04
+EBUILD cantor-18.12.0.ebuild 3297 BLAKE2B dcf0eb5c2c36a2ecf9d6af0749557a6c7f355fa6e2af558b372b6c8118576ff3e9cd14bc528b7acf63d17ab6235a44dcecec5579535f6c6b82061793a9604a84 SHA512 7f50755f3d9a365cbe81bb16a950beb74e008b42349dfd081362adadaa87f9ca69555b51ac12b78d6185b73696c9892ecc55308cfff365eb6d53eb04f2af68b5
+MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-18.08.3.ebuild b/kde-apps/cantor/cantor-18.08.3.ebuild
index 0b8b96cfd68b..5b1f787720bd 100644
--- a/kde-apps/cantor/cantor-18.08.3.ebuild
+++ b/kde-apps/cantor/cantor-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/cantor-18.04.3.ebuild b/kde-apps/cantor/cantor-18.12.0.ebuild
index 255635b2326d..4406f96ddb16 100644
--- a/kde-apps/cantor/cantor-18.04.3.ebuild
+++ b/kde-apps/cantor/cantor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="+analitza julia lua markdown postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -35,6 +35,7 @@ DEPEND="
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsvg)
@@ -44,6 +45,7 @@ DEPEND="
 	analitza? ( $(add_kdeapps_dep analitza) )
 	julia? ( dev-lang/julia )
 	lua? ( dev-lang/luajit:2 )
+	markdown? ( >=app-text/discount-2.2.2 )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate:=
@@ -61,20 +63,20 @@ 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
+		elog "You have decided to build ${PN} with no backend."
+		elog "To have this application functional, please enable one of the backends via USE flag:"
+		elog "    analitza, lua, python, qalculate, R"
+		elog "Alternatively, install one of these:"
+		elog "    # emerge sci-mathematics/maxima (bug #619534)"
+		elog "    # emerge sci-mathematics/octave"
+		elog "Experimental available USE flag:"
+		elog "    julia (not stable, bug #613576)"
+		elog
 	fi
 
 	if ! has_version virtual/latex-base; then
-		einfo "For LaTeX support:"
-		einfo "    # emerge virtual/latex-base"
+		elog "For LaTeX support:"
+		elog "    # emerge virtual/latex-base"
 	fi
 }
 
@@ -98,6 +100,7 @@ src_configure() {
 		$(cmake-utils_use_find_package analitza Analitza5)
 		$(cmake-utils_use_find_package julia Julia)
 		$(cmake-utils_use_find_package lua LuaJIT)
+		$(cmake-utils_use_find_package markdown Discount)
 		$(cmake-utils_use_find_package postscript LibSpectre)
 		$(cmake-utils_use_find_package python PythonLibs)
 		$(cmake-utils_use_find_package qalculate Qalculate)
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 20e3a5914aa1..23b2f303adc2 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="analitza">Enable <pkg>kde-apps/analitza</pkg> backend support</flag>
 		<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend support</flag>
 		<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
+		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
 		<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 55a18f5542c9..7ee3d1d67e65 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
-DIST cervisia-18.04.3.tar.xz 1906444 BLAKE2B 3c098bb67c52096edb709ce3dc1e88d812e9b5077feea3cfc3691bc17820353eb82921b9c914bdd168603ecc7274d35f56f2983e06eced6f5a76e6dc938fac5f SHA512 de058407f70e2c7568c925e7ff28ffdd9811065cf9fca9782cddd85650d55652c1a420fe7f89aee99ae01f0373fa52a17759a40f8310496e6af45ae5529b0193
 DIST cervisia-18.08.3.tar.xz 1906580 BLAKE2B 3b939031057ef7971196b8d0f1f9e4f60a5ec068d6b6492432d6d2cab358daf552a76fae2a2f402cf3b8b60be4e7edac785d83ad8e603f043866299d0109d3ed SHA512 52086d5a9d54842efe0300ed43e1d8f1b2cf6d7df7269115441a1baf0a283115c31de5dfeef49e48695ffd88fde6ce941c3a90db5d47fc12f8fae79d73fd4bb9
-EBUILD cervisia-18.04.3.ebuild 899 BLAKE2B 0c84459c973444f7472abf611c52ba0ad9eaea41757e8313a80d925e14d41e50f7d24237471ed4b671cf685f77ddb72ce4dd4e25f41a8a7ddfc67818485855d2 SHA512 32c8623e3b2c9afcc1589a5335d772d057341b36fc8d51e2b23d65c9d9436f229576e2c015ab24843bb01cc5df22e917031b2b044e7a9f320c45f647c4681bfc
-EBUILD cervisia-18.08.3.ebuild 898 BLAKE2B 9c9050b4b74fca45b2c5af541dd02428c0ae3634f31d0688ae2149e8c269e91e3d437b4313f8ccc5a170918510ebd9fbe3e2878cd79032cab7a6720f6aad5324 SHA512 9adc77b7d5c7e922b52af0e480f5e8eca2b0933f9a1bfbdf8137c962d020d34a7a1d57672fdab9d08179a2c524ce175b19ca1f62c1b6386a4d34865e500b2fb3
+DIST cervisia-18.12.0.tar.xz 1905940 BLAKE2B 7190b21c329fd626f8bd086e2294364336cf2e7f78f5014e8410bb29825fec0c3e296b199a29287224344be622b4fc1532b5a8b733f84f2d8a0c96d8ad6d5e23 SHA512 c4b0d91f0c02d6da9665b7525ada479a1a9ae5cd539f8d384430ba7e745bb9fce7bb2ffeb970c629d5eb4adb208fada03844e6febd7e3e9e9dd50faad225840c
+EBUILD cervisia-18.08.3.ebuild 896 BLAKE2B c9014e7ba44c5709f9773afb25fed6405818c320c3f32e7f97478b3573fe54f614d99fb4e0e8b129d52baa660000b0ac03d69c69e61ba251f5b638a4e32011f6 SHA512 b2b0ae677d3df58f4c0c413ba3ffb3ee86e57ad19c50902243e801741556f30a0ed4d95e79b0c9a59489f9970aa42352376ec2882ed63ed0b93cf8e9fe67ec50
+EBUILD cervisia-18.12.0.ebuild 898 BLAKE2B 9c9050b4b74fca45b2c5af541dd02428c0ae3634f31d0688ae2149e8c269e91e3d437b4313f8ccc5a170918510ebd9fbe3e2878cd79032cab7a6720f6aad5324 SHA512 9adc77b7d5c7e922b52af0e480f5e8eca2b0933f9a1bfbdf8137c962d020d34a7a1d57672fdab9d08179a2c524ce175b19ca1f62c1b6386a4d34865e500b2fb3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-18.08.3.ebuild b/kde-apps/cervisia/cervisia-18.08.3.ebuild
index b63da5d15e3a..e740148d1719 100644
--- a/kde-apps/cervisia/cervisia-18.08.3.ebuild
+++ b/kde-apps/cervisia/cervisia-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="CVS frontend by KDE"
 HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cervisia/cervisia-18.04.3.ebuild b/kde-apps/cervisia/cervisia-18.12.0.ebuild
index e06fbc326979..b63da5d15e3a 100644
--- a/kde-apps/cervisia/cervisia-18.04.3.ebuild
+++ b/kde-apps/cervisia/cervisia-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="CVS frontend by KDE"
 HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-bazaar/Manifest b/kde-apps/dolphin-plugins-bazaar/Manifest
new file mode 100644
index 000000000000..d184008e1876
--- /dev/null
+++ b/kde-apps/dolphin-plugins-bazaar/Manifest
@@ -0,0 +1,3 @@
+DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
+EBUILD dolphin-plugins-bazaar-18.12.0.ebuild 1035 BLAKE2B 76aa92c4ecf691605ec1ed574398938b0432bc64f43476de87433ce655458948416d46c00859188b27d5514a8d651421f5238d9a197e08080f2992e627b6577a SHA512 e3105a3469fb39d766f5414af3b937bf81bce7aff655c5241df2934c3e7d5b730515d3c2fa30a8ae0344c7a4fda4d5e92e3aff75a6b73b1a9cecb7c301538641
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.0.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.0.ebuild
new file mode 100644
index 000000000000..fa8c485a6ce5
--- /dev/null
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="bazaar"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Bazaar integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	dev-vcs/bzr
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-bazaar/metadata.xml b/kde-apps/dolphin-plugins-bazaar/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-bazaar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
new file mode 100644
index 000000000000..c45fe85a741d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -0,0 +1,3 @@
+DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
+EBUILD dolphin-plugins-dropbox-18.12.0.ebuild 1007 BLAKE2B 0b21da5c970baf9cadb35357f7e31c26a96d7bd1ea847d45bfb2fe95c50732c4c8d4e04fc0de781f227449fd4a2bd892c22744b625d9471bf278aaef83f37030 SHA512 8575eff92b7040c880b10c4a484ad8d76f413cca68c61176dc14b2b2b80bff43da452425bbc4e5a758af983d4172af866b92681176409eb2b2fec82aceb78f93
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.0.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.0.ebuild
new file mode 100644
index 000000000000..af36eed7c6f0
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="dropbox"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Dropbox service integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	net-misc/dropbox-cli
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-dropbox/metadata.xml b/kde-apps/dolphin-plugins-dropbox/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
new file mode 100644
index 000000000000..5b966b82c560
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -0,0 +1,3 @@
+DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
+EBUILD dolphin-plugins-git-18.12.0.ebuild 1098 BLAKE2B 64043e10a4dc1a3181f2dedb5d816c5e60c0264aa72d7ae6a3c8e9169af5f98b0fee65a2eeb4b493eff9b6176cba075cfd1dbeb79aa4d8f47595cc9f0ea18114 SHA512 29dc5007d82ebe42d9bbd735e8f6a6a632091711cb2cbd227c565bb353ea9986ff7299d28d0248f665f36e59ed97c6314869e994d514a3027c73a9ad4dc8a009
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.0.ebuild
new file mode 100644
index 000000000000..452bdecba4b7
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="git"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Git integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	dev-vcs/git
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-git/metadata.xml b/kde-apps/dolphin-plugins-git/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
new file mode 100644
index 000000000000..a62e38c58674
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -0,0 +1,3 @@
+DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
+EBUILD dolphin-plugins-mercurial-18.12.0.ebuild 1196 BLAKE2B b3f4a41f0bc0325b4f84ef002d7743540facb0a301a8bc1440b19baf144cf81b5c924a3fad01cc459b0de3ca12d331e0a19a6a4f3af1fd32ea3f5abe5a4ac643 SHA512 f21828898e65bfa409cdd343a2238bb4d975daf83bf90c49d3f37a7db1292885ee874f268f9c8876a393c1cb84386819c02dfe13569771681c6ea982b21c6cbc
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.0.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.0.ebuild
new file mode 100644
index 000000000000..ee6c1196d299
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="hg"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Mercurial integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-mercurial/metadata.xml b/kde-apps/dolphin-plugins-mercurial/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
new file mode 100644
index 000000000000..8b1327eb4304
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -0,0 +1,3 @@
+DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
+EBUILD dolphin-plugins-subversion-18.12.0.ebuild 1074 BLAKE2B cf4ec001ef28a17d209e8a54b0af9cad57ca88e00ba7ecad0161d161a09336e3feed813f256976d3ac0501774c8387712fc2277e2e04a4b05e3085d78c8c0502 SHA512 33a7a470d9b2e99eb6dd074d1ae7c632c562794dc1ad5a8a285530c6a8eae890610dec28bfd19fa74e61e3afd349a71a20c7529fcd6eea8d24bdc7d3bea5c6cd
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.0.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.0.ebuild
new file mode 100644
index 000000000000..f08b557c8720
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="svn"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Subversion integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	$(add_kdeapps_dep kompare)
+	dev-vcs/subversion
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-subversion/metadata.xml b/kde-apps/dolphin-plugins-subversion/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index d255a08a1ce2..32c74b2ad9e4 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-plugins-18.04.3.tar.xz 191408 BLAKE2B e27bd189d02f922e55fb216bfb80032bf611ec109a3c3f9e3b2cd2466f831e59d548c2d2861a784972e7dcc676e1e7baf28f9a44e8ce7cf1569846da4d6cb86a SHA512 641562f44750bad8ca431be470cf691ea72647ac2b6c5bef7ff83d1d538bc13b7f8d082589c0d2c8c208c14a6007e412f4be8a8e733ebde7132dca6d5724798e
 DIST dolphin-plugins-18.08.3.tar.xz 193624 BLAKE2B 8ba60e93b6423a463ee823560c06941c57541bd7561400020ae137c3cfa8b46b634f494a5429b1c83107599ed81727d7755538c5145a0cde03ee971d7b16b3d5 SHA512 38b28d93deb0e30f1e599ee150c5763c74f89b9706a3730cd0ed0b931ecc12a4284c907dced49689d069b82c84de151d1025e788c533943ec9280c1690c33930
-EBUILD dolphin-plugins-18.04.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
-EBUILD dolphin-plugins-18.08.3.ebuild 1784 BLAKE2B bf31cdf4afde0e12e2b9db2a6588d33aa262f4a717bdd1dc28ff3b71ac511a4b1ccb512439ab31f54307df5ecc6cb711d18fbb1933937b43008f756f0f6bd06c SHA512 9fdb95ab8b2d5dfa977af2ab12498ee7c13cafb246da28c78966d6720d901bcf0c8f129b0ac155e6e4ee5de4c384bf60ef649352d47e43caeeebe9a7bddecfb3
+EBUILD dolphin-plugins-18.08.3.ebuild 1782 BLAKE2B d888607679c789733fdca90273bcf9b4a020b51a440526329eca4a2164c887268dd842f87f776bc844b8a460395cec5c5e9c1503a99a54f5330d0fe48f2e0c3a SHA512 5bd6a0f4cedf075d7ea493bbcfa6fcaa76f7116b685354be282b08012b2c28a63bce68e8502a299f5cdba2eabb95012ab7c47224847e90c7b7a8e65ba26d8e80
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild
deleted file mode 100644
index 8cad2a6fe919..000000000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-18.08.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.08.3.ebuild
index d25eed108d74..386e5cbba7fa 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.08.3.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="false"
 inherit kde5
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bazaar dropbox git mercurial subversion"
 
 # FIXME: required in root CMakeLists.txt, but:
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 57f898bb0e61..5f4c10b1108d 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,11 +1,7 @@
 AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
-AUX dolphin-18.04.3-memleak-1.patch 1651 BLAKE2B dff558ec7e3ba2dafe676c43da09409bfbdaaa12bf508aaf825121a72df129b3c1c6ef17066520b8c5900682806bf7a2cf65d914c9e69cafd64fd5f65f25e468 SHA512 1acfdb7b200464be878e503053faa08680595422c62619f94ed66a6f8bf84087328bd6959f69c0351b926bf63ebbe63a2c70f34e4ebe6e873958893d6caf0455
-AUX dolphin-18.04.3-memleak-2.patch 1180 BLAKE2B 4b546aefe5b1c5342522fae2a0bcf7e74f023f45f0e39950a104188b40e51a480e638d864b953033ec3f3630c89095315fb73a1ab45782c34adffa11b6a0f77c SHA512 533a449113f3c196cac02634f5c4baf25225fbca6747f3d47c6a69986329bfc2f52d95bc20c7a7c603e80e18dfb65a47e0608835fe4eeeea906035136fe541b1
-AUX dolphin-18.04.3-root-user.patch 2198 BLAKE2B e92b053b53f7f1c2c6ce25eb7a81e8c26f5dc9497f9bff6e2d02d125c9b57b7722352d18ee4d0ea001b73a71904d729485544596904229700d4a29a240e1c28f SHA512 c9f419f67ffae57ccf057fb5aa7352e3fb652cec3a9a21459ae5d3e9fba0b1dede993058afe83ced5c3fc036c11649476bc25435a29bc5d910257443e21cb43a
-AUX dolphin-18.04.3-root-warn.patch 1488 BLAKE2B 8e9536926b0b9e9f37c0e2be7e23fafc60f34ca1e25ef83423097d49e5f575cb762008b6c4cbf2c8d664cdbd010db5ed52a15226e812c5988c2e3431770334a6 SHA512 ae763f8fcef45108f812bccdb485d8da31fd27997583195e612c2ded82f041441849ae680f20d7259b3621b9609d55ff12dc6b3044b993e8f3063a1abc85aebd
 AUX dolphin-18.08.3-kcrash-init.patch 1741 BLAKE2B f569dfc4fc07790b1c69697b2259b6cf13e4bd7ff0d98be5e3b09a8bf0d404f86fdfee001349c8631b8c74c5ba1a73bf6573b130a5d8bf30241560d2dc6a6eef SHA512 34393a2285647ee8e33eebccc2bb563e5ea5298252c88ece505389bceae58ecc953e5daec3ca5f05cf7838f39375474ef97e4b54ec120d0396cd7e3cc5ac0d7b
-DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21
 DIST dolphin-18.08.3.tar.xz 4859384 BLAKE2B 60361ce997e0e4734fe953f988774dbe28aef9dcb7c2837c3860cfad5f56345d4d635f1478ce42a1649a6d5bd0d3838f722c95a747e1c77f17828d0d38b0ab29 SHA512 f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c
-EBUILD dolphin-18.04.3-r1.ebuild 2395 BLAKE2B b19b63b7c8c21be681ebdbffb31f6393d52deb82e84ec57ac0309eb40940e457f24f327c697433127d7e9987b14f01b76ee719d9781e1210a2d0520aba4d4bb1 SHA512 9b2cb58ed674f4a18580a36b18ba1f7ccde9fe440d759304dec97b66c278e3a69ffe1e63772899add41cbc611742f3539c0caf10a47eb7a801ca60db5decdf7a
-EBUILD dolphin-18.08.3.ebuild 2279 BLAKE2B 3751ba86049a6b3a0b7ae4c8ae6c255281110ecfdd939c8b0a566ae54f62a59bb8f77f1d78de6be7e740d70c54d82f7f37b1c1848d49e69e840eebaa09024716 SHA512 9316c267dddba8e21b7cd7ebc216b00a1fae6966caa48480cd9079f7374362475b74e6ecf0bb06ca1056ba25f48748c34e5eab3e40a12e9eeca85200ffbe9e77
+DIST dolphin-18.12.0.tar.xz 4865672 BLAKE2B 9459f58ab2a04e61a10d1ea7b8b90544246ea179c795e7b119486b60e5446c9f151298a3ed7d5a22dd2a110c9a292e2fe6481b36906981d2e5a329a61eea7583 SHA512 3adf07f4e58cabb91083080f0942d2d8018ec76d391869481de716c1afb6a0fa63e2bb13f94c31f70a7c1cb0d375444fb1ddc44af2522092108795db1b017b15
+EBUILD dolphin-18.08.3.ebuild 2277 BLAKE2B 447bd4a6809cf09a627eb3ae837df58088e6c396cc62e49c0daccf621e96b20210fb91d440ad222861fa17fccecac302769c7a7fcb0969dab208905ca9e841e7 SHA512 0bc9f70ab9a9be684b7b78d9d43d6996a3dd56242768d4acdcdb287e30cd92830ba31e5a01329040312ef213b0a8a42359a9d43bffe9830626e76021444f38bd
+EBUILD dolphin-18.12.0.ebuild 2164 BLAKE2B 0d32ee7e0eb96a2269798176c5c44fa73c6b30de95f3aacf7b894139ea12f14fd72de99402f78568233d2c45b88d01eddd64ad2af42b2eec2b5f3558f5b451f9 SHA512 23153f2ff12d087e161b5997f338a7a40e25ac7fe32af7705de6464f8628a73de9648270c9983a73a46b2862df2482f670804a595030f363684398309685444f
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.08.3.ebuild b/kde-apps/dolphin/dolphin-18.08.3.ebuild
index e38021b24876..660fdd8036ed 100644
--- a/kde-apps/dolphin/dolphin-18.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="semantic-desktop thumbnail"
 
 DEPEND="
diff --git a/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild b/kde-apps/dolphin/dolphin-18.12.0.ebuild
index 0b73811fb28b..9ec0f8f669a8 100644
--- a/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="semantic-desktop thumbnail"
 
 DEPEND="
@@ -48,9 +48,6 @@ DEPEND="
 		$(add_frameworks_dep kfilemetadata)
 		$(add_kdeapps_dep baloo-widgets)
 	)
-	!semantic-desktop? (
-		$(add_frameworks_dep kdelibs4support)
-	)
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kio-extras)
@@ -62,13 +59,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-18.04.1-flto.patch
-	"${FILESDIR}"/${P}-root-user.patch
-	"${FILESDIR}"/${P}-root-warn.patch
-	"${FILESDIR}"/${P}-memleak-{1,2}.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch
deleted file mode 100644
index 5bbeaa7e617c..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4536e25ac929d8d37ffbbba0642de662bcc9f891 Mon Sep 17 00:00:00 2001
-From: David Hallas <david@davidhallas.dk>
-Date: Wed, 18 Jul 2018 23:20:18 +0200
-Subject: Fixes memory leak in KItemListViewAccessible
-
-Summary: The KItemListViewAccessible class has a list of QAccessibleInterface pointers in a member variable m_cells. The problem is that when new entries are created, the newly allocated pointer is not stored in the list, only a nullptr is store, this renders the cleanup code in the destructor useless. This patch simply stores the pointer in the list, causing the destructor to correctly free the memory.
-
-Test Plan: I found this issue using address sanitizer. Simply building Dolphin with -fsanitize=address and opening a window caused the memory leak.
-
-Reviewers: #dolphin, jtamate, elvisangelaccio
-
-Reviewed By: #dolphin, jtamate, elvisangelaccio
-
-Subscribers: elvisangelaccio, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D14168
----
- src/kitemviews/kitemlistviewaccessible.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
-index 69c126f..4d1b28b 100644
---- a/src/kitemviews/kitemlistviewaccessible.cpp
-+++ b/src/kitemviews/kitemlistviewaccessible.cpp
-@@ -78,6 +78,7 @@ QAccessibleInterface* KItemListViewAccessible::cell(int index) const
-     QAccessibleInterface* child = m_cells.at(index);
-     if (!child) {
-         child = new KItemListAccessibleCell(view(), index);
-+        m_cells.insert(index, child);
-         QAccessible::registerAccessibleInterface(child);
-     }
-     return child;
--- 
-cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch
deleted file mode 100644
index f39885bdca36..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2cbf3cb11ea668577121fa755c1ddacc6f0acdd8 Mon Sep 17 00:00:00 2001
-From: David Hallas <david@davidhallas.dk>
-Date: Wed, 18 Jul 2018 16:43:25 -0600
-Subject: Fixes small memory leak in DolphinContextMenu
-
-Summary: When DolphinContextMenu::baseFileItem is called a KFileItem is allocated and stored in DolphinContextMenu::m_baseFileItem, which is of type KFileItem*, but the destructor failed to delete this.
-
-Test Plan: This leak was found using Address Sanitizer
-
-Reviewers: broulik, elvisangelaccio
-
-Reviewed By: broulik, elvisangelaccio
-
-Subscribers: ngraham, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D14178
----
- src/dolphincontextmenu.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
-index 7d7d7a4..8fdaab1 100644
---- a/src/dolphincontextmenu.cpp
-+++ b/src/dolphincontextmenu.cpp
-@@ -81,6 +81,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
- 
- DolphinContextMenu::~DolphinContextMenu()
- {
-+    delete m_baseFileItem;
-+    m_baseFileItem = nullptr;
-     delete m_selectedItemsProperties;
-     m_selectedItemsProperties = nullptr;
- }
--- 
-cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch
deleted file mode 100644
index 04baafa1d8e8..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 40453cb627a39f1ff92373f865426f0bcdc83419 Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Wed, 9 May 2018 17:18:08 -0600
-Subject: Re-allow running Dolphin as the root user (but still not using sudo)
-
-Summary:
-Prohibiting the use of Dolphin as the actual root user (not using `sudo` or `kdesu`) breaks legitimate use cases for using the root user. An example is Kali, a distro that logs in as the root user by default as a deliberate design choice.
-
-In such an environment, there is no additional security vulnerability beyond what you're already potentially exposing yourself to. So, let's re-enable it.
-
-BUG: 387974
-FIXED-IN: 18.08.0
-
-Test Plan:
-- Log in as normal user and run `sudo dolphin`: you get an error message.
-- Log in as normal user and run `kdesu dolphin`: you get an error message.
-- Log in as the root user and run dolphin normally: it works.
-
-Reviewers: markg, elvisangelaccio, #dolphin
-
-Reviewed By: markg
-
-Subscribers: chinmoyr, cfeck, elvisangelaccio, mmustac, Fuchs, markg, graesslin, nicolasfella, zzag, kfm-devel, emmanuelp
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12795
----
- src/main.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index db52e11..75bab67 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -43,10 +43,15 @@
- extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
--    // Check whether we are running as root
-+    // Prohibit using sudo or kdesu (but allow using the root user directly)
-     if (getuid() == 0) {
--        std::cout << "Executing Dolphin as root is not possible." << std::endl;
--        return EXIT_FAILURE;
-+        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-+            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-+            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        }
-     }
- #endif
- 
--- 
-cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch
deleted file mode 100644
index bd6e2ab0d815..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 621cd24acfec8cbed19e9aa6ff8650cd6f38f809 Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Sun, 6 May 2018 17:48:54 -0600
-Subject: Show a warning when running as the root user
-
-Summary: Now that Dolphin can be run as the root user again, let's show a warning.
-
-Test Plan:
-When run with the root user account:
-{F5882057}
-
-Reviewers: #dolphin, markg, elvisangelaccio
-
-Reviewed By: markg, elvisangelaccio
-
-Subscribers: acooligan, anthonyfieroni, chinmoyr, kfm-devel, rikmills, emmanuelp, zzag, nicolasfella, elvisangelaccio, Fuchs, mmustac, markg
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12732
----
- src/dolphinviewcontainer.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
-index bf8ac88..7b99595 100644
---- a/src/dolphinviewcontainer.cpp
-+++ b/src/dolphinviewcontainer.cpp
-@@ -108,6 +108,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
-     m_messageWidget->setCloseButtonVisible(true);
-     m_messageWidget->hide();
- 
-+#ifndef Q_OS_WIN
-+    if (getuid() == 0) {
-+
-+        // We must be logged in as the root user; show a big scary warning
-+        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);
-+    }
-+#endif
-+
-     m_view = new DolphinView(url, this);
-     connect(m_view, &DolphinView::urlChanged,
-             m_urlNavigator, &KUrlNavigator::setLocationUrl);
--- 
-cgit v0.11.2
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 81b912ac01aa..956679e013be 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
-DIST dragon-18.04.3.tar.xz 1729144 BLAKE2B 4832bcdc8d01a97f85cf89e928e2bf503d9b7343a5e374a6c2b20fdef82676fd0263e60a8f2e3adad4f18afb071e42dadf42548fa3d81b08152baf6e8b0046f6 SHA512 5dd3a0157cbac092a0bb224c38dab6706545fd78103e98b060860c5465c6454c4c3a2ea4e646a99f4683a61d8c1248e3a7d2c5f5e69f7e711d6f3ac16ab198fd
 DIST dragon-18.08.3.tar.xz 1729504 BLAKE2B e71109ff173065cf3db908594709e5b45510753fe6edadfcecb19dbcfb2dd9715d7635943efa04aa3a546bb8119b7b5dfc3b5feba66c2fe016f458f0e30f4e3c SHA512 86706c84c65c2780780d292f2a32b43ff4096d7beb12ba25a72e61ac9f05cc321fea9eef85f0c9c38afd58e68d74d0cbf683443367d499b8e9f678ca310cb3a8
-EBUILD dragon-18.04.3.ebuild 994 BLAKE2B 6178094991fce897fefa9626c65c630fc62aba9c716096bd77f74eb7177677f421a4cd6055c4d88d7609730398f9b4d5464d593ca5daeb811306664a07c2fb0c SHA512 adad2bc72bbb13147c70f8bd7c7cf8cc73b9980473f6f7691676d448848307c637b13a5895feb06804888b9827e1d4ed4de97de3c729eda20456667af73d1fc7
-EBUILD dragon-18.08.3.ebuild 993 BLAKE2B b720c8ce300b399662511ba84e6098a6fd36a88595610e3d9b94278b1e8c64230214b1ea64e27a925aeca5eb5e7eacdad7de495932d573a38da54935f42ad61d SHA512 15ce60f0325f8c7e0ef967297d2bf4f77f8a4005540864a9ecbf48cdae7288d70d1ecbec6e85a0c6504b167cf94422718db4988a70f0a8840d36d95a422cfff8
+DIST dragon-18.12.0.tar.xz 1729000 BLAKE2B 0c8305f66b5c706a75e8cc92ee967fbf521da9791d0c16d5e9ffd549babd73225551d5e40627b85033f1b6e67f2cc02a1e50e26ef9de4906eaecb2e9b49f38c3 SHA512 f3d4596ddb990c6936980448c2a53533086bc7d8d1d8648f7b8d2959a7a779aa009d1b5897fd2d79b0e67e17b1e636231c1f7bfd42a6464ba7347faec6d48664
+EBUILD dragon-18.08.3.ebuild 991 BLAKE2B 36ccfda7c7bd085b4625f2ab22e38fa4336428e15b3a2024bdf7e810a2f9270027b47d930ec8f84538129eb66ce171d78952bb1e335ff4aa98e9521331c275a0 SHA512 5893fca443e2f0128697c965b745dbe5d002bf1db9883443fe0982b59fdbf962417308bb59e4d6b7c41fe50fa303d16d83c0c808b9c435c6fa339c1ee3c632d5
+EBUILD dragon-18.12.0.ebuild 993 BLAKE2B b720c8ce300b399662511ba84e6098a6fd36a88595610e3d9b94278b1e8c64230214b1ea64e27a925aeca5eb5e7eacdad7de495932d573a38da54935f42ad61d SHA512 15ce60f0325f8c7e0ef967297d2bf4f77f8a4005540864a9ecbf48cdae7288d70d1ecbec6e85a0c6504b167cf94422718db4988a70f0a8840d36d95a422cfff8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-18.08.3.ebuild b/kde-apps/dragon/dragon-18.08.3.ebuild
index a371377fcaa0..90078179598d 100644
--- a/kde-apps/dragon/dragon-18.08.3.ebuild
+++ b/kde-apps/dragon/dragon-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/dragon/dragon-18.04.3.ebuild b/kde-apps/dragon/dragon-18.12.0.ebuild
index a68ec0e5baca..a371377fcaa0 100644
--- a/kde-apps/dragon/dragon-18.04.3.ebuild
+++ b/kde-apps/dragon/dragon-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index db9904d57d1b..e62b793ddd98 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
-DIST eventviews-18.04.3.tar.xz 441572 BLAKE2B 1c9fb9c5e6e23c0d068ed4183c5ea90f459ed23b86ada2955477e89e4cf0d86d95b4779cec63dfa8b4d8743198efee520caf665db2d448ea16d5eea54c962680 SHA512 d6a202a31cfe9f4765f5915c6cf5542b9d1e9ffe309eba40dc00690d6281951404d14b6e4e0d7f71c8d1b9a5ad72ef5ca0bed326e462ebe574678317be34c1a1
 DIST eventviews-18.08.3.tar.xz 441396 BLAKE2B bed5619fb10dfd37e0d8a0f943abe97a817b509a986931bc7d1e3bf8da4e43a0810209414620acfb7c2c68cf3ae27b91b0c76431cb6f42a05160c73cf06da8ee SHA512 957e700acffedf47f0a247e80d11e6bff03edb3b831a1a91c81b67d347f5add03f49f6f6f2257ddafde193a947a14e07b648e98ede89f1e47417746a899a9dfc
-EBUILD eventviews-18.04.3.ebuild 1028 BLAKE2B 9cf70479a89f325ef19a53ca963c62807f1cb7256be93e36ba22c37f4d2cb00e222152a2c211485303cce829a3f78e700665f2ad3f354b715c9fd68e90d07019 SHA512 d48878283f9480486e99291fe6ac62bde34eff6f51220abb2cda9a25f09e89c85be22692095904feeed1db7e3d3e5ab83ef7fe0a383fa2b76480f65c920a74d2
-EBUILD eventviews-18.08.3.ebuild 1027 BLAKE2B b51db68a282d9cd7781ef3b97b98ead0eda79d37c55145c84d7316b408f7a054044c85a43b1d9fcfd5062739915a199e330629af63ef90a225b5fab52c34d03f SHA512 d6369f75bd91339740e72b4ac54fdfa433fe2655705fa595230b9f24e4a32c48cccfcdab056d4ac5d8e2290e310b666a063db3f11e9f05f19174f641ddc9aa83
+DIST eventviews-18.12.0.tar.xz 443136 BLAKE2B a88bbf9996ed58bf8875897317cab50602ac2ada7ebeae72e24997d6e77e0808ddd4eb6320c1551cdb4f68bd2af5c848fbc8c17604c00516baf9164e3d129e11 SHA512 378489a355fc82478c10dc4259ef881d8ee64e12da4161e758e2037b5458974d2cf8ed4e358d9ee21e0f162dee015ba9455db17924200c3f91fb838de6f6c999
+EBUILD eventviews-18.08.3.ebuild 1025 BLAKE2B 22d22bb1c54c43e63224b6c192d7b7e79c4df644b118a6ffcf8d6b3cbe7ef6c9dceb0ce168bfec330c8765379e63f24f740898b52eed4fdae5886d40600afa81 SHA512 f1e76e142c7b40696ad8a34b4d98fcec3312babb2763d5a3d9174fd288e355f268130aa876a2fd8c2b1b5266b3f7cc87df7987e7e2e0c4af78802425ff6de15c
+EBUILD eventviews-18.12.0.ebuild 1027 BLAKE2B b51db68a282d9cd7781ef3b97b98ead0eda79d37c55145c84d7316b408f7a054044c85a43b1d9fcfd5062739915a199e330629af63ef90a225b5fab52c34d03f SHA512 d6369f75bd91339740e72b4ac54fdfa433fe2655705fa595230b9f24e4a32c48cccfcdab056d4ac5d8e2290e310b666a063db3f11e9f05f19174f641ddc9aa83
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-18.08.3.ebuild b/kde-apps/eventviews/eventviews-18.08.3.ebuild
index d618d2529733..4c1425b2865f 100644
--- a/kde-apps/eventviews/eventviews-18.08.3.ebuild
+++ b/kde-apps/eventviews/eventviews-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/eventviews/eventviews-18.04.3.ebuild b/kde-apps/eventviews/eventviews-18.12.0.ebuild
index 806d72859ca8..d618d2529733 100644
--- a/kde-apps/eventviews/eventviews-18.04.3.ebuild
+++ b/kde-apps/eventviews/eventviews-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 8a1c8c2716d9..6f5dd8155a02 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
-DIST ffmpegthumbs-18.04.3.tar.xz 21208 BLAKE2B de6b446436f99ab502eb63a897cc4e62403fd88202b7d3a026d8d3a373e30c22bc65b72afaaecc1a37c543b1951ccff2f48a654228bc94be90493c97d3ceacdd SHA512 5ec858f4829bbc0ae480b908520f2f19cfb3dfcde2d3f8d357e3c671a84cb9734f0e4041eb35a625aecb2abe94e54f18e44bfe7e85afdad00c941e4a1065eba3
 DIST ffmpegthumbs-18.08.3.tar.xz 21860 BLAKE2B 8ba95b874473db9a0e3788f065983804c903f4e74abe591bd28783f784883fff1ee0b01fb089c074819013d5d4f4e27df0b9f93aaa25dc9d94189e1f1d36bfe7 SHA512 d4f08c29d09436140b9723dc7a82f48f959e69e3df7fcce0a6d1bb18ad6bee9cfdabdde4a8e5fc6c830ac57280095885c7f07ff7c22b330c1312ecd5135aa967
-EBUILD ffmpegthumbs-18.04.3.ebuild 436 BLAKE2B 1cacb9973f50bbe7d728a2f5cd98e4069db65f49ef979724130fc1c44e9008a400cb963c348763fc43a2d5baaa989ce6874f612a824d98edc45d9e3c155de843 SHA512 036321d6c9cd10f8b118916926aaef81692b73ee07954c6548af423d03ef8c7ee9f6e07bc1cb533e6ea351c4450f798d97b5838b6c07a77dc097ba0d943f31f6
-EBUILD ffmpegthumbs-18.08.3.ebuild 520 BLAKE2B 04485ae5ae44fdf96fa5650b505be141b9821952ab0de0e0e797425139a2205b76a2376e2942c61d0c88c6e5524339bf20b007960776f369e0fe997646385d50 SHA512 22ea414e3912603fe0f5db8cbf1b6d4c428b8f1ed1d8ee90a801a13226a9029b915bf6c8cdfa5b89e881a2f0c918e83c464126c23a9e22ffe16613666eb7d779
+DIST ffmpegthumbs-18.12.0.tar.xz 21880 BLAKE2B 5e507ef94845797d6f71a81423f89e56462e6647469e87d9bc60a5946740bb60539c24e3afa4960b22238dd40d14da126213702e0f77e36e9c0684ccf6601547 SHA512 8b975e10309354a1132726afc0209a3a1ec8ed8c2a9f99c370ed82c48d076f8c33bf0d5e07e0ff5f532965cc876ccc6e0ce11daa2144da265a46f5e404dcce13
+EBUILD ffmpegthumbs-18.08.3.ebuild 518 BLAKE2B 60c00bdd5465c003f951e2436196e7ca11cef0803925dd5cd696d6b2a3b1257e3c3fc30104e8b654c978b4345902122c2b71307ba76fc9ac55af0477df56a371 SHA512 9ef38bc4ca10c6e3caabef909a0c9715081b3ef6a0d5cd2c4a1098417a0b3f382fde378db47cfe436eb8fe408aac9767adf5346b50a8bcb8ff82b1a3c2eb1b6e
+EBUILD ffmpegthumbs-18.12.0.ebuild 520 BLAKE2B 04485ae5ae44fdf96fa5650b505be141b9821952ab0de0e0e797425139a2205b76a2376e2942c61d0c88c6e5524339bf20b007960776f369e0fe997646385d50 SHA512 22ea414e3912603fe0f5db8cbf1b6d4c428b8f1ed1d8ee90a801a13226a9029b915bf6c8cdfa5b89e881a2f0c918e83c464126c23a9e22ffe16613666eb7d779
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.3.ebuild
index e0514b8dcdcf..45e99d2299c6 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav"
 
 RDEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.0.ebuild
index fd3c069e3389..e0514b8dcdcf 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,12 +8,15 @@ inherit kde5
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="libav"
 
 RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	libav? ( media-video/libav:= )
 	!libav? ( media-video/ffmpeg:0= )
 "
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index ea13197a48e4..7a0143b4820c 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
-DIST filelight-18.04.3.tar.xz 659376 BLAKE2B db637bfc183a893cb19d802084c490a983d9e6bab6e9fa7bce9896d6e6e24d93f769e3334bdb667ae656882e3658cdb9d7417618a019a3d44c08850e3a549504 SHA512 a938a23b150d0c3caba453e1a9e60532d5da24caeec7bffbd781363a0b79fd5fc8a2a6875b67a42beb5d9bc9598145bd8f58b9718ef39166f5738a9dcb303890
 DIST filelight-18.08.3.tar.xz 659608 BLAKE2B 45451d5c6a89798ca2461931f0bd113f66261088ea5c599bba3235c9fe87793a1c8941f2c8240da0071c61298fb1396d32afe0a4941af7008f4e30a635d7a1d0 SHA512 aece68cff2fe136515f70b4bcfd7e26aa7643f02a147e98b378b78ea0981036c0738c0f6f176b4d64c58bce1d5835f0be74bfa6a396e593d0dbf0e9ef864b042
-EBUILD filelight-18.04.3.ebuild 697 BLAKE2B 325b5ffebbed3e5cb98173fc20fb6a048d35de8cddb9ec8956823e59fd65fa30cc8a84a49ad8fa1f1fa5335c4c2c52a6a22e403571996babb6607ab356468e49 SHA512 6c9e6f0e094463deeb5d1132bb5c66fe5faaf249a80c11e8b5e09f84e89dfafc6b1b610e329c97beb8f7e06b04f562911474b1e0d22978ec8c6f80a4886eeff6
-EBUILD filelight-18.08.3.ebuild 696 BLAKE2B 7b695029497cb4c20c2ffb26aa1b13dacd690ddb01fed12fcf2a209c87189bc5db2aec4c0b10967464df1bad3ba9a0d4974a4b13fee3c3257eff035156502e7f SHA512 b2edcab20dfbe7f4f3cd7e61a9f1072e93ebd4d91bfb2521af433292d4c9ec8d30c271056b50df8e3bf3fe45efae61c94cf6b5428c30a2bb6dd47512a96f2c22
+DIST filelight-18.12.0.tar.xz 660372 BLAKE2B ca31e89a2afb9641ba4be4aab99994a2fc9a1bf4b6d2d6c0c60cf6f10717d78f25b3bc90bf4e9e95cc13a9bfd1415875c59a26f4e6ec40fbb8933370fe98aeb5 SHA512 14719fb462e1eaf5146428e103cb6946b8122237341d969f754b78b0e9657a750e8aecf12b40ab0209766f964b364b3e1d54cf3926e4e081b05a6827209e959d
+EBUILD filelight-18.08.3.ebuild 694 BLAKE2B d67c02cef69417414b879414e546f61410f7eb5c7e4b6b6ed0b18b18dd026105dc540c90b95abf91a3ca376ae906b66fa713f8a4b215df7134d046f463840667 SHA512 a2a35a4f6d26ee8ce64e87f63e3446a12cee5af9e322272ddb9f44d2013ebed2ed9e7c94c08fd4b6dc7caae68f90cc4dc60209814abf3e63c34ccbe26a2c88be
+EBUILD filelight-18.12.0.ebuild 696 BLAKE2B 7b695029497cb4c20c2ffb26aa1b13dacd690ddb01fed12fcf2a209c87189bc5db2aec4c0b10967464df1bad3ba9a0d4974a4b13fee3c3257eff035156502e7f SHA512 b2edcab20dfbe7f4f3cd7e61a9f1072e93ebd4d91bfb2521af433292d4c9ec8d30c271056b50df8e3bf3fe45efae61c94cf6b5428c30a2bb6dd47512a96f2c22
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-18.08.3.ebuild b/kde-apps/filelight/filelight-18.08.3.ebuild
index 396d11abd4ae..617bbfdf580f 100644
--- a/kde-apps/filelight/filelight-18.08.3.ebuild
+++ b/kde-apps/filelight/filelight-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
 HOMEPAGE="https://utils.kde.org/projects/filelight/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/filelight/filelight-18.04.3.ebuild b/kde-apps/filelight/filelight-18.12.0.ebuild
index 46fadf65be7b..396d11abd4ae 100644
--- a/kde-apps/filelight/filelight-18.04.3.ebuild
+++ b/kde-apps/filelight/filelight-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
 HOMEPAGE="https://utils.kde.org/projects/filelight/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index b449859bebea..7adee86a1fe8 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
-DIST granatier-18.04.3.tar.xz 1961648 BLAKE2B d1a14db7fbb3bc07ec19f4db4a142aab54196e7612a0341873877c6a74f000970e3720f0e2640d3a72cfde6e993058ce9ba0a08c01f2b316f6ba76f323ccd7e8 SHA512 c39fe20c1d88fd8d521e0db91df46535488efbaba27f48faef63e015d9806b3d66a81831edb9b8bb0508954f79822b70ed47b7c3409601a6102c8e7d32304339
 DIST granatier-18.08.3.tar.xz 1943028 BLAKE2B a6cbd8fc61687b825ca84db608f792e7ade19d1edee28a645ca000487479ac479ac3f27a0e6cd5e05805893da484f9aaec8759f44557309abd6557fe4341fce7 SHA512 9f4a49af1ccf004bae32910d53a4a83731b6942c4dec107ee5a80aa950501b12d98ed2b0f2a3a3ca37ca5f6608501a04ab2153304adbc91951aaa83503421250
-EBUILD granatier-18.04.3.ebuild 734 BLAKE2B 317d5bdc8e04ccd6efc3d3133e84967c29bb68ff65c6ad3001e9a7e28a62495f1db35d5b1ad345eb966b37f06fb337e1be2db9d539d4c10d6ee354424c381c6f SHA512 b3c19a91781523d509800563c93531106cb8455eb02bcc4c6a8bd1efbfcec2c9a3ea1c4fc4b622313e8f85ccc4cd3c27ea506fa5fe4c6b6fc0c4dbed72e58904
-EBUILD granatier-18.08.3.ebuild 733 BLAKE2B 42f684cb3b9a7a4cb1998b7b9e752a374376316abbdbab58e0ffad21d2bacfe3f9dd0a3d4106aa353ad29e32fd0dbec2cd7aa55f7406910ccdc5cfd1bcb08438 SHA512 9cb23de5f60c9018325b9b9be03cb732accd599dbb8880e3b7a79fd98eae07f6492ef73bb5cbee4a6858b658b648bdd68bb8927622cdcdc4c1c3274998db83a9
+DIST granatier-18.12.0.tar.xz 1942924 BLAKE2B 83835a94a082e7fb6fa603be7eefe10eb8e8c681d83da857a6af417d98b69c970c58f027aab900871a846a6d3f67a0c7acffad2e00be6f039081e45a654a30a3 SHA512 90deffbaa728c43eeca07ddf777019823c0b856fe40bff71c79ce3e8343808b4ad993099877a9ff49680af83970a307debe6c75858f7a53e7f486677ac65310b
+EBUILD granatier-18.08.3.ebuild 731 BLAKE2B f780362472af2634eddfb9f9a6fda38ed42304310826a7dbe9a5e4419332ce97ce236fb78e24c702e70447d5123d0f6b0398ad89f62746addbf962451e55a03b SHA512 00b7ea7d413c113ad9d74b136fcc443059f6a379ab87c7f7e0a2ce49245582a636bb4d79868038697bf5857f71992941d9306d8ea126e2938bedc93d9dc5498f
+EBUILD granatier-18.12.0.ebuild 733 BLAKE2B 42f684cb3b9a7a4cb1998b7b9e752a374376316abbdbab58e0ffad21d2bacfe3f9dd0a3d4106aa353ad29e32fd0dbec2cd7aa55f7406910ccdc5cfd1bcb08438 SHA512 9cb23de5f60c9018325b9b9be03cb732accd599dbb8880e3b7a79fd98eae07f6492ef73bb5cbee4a6858b658b648bdd68bb8927622cdcdc4c1c3274998db83a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-18.08.3.ebuild b/kde-apps/granatier/granatier-18.08.3.ebuild
index 80660b8c4c0a..191af0af1295 100644
--- a/kde-apps/granatier/granatier-18.08.3.ebuild
+++ b/kde-apps/granatier/granatier-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/granatier-18.04.3.ebuild b/kde-apps/granatier/granatier-18.12.0.ebuild
index 5f9b052383d9..80660b8c4c0a 100644
--- a/kde-apps/granatier/granatier-18.04.3.ebuild
+++ b/kde-apps/granatier/granatier-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 433a7fc7ba03..29f368f6198f 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
-DIST grantlee-editor-18.04.3.tar.xz 111032 BLAKE2B ac0c177c5f2038d941e172e84155ae4de33183a13a5e522b6ff39eaa402ac41e80fa53cbe2c56351943568fcd33ac2de7eefa59489c68f3ca4663cbe7dad425b SHA512 6eb55fe1632dbee7fd2d632642460a8c6471d801e877be241a519fb1f103154844a01949b0e5db0b833351c6fb496e3dd34998acf1634817c1319b173be15acb
 DIST grantlee-editor-18.08.3.tar.xz 111340 BLAKE2B 60cc21a9912876f4e6e3844b3fde8d98a20ad073a871c28ea284ec1a3fa88190af463fc3d79f4331ddb723673b846b157562bb9f45b677fee8b690ba51b82fb8 SHA512 f02a2f59ede6a03af556d470291356f8e003292609cb8109b6690e7946ef2a67bab6ec12fb12ebbbeb481aa6f14cbcfc0217e008ba88e92a4b567976f32fe89b
-EBUILD grantlee-editor-18.04.3.ebuild 1166 BLAKE2B 2ee5e6679257691d98d7a03e2972fdf33724487bbb69fc3c6aaa3dd7d2682dcff05cd51452f4f276e13e00a6b37d11c8d6ef0a92dc2f715d23886c63b21be55c SHA512 4ceb795d35dc12eecc2dbd69ccacd361aba00b18461340f9a867a0cc0e67fa7187d83e1800f4a8465e1fc82674401145e09585859b0b3b21d07a03227a1f68a3
-EBUILD grantlee-editor-18.08.3.ebuild 1165 BLAKE2B e9db0847d50cf3ac5acb9fcba05306adbd08a0f3d3ebb10bfdecb9b2db9e78b4d710aadae344bf7fb1f888ad771666718ac22e12384ebb71c65874ec38f4d28a SHA512 e2aaf9a6a8cd74f924aec7fef5d89bbb9ef6158d3b45b3239f43581c0418c868fe734fad66960a09179b4572b6472237ad0798b950ff5bd4277382771486dfa7
+DIST grantlee-editor-18.12.0.tar.xz 110700 BLAKE2B 7544f96ccf6d31f59a58436338f32a8c6a48cb0d503cb3b5d2f5bf519f8a969df6369a8472cf0b9cd9860029340344b5da04308e131bdeea27932cfeb24251a6 SHA512 e0d649188474c1d9fa14cf7a731d719d7e30b573dd00b0f1030fe989a2380c1512a4f290d96ff906ee5c8d55d140a6f4cffac4581254c40689b997c534f623cf
+EBUILD grantlee-editor-18.08.3.ebuild 1163 BLAKE2B cfa5779e05da70f362dfa6f30097431f32e26e79ffac51b9bc2399dac7973539eec95a7e21f19c8da35e82d18281c5d5ee823cea01e3632ce2460f0b4c5eb211 SHA512 2ba6926f18f52f26a98220c853ecc193481e8e778d7e54411b59a726837357d4a99442bdb10b4820c2dc5633153032390807891da069b5b6cb68a7763d6b7e62
+EBUILD grantlee-editor-18.12.0.ebuild 1165 BLAKE2B e9db0847d50cf3ac5acb9fcba05306adbd08a0f3d3ebb10bfdecb9b2db9e78b4d710aadae344bf7fb1f888ad771666718ac22e12384ebb71c65874ec38f4d28a SHA512 e2aaf9a6a8cd74f924aec7fef5d89bbb9ef6158d3b45b3239f43581c0418c868fe734fad66960a09179b4572b6472237ad0798b950ff5bd4277382771486dfa7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.08.3.ebuild
index 1dbf5cbc2248..2dc4072ecb1e 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-18.08.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.04.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.12.0.ebuild
index e4081d1e526e..1dbf5cbc2248 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-18.04.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index c154091dbf85..343af71068b7 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
-DIST grantleetheme-18.04.3.tar.xz 51676 BLAKE2B 97db8d46c7e99d1cf3a3ef61dfc579564adfa80d4d5aa21faa29cd94c332c9f3c6ce8e9845a3c6f1555be5a95c7cd603bd8c5372c69f1cf1296bddc96580ce17 SHA512 5f5ded0dcfba8759101807f2fe2148b9af07043da05a5357be7614e4a26660c9f50b41206bd6dfadd9b659ed08d55f9f76c47e076a1cccb3f595209441de4010
 DIST grantleetheme-18.08.3.tar.xz 51740 BLAKE2B 1c83c9b8d2c376b52416e50bc4b4d82630e17b81e7de51467540fe3b2629983f376780776daa64c26f49b7a3599078256b7e4b4a07d27d2c23bb37e5631304ae SHA512 38331cef77b89c5ca26ffab95bb246942d96fecb719c2341ecde65b049489a2b6883dc4ba87ec4717e7bb10d549fe7a2818b6dc60889dae64f144a80d21fbede
-EBUILD grantleetheme-18.04.3.ebuild 735 BLAKE2B 01da5ebbc4f0fd762fd77fc496ca81622924d98e60749f366d4ed068ffca33dbc6111433aaf0b057701f6b683eeeba5a3f1a0c552b34fbce741128f4882c427d SHA512 1ea754208f4dca36e52ec2f2ffa5699350b6de9b19106cbfa00dbe655377bbb596aba4d31f2b4a17135bd48673401a4eaafd2a7d6efc3a9a5b46fc8652bcfa0a
-EBUILD grantleetheme-18.08.3.ebuild 734 BLAKE2B 11301736cfedc092b6b9b30fde0487fb47e5310d2b1c131f81c64cb2a4e6b6f75abb93dbe3494dccabf836480f82d246d3e442c2b3fd0de21a2dc27f540a5c51 SHA512 d5808504fa3ee116e0ff1f1c29e03b9d2d073995b5a2e3294c3b28d1c7a82bd2ebff0e14de979aa193d6fd8aa657548f6aa9be76cf2303afdecbc53702ec215d
+DIST grantleetheme-18.12.0.tar.xz 51580 BLAKE2B 629513072d44020c037b54c74542b9e8c80117e4b5b4065ed95ccaa7b318bdec039b2888f425e80a8a5abe5fdb4b0a303b8c29d71e33d317c26ba55eb5e09230 SHA512 852923dde7b8c0fb97fb00617b741dd1659dc9930a8b3f91ac6021e243e086c476da21ff7ce2d93e2d939a64b89301aa3ff151b351ae257d686878a0e9733ac5
+EBUILD grantleetheme-18.08.3.ebuild 732 BLAKE2B 0b539237636abd9ce2840f011b620bf6d1a5834f0bce48f6033834e4127e665bffb56d098f84960addea1d006bdcc132bdf170c472874a936b975836698e297d SHA512 290897194ed9f4200532ea6e0d9ca5e340295a57653fa9a4df265464f5312cb118c3053e699a748a7852c861b530bbd31e200545fc9aa23007c51a76bda2f668
+EBUILD grantleetheme-18.12.0.ebuild 734 BLAKE2B 11301736cfedc092b6b9b30fde0487fb47e5310d2b1c131f81c64cb2a4e6b6f75abb93dbe3494dccabf836480f82d246d3e442c2b3fd0de21a2dc27f540a5c51 SHA512 d5808504fa3ee116e0ff1f1c29e03b9d2d073995b5a2e3294c3b28d1c7a82bd2ebff0e14de979aa193d6fd8aa657548f6aa9be76cf2303afdecbc53702ec215d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-18.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-18.08.3.ebuild
index b12c371bd9ed..d9e6bcbe8778 100644
--- a/kde-apps/grantleetheme/grantleetheme-18.08.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for Grantlee plugins"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/grantleetheme/grantleetheme-18.04.3.ebuild b/kde-apps/grantleetheme/grantleetheme-18.12.0.ebuild
index a1c9e2a4c809..b12c371bd9ed 100644
--- a/kde-apps/grantleetheme/grantleetheme-18.04.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for Grantlee plugins"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 6d81a3aa2273..cb60cd4c2294 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,6 +1,6 @@
 AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106
-DIST gwenview-18.04.3.tar.xz 6055876 BLAKE2B 5202dcfe597ad1da7d5b18124ec357239a26a30c20d83c37bc7258e0ad4232b53081a8e050017850ea6eeb02fe0d88f90b90b0029e364929375d3e09dc8bf7fd SHA512 a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f
 DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce
-EBUILD gwenview-18.04.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
-EBUILD gwenview-18.08.3.ebuild 2790 BLAKE2B bb12f1c92eea28826023841e4601d65b24d392a0d7f93eeca6c930be4b9ac6007512347f00762825e662d2ccb6ec9b72e181071c4c58c602ba7e4fc6f0be765b SHA512 f68422bc89f24b66981061a92efb882effeb2f35c76e4b61c9fe43230d69ffc43a625bf51cb2c98e51e91ed077b1618530e8aafefc87ee96c11f197b77643a97
+DIST gwenview-18.12.0.tar.xz 6178072 BLAKE2B 4066165db148987c606e85c47cb6a47f236c07938d3819ca76ce6c083764874360cbba82c6b9cbe9a7d72771269a8b66a7894634a55f3d9a2d6db027c982aa2e SHA512 ef7f706c3c3278ca4f826518824f7457948b5fdac2d49cdb55977d55829cc90852745833fd86b94a5ce2cc7b55286c864b05f9a51d546e29538bf0f32bec2ec4
+EBUILD gwenview-18.08.3.ebuild 2788 BLAKE2B c77ccacf146ac431a6e604c6a69107c54a5af2c50c907dafcdad900527aa5dbfdc4cc1405920d7502feff53309bbfce8cbbd244483a8c7842862839367518759 SHA512 4652f7225a398412bfe6737adf2fc437376640cdaff0d3976ebaaca8de15eacb9c9e99b0f950e0a589bce01ea38fdafbd3ddef3dc09b5a07c0d24688179a4b8c
+EBUILD gwenview-18.12.0.ebuild 2646 BLAKE2B 8608898cf943791816ed3cc3010276258bc3a259a829173b5ec43854c80da12ebb03e4958303588928995df5e607fad28df18fc0056565fed385c850adc56c09 SHA512 651a53414e2c9d6cb35283fe99eb469ab3e30a148a67f984dd82a812e79ab8b7dea5d4f030b8fb60f9d3cca6ace9cfd3297d01b4f3294b612a3b6bf9e7355a30
 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de
diff --git a/kde-apps/gwenview/gwenview-18.08.3.ebuild b/kde-apps/gwenview/gwenview-18.08.3.ebuild
index 1d60e093c7e1..f82a3952a33b 100644
--- a/kde-apps/gwenview/gwenview-18.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-18.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 "
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop X"
 
 # requires running environment
diff --git a/kde-apps/gwenview/gwenview-18.04.3.ebuild b/kde-apps/gwenview/gwenview-18.12.0.ebuild
index b353cb2bd0b3..a580d5a58ccd 100644
--- a/kde-apps/gwenview/gwenview-18.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,21 +7,20 @@ KDE_HANDBOOK="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="KDE image viewer"
+DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="
 	https://www.kde.org/applications/graphics/gwenview/
 	https://userbase.kde.org/Gwenview
 "
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="fits kipi raw semantic-desktop X"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities fits kipi +mpris 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)
@@ -48,8 +47,10 @@ COMMON_DEPEND="
 	media-libs/libpng:0=
 	media-libs/phonon[qt5(+)]
 	virtual/jpeg:0
+	activities? ( $(add_frameworks_dep kactivities) )
 	fits? ( sci-libs/cfitsio )
 	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	mpris? ( $(add_qt_dep qtdbus) )
 	raw? ( $(add_kdeapps_dep libkdcraw) )
 	semantic-desktop? (
 		$(add_frameworks_dep baloo)
@@ -67,10 +68,20 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kimageformats)
 	$(add_qt_dep qtimageformats)
+	kipi? ( media-plugins/kipi-plugins:5 )
 "
 
+src_prepare() {
+	kde5_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package fits CFitsio)
 		$(cmake-utils_use_find_package kipi KF5Kipi)
 		$(cmake-utils_use_find_package raw KF5KDcraw)
@@ -78,9 +89,9 @@ src_configure() {
 	)
 
 	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
 	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
 	fi
 
 	kde5_src_configure
@@ -89,11 +100,7 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version kde-apps/svgpart:${SLOT} ; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! 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 45712b54545d..00e042488a35 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
-DIST incidenceeditor-18.04.3.tar.xz 526824 BLAKE2B 17047dd77fb93c39322cf6c9cf3dd5c3e75bf20fc959ab6594fd6d00c6c7be924027bf0c1964c98ab162b109aeebaf8b738598b76b88e860ddfacb76449d24c0 SHA512 805a0eb76d3047e7520d5915b2210c948474028b6692d19ba74ff32553366bf792133c78a5ebb4d50dc9a5506d53cb5837ba7fb9981f30c3d710e6705fa84fa9
 DIST incidenceeditor-18.08.3.tar.xz 522032 BLAKE2B b29b17d6300f4d7f45bbc23b51f8e5d1a4ed2b3edc975238210c363f3a0555124e797dbe14e3855d156e5a16da77b3df1b6b6a9d6fcb6dc1e2680c9b0312f377 SHA512 bdfdbaebeda79fdad019a34f05121652fcef0719b3be4e871a23a6fb0648f1371a48c914d371731dc0a9b0e4f1928a58346b1e280aa2c2105c3789428e87b585
-EBUILD incidenceeditor-18.04.3.ebuild 1393 BLAKE2B 5a1a0e42a5a0b48722407844edf81d56d9ac339aeb509b9d12f37dfd6adcfe9306bbc1bd6ad2ba09cc4418aa5fd40550bb7872c5fead39dc2e3195b55647a7d7 SHA512 244023eee75d28a4cea19b01368bc6fd2d6192cdebc1f71dbaeb029a8d7b0088059084139e80a6361d136828c1553b8a0563c3c6cdcd3158f2d57bedd2ce23ea
-EBUILD incidenceeditor-18.08.3.ebuild 1392 BLAKE2B 5bfea2058f1c5b7126c8dcbc00405adcbc16cb65fc600a849e1ab9f5665ad17f2100e9df13d896246551396334c8d81c9bcb1be2827eb698541fcaac8a3ee8d3 SHA512 688cb04f35d15952337839f8019a87bf26bacc6382142e69b8cd0c217dd7f2cd20200a773e96e0701d01f0452a7fb31ee09923747e4f26c20ee9f1e45e9ac0d5
+DIST incidenceeditor-18.12.0.tar.xz 542004 BLAKE2B e6272a9b7399d4db72087f548efea9facec94b6b20c935139dfe9abd77fa40e5e58f801b1762952c4b5d36348f8df6a3f9ca0b7bbf6d4c7381ac87b07735939f SHA512 abc8aafce99239d6b8975816536459084109382a620548d9ab2000ea34d3e343c9410c3c3e789d5d315c895fe9c0140fb55694e56c5c6aa70b4d5d1086ad7c84
+EBUILD incidenceeditor-18.08.3.ebuild 1390 BLAKE2B cdc8b4c3066d2ae4cd2232570abf465e7fde8ab4faf4513e9608abe2b1072e0950e2cb87daa076aefce1c545f671646aa798d221cd43c542a7b713c9e5c8d9d2 SHA512 8a571fd162bcc0843d68ef7f5f826e820122cea7d7e89b08d7ec224da4f5cb194aac1894b4d6d162d3110930b081e551613c6e3edf5d599688623a493487a3bb
+EBUILD incidenceeditor-18.12.0.ebuild 1392 BLAKE2B 5bfea2058f1c5b7126c8dcbc00405adcbc16cb65fc600a849e1ab9f5665ad17f2100e9df13d896246551396334c8d81c9bcb1be2827eb698541fcaac8a3ee8d3 SHA512 688cb04f35d15952337839f8019a87bf26bacc6382142e69b8cd0c217dd7f2cd20200a773e96e0701d01f0452a7fb31ee09923747e4f26c20ee9f1e45e9ac0d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.08.3.ebuild
index b1d1e2fe3489..1781d3a93bfb 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-18.08.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Incidence editor for korganizer"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.04.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.12.0.ebuild
index 8d1a723e466c..b1d1e2fe3489 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-18.04.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Incidence editor for korganizer"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index ab2e08aae28b..e8d8e9e06a67 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
-DIST juk-18.04.3.tar.xz 1872492 BLAKE2B bca7172ddcb8f657d11ee51311b39390c62be31ff996dcdec5557c68f96346b10dddeb9f40d8537a17e4be879861c698b357b6688f3cf2a1220b47108174f778 SHA512 f5492f3edfea4e74f984a1d09d15ec186a96ab536223821795d84f3b5868f45a9b76655121950f69580cd701d1fd6a621e6e4b43a05481c9c05672f02278a35d
 DIST juk-18.08.3.tar.xz 1874268 BLAKE2B 9024e64ec657df835bdc5d926478905ba68a94e68cd0aa57f0b7da660f2547052bfeab570447aa6f414f6c273d82769c03b8c39dfb4943bd864f6936e393fd35 SHA512 f0a13f24cdbf075ded5b92848b7239cb5fc53d5d51efc6fc0f2ad9ffc92b0517bb44ee16b5cdb356e92ac8ac8834da8f05ec126244c19681b6d9b4427fecda66
-EBUILD juk-18.04.3.ebuild 1104 BLAKE2B 4158dca7ff9846b19c1d4330752ce8da36159dcee898b83732b56dd258dcb8909001b25db96b77d95d3e08020a47b54394f5c7c30adab7fa4787f58367c835b2 SHA512 3888df6be004639a2e0b32f3bc68952c41b3da0182417511a2623960efc959cb0c12b10c4552a1a75a1ff243b8c70a3e50e2c272a6a70ca10ebff99705691412
-EBUILD juk-18.08.3.ebuild 1103 BLAKE2B c38f3d58d01b703ebdaf784c4bf66d14338188049e0e2704a05ab8658f9579570516cb4e4c3e58b32835fe3900bf5f159a6ca315d7d9da939b187cf165d50d41 SHA512 19f343725a223d961c08f9ef097adc7e44f6c679d30cf66ae75edd8c8c685f52e83fd5f28a5f8f4aaaee49256c1f249b3cd636a67806752b20a2a497b1b0dc02
+DIST juk-18.12.0.tar.xz 1874936 BLAKE2B b9113f13b91fc371663325e709998e1de124500097a0e41cf939d905bc73acf3332d1be384b7b30948550ee8a8d68ef413bfe9bbda7d039b9aa97b7d70a1ea2d SHA512 1225c7d99d7b805e7bb81fcfa563504f531bb21da37bebfaaa12ca89b1c30a6c0cd99bf5c27d19241b3bfe40641fff74277899081effe6ab31b065b42dfc55b1
+EBUILD juk-18.08.3.ebuild 1101 BLAKE2B aefde73f5c48d21704b6af8e6e61c0aca16a9221e801f1d5c344bd3f2ef885d989d3c7011000ad3251d7b847045e3a0467578b3bd7e91c8b4fc4546e9344b27f SHA512 8dc7251f76b606591475ce9507fe6223ee2bc4ebe5a90de9c1c75cabbb4b6bf9573d688e9c81a33dc701a9381ad73c683b81537837ef3e653be34c5ab11df7ee
+EBUILD juk-18.12.0.ebuild 1103 BLAKE2B c38f3d58d01b703ebdaf784c4bf66d14338188049e0e2704a05ab8658f9579570516cb4e4c3e58b32835fe3900bf5f159a6ca315d7d9da939b187cf165d50d41 SHA512 19f343725a223d961c08f9ef097adc7e44f6c679d30cf66ae75edd8c8c685f52e83fd5f28a5f8f4aaaee49256c1f249b3cd636a67806752b20a2a497b1b0dc02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-18.08.3.ebuild b/kde-apps/juk/juk-18.08.3.ebuild
index efe3ecdd0833..0cbd3af4f126 100644
--- a/kde-apps/juk/juk-18.08.3.ebuild
+++ b/kde-apps/juk/juk-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Jukebox and music manager by KDE"
 HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/juk/juk-18.04.3.ebuild b/kde-apps/juk/juk-18.12.0.ebuild
index bf26562a4aab..efe3ecdd0833 100644
--- a/kde-apps/juk/juk-18.04.3.ebuild
+++ b/kde-apps/juk/juk-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Jukebox and music manager by KDE"
 HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 6ca29842a1db..3197dbc1b455 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
-DIST k3b-18.04.3.tar.xz 10599940 BLAKE2B f5c72ff0ce4fafd15e6c2c954934b7f6e57e8fe31596a0eaa7f0510d919c910882fc8fb5b0d4508a88c43b70d88f22692b34786f9999559be4aa6f334feebcf1 SHA512 744e963537b71d3ac4d529e216a1ece7b858f831e6de5beadcfa42cb690ada80c1d17271080eb5bd753ab3b9325374c382b87449ec9bc816ec32c680b0e7d5ed
 DIST k3b-18.08.3.tar.xz 10598316 BLAKE2B 7758f1f037834728edaddb38068a4cb1bc32fe4953c89a14c735592d3842ec8ec28044e4764fd76a1cc116c060702167fe8c043f6121d7c85654996a3f97d26a SHA512 5479f29770363a14f2f7b9ea7e14c628b031f7744bd459314c502c138daec4728d65c7a4193364aaab7ee9e2516583f00647e07f05acd959c48a749b1ee84ef7
-EBUILD k3b-18.04.3.ebuild 3334 BLAKE2B 251c4e4a2a963bad70819c3254a22fc55769635e45d04fbec4bf3bfafc49add2323683a2aa32928ead05075c7d394ee35441a471ce6c3fadd76e3c5a883c1e0b SHA512 eb77b10c097657db00a73a3fbc9cec6709ac4886eb50c538c2d8ee1d7a976ecd6219831c884c7bea49c00fd62ba9a86a9dd9fb6dceb79c421dbad32545876fde
-EBUILD k3b-18.08.3.ebuild 3333 BLAKE2B a825ede67de538bd3513aefef0258bf07e694ac71b61c190c224fac66ab6e305aa12ad25255410fc9c14ee77bc6fd49bc0b11768980d900c53d499e261cbe992 SHA512 1e1d78ff29c50a1a2f98cb7a2a8addd222fec420e2e0076d9b264af7ee88dfe06f55494cf5fdac8f239f05ebabbe44f1bd88f7be6de8c9cdec13178c38ff1cb5
+DIST k3b-18.12.0.tar.xz 10596680 BLAKE2B bad2d13fb509b5a4eaf4911b1eaa7a5716d30c6f31ff353aaa7604e0fadf12998616928945b71f6d5e75be874ff4afe20e2bd058b05ebfb9235fb72433180694 SHA512 0946d579bc72be213cc312fee21382328b760e8c0adb707ba8236b55bc32221dfef385cb383734fa0a3ca5853a5f9c1293f46f2977185de5f7cbd0296ac0ccce
+EBUILD k3b-18.08.3.ebuild 3331 BLAKE2B fcb2079f9d6c00436b4d54a34643ac59887b1d6cbb3b7113e25d0b69a9246e3995ced23b1880716acc2d961f82ed05f0e605a880bc1d4b26a36cc80bdfe3e400 SHA512 67379129f16ddc6943da43f574b1a67290aaf89a6843de8c93a08553c0675987050d6516af2afaadbdfa3c92580936d6be7dc238094cf8d0777ce01cf3b105fe
+EBUILD k3b-18.12.0.ebuild 3333 BLAKE2B a825ede67de538bd3513aefef0258bf07e694ac71b61c190c224fac66ab6e305aa12ad25255410fc9c14ee77bc6fd49bc0b11768980d900c53d499e261cbe992 SHA512 1e1d78ff29c50a1a2f98cb7a2a8addd222fec420e2e0076d9b264af7ee88dfe06f55494cf5fdac8f239f05ebabbe44f1bd88f7be6de8c9cdec13178c38ff1cb5
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-18.08.3.ebuild b/kde-apps/k3b/k3b-18.08.3.ebuild
index ca07f5b8b2f1..39da19644488 100644
--- a/kde-apps/k3b/k3b-18.08.3.ebuild
+++ b/kde-apps/k3b/k3b-18.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Full-featured burning and ripping application based on KDE Framewor
 HOMEPAGE="https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 DEPEND="
diff --git a/kde-apps/k3b/k3b-18.04.3.ebuild b/kde-apps/k3b/k3b-18.12.0.ebuild
index d8d682c1190b..ca07f5b8b2f1 100644
--- a/kde-apps/k3b/k3b-18.04.3.ebuild
+++ b/kde-apps/k3b/k3b-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Full-featured burning and ripping application based on KDE Framewor
 HOMEPAGE="https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 DEPEND="
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index ddd3534adad0..47bad34b1274 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kaccounts-integration-18.04.3.tar.xz 71660 BLAKE2B 083248cfd88c7000036351150122bcdb84ca7f340e0a32794a761db3c68f9f18deb8acea86471bbd0402f86846c7e241fd1b8e2c32b668f8f664e6207d592895 SHA512 2b7ff86398f5dfd454be3f8b2792f0abe9ca17cc4cafee9c4f99ad5f4eb63d47a4a7b9a0f43583e1c108d362a5cda52f8428252b0e7f3afef30c67c13b926ba1
 DIST kaccounts-integration-18.08.3.tar.xz 71228 BLAKE2B 69b6a21adface411b11cadae21e2db0083e4a03faa45a6f7e834e3de75b2c9977de3cc50177664b42cea66f878c97b0ab8bd5dbf5bb65a0d6e70ae0c2573cddc SHA512 8ad5fa737c7323625c6f961b105046ead133df5659f99501911ba5785445b52dd7e46f7db80486e9c764a3d50ce798d17f31a5204da0bbf4eeb03586d2d933dc
-EBUILD kaccounts-integration-18.04.3.ebuild 898 BLAKE2B 9475ceab418eda41c61d749e0a68f555b7885537a8ea181977a24e45ba2070333db6221f44a3489eb531a0a4b06332e13ba8826feeee7e82369599b1e2c8dc5d SHA512 a0cef7b698fd7a977159f8d9ebc10bd2fa99708846486559bb633d59dbd425fa73bda05efe6e4ff910a2bbcbd25edf3168612d53849461d13ce35eac6195fc55
-EBUILD kaccounts-integration-18.08.3.ebuild 956 BLAKE2B 13fbde0b78ec711cd9bab8b257add1dac26c3a02051bd615cb22b2adb2ebab830c09e6f9f9a14324b53f0f52bfd26a719039b5c42576fd70e7a5909a4c8a12bf SHA512 44539d65f6bee11e9a1a49c0b0cc62addc084b3627a9853916a8314720e2a181be9be986b5a22ed26156ccc2a6492531815dad3cda356134182c95d1e4e0de65
+DIST kaccounts-integration-18.12.0.tar.xz 71064 BLAKE2B beea2b156e400fc22f122c34cc8ea83502095c56fb6832e53a481aac89337524234173280ebd4efd35409caf796c1c1e48cbf6e8d8addec97f7afe97806fc281 SHA512 05049161a5bddda9a03e85dc28e5bb88b437c8c49f04871146955e980d3ea263c7816a655985ec2eff5595fd938b6e0772f8c1411d2d404bd28669e434327d2c
+EBUILD kaccounts-integration-18.08.3.ebuild 954 BLAKE2B d598994f81a1c58974f6d073b0868d80f87a299cf28e0c77a4402d74907b0ff9a3df655234bed3623aaad16b13f71fecda27902367c23ff468b2ada68bcef8dc SHA512 929ef96247e689f98add3520d6c96945e0ce0dd359e2750a0de0a76cdd884db046ed097e03a1487ab387504689dccd321248d466d02c20cabc6b88433df12c2c
+EBUILD kaccounts-integration-18.12.0.ebuild 956 BLAKE2B 13fbde0b78ec711cd9bab8b257add1dac26c3a02051bd615cb22b2adb2ebab830c09e6f9f9a14324b53f0f52bfd26a719039b5c42576fd70e7a5909a4c8a12bf SHA512 44539d65f6bee11e9a1a49c0b0cc62addc084b3627a9853916a8314720e2a181be9be986b5a22ed26156ccc2a6492531815dad3cda356134182c95d1e4e0de65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.08.3.ebuild
index 0b2e528f3179..91ac2eb16d65 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-18.08.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Administer web accounts for the sites and services across the Plasm
 HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.12.0.ebuild
index 555082fc8ba4..0b2e528f3179 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,10 +11,10 @@ DESCRIPTION="Administer web accounts for the sites and services across the Plasm
 HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
@@ -29,11 +29,14 @@ RDEPEND="
 	>=net-libs/libaccounts-glib-1.21
 	net-libs/signond
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kcmutils)
 	$(add_plasma_dep kde-cli-tools)
 	sys-devel/gettext
 "
+RDEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
 
 # bug #549444
 RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 8439f4ef470b..0873141c0bd8 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
-DIST kaccounts-providers-18.04.3.tar.xz 31868 BLAKE2B 3538782c5eb9c07607d258f00f11384521a47fb719fefa47bd98a4d7a73f287ccd2a5e65f395eca81652da1f83aa2a192939c48e7be465be5757675db26a7d79 SHA512 9e37745392c58992994989e1a9d35a692f5e08170073d9fa95e911d89ddde75a6bb2954283e46f5d6c6f8ffd9d37e31646e574f67e5f782b65fea331fdf0f28e
 DIST kaccounts-providers-18.08.3.tar.xz 31884 BLAKE2B 526d2c878ac00c069f5b0e658c506844f5c44acc1ca77c20196831d84b329e9743a460d9cc943eda705b53be75f52ae4fc08dc52b67a1d0f0a93749263daaed4 SHA512 9f2c426bd1cb7a7133f9c3ca77487ab5903f25866b9dc0f7ffc0950aae92f4c9c4e84f5b1e0ff57e0e25acbc5caa6d90846f9822ad48b271f996180781ccb3bf
-EBUILD kaccounts-providers-18.04.3.ebuild 666 BLAKE2B 859261416a66ffe9af1eb12195fb85bf5f63b2171055fd65cb0a2eec94b24071619e58cfec724842fdb3b366576aa46c11fcde9867f06b6c334a8dfc7df3ded0 SHA512 5a2fbf17eb6a9cd3ff593ad6d4507c796198390c0ac552950098ad50991b78ab02e23fa7a722fd96894ce03b0ffd1c2200d9ddfc536e58c3aaee4a98650bdda4
-EBUILD kaccounts-providers-18.08.3.ebuild 665 BLAKE2B b8ba9b68ff5f5ab0885d5fbdab33687c7c6440351628b9660af4a6a2d290c648940afed517ee4e4fc85da13aec5526b190a49a23f54e077afef35a3ead2c6e89 SHA512 835b3a56cfa650d0cc58ee3b51692d3e5a509d4a896193c8d6b2baea6e54b2b7354a26400b09f4661095e2ee5204ff6af3bbe08b26b48e43cc89465a2544ef0c
+DIST kaccounts-providers-18.12.0.tar.xz 31624 BLAKE2B 537c41f6f08c69eecfed66ada8bfe2511ccfe307e5a1e800b896aa2a022fad7503a6a555c0e8c41cf89f8e012031346f369089d9dfe3b430e40e821a6efececa SHA512 d06ad541842b994084ed81b2d12b98b946c2614aca918ceaca05235335786d615986edfcca32ac45e0541d7962848f0dfeec7f00683d4aaddbb1454e5107fcdd
+EBUILD kaccounts-providers-18.08.3.ebuild 663 BLAKE2B d8f31cb74e410a7acf9bf40fe026a4ecdfcd425a63624a8aa0c72560d02e919eb59aced745cd2295f75e3002148b3b670cbbf34e4557b567dea74a51855f4488 SHA512 cc9a3fa8c3238fea4f39f1a1dffc2ac9f5a9d0f6e462394581a130d37c916e6bcbed2a57e6e4d9ce74af5f5b5a0774d935637c23416265b545896f4dc28333d9
+EBUILD kaccounts-providers-18.12.0.ebuild 665 BLAKE2B b8ba9b68ff5f5ab0885d5fbdab33687c7c6440351628b9660af4a6a2d290c648940afed517ee4e4fc85da13aec5526b190a49a23f54e077afef35a3ead2c6e89 SHA512 835b3a56cfa650d0cc58ee3b51692d3e5a509d4a896193c8d6b2baea6e54b2b7354a26400b09f4661095e2ee5204ff6af3bbe08b26b48e43cc89465a2544ef0c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.08.3.ebuild
index 7d0f6facf465..1ffe97752429 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-18.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE accounts providers"
 HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.12.0.ebuild
index 8c161f2a41ee..7d0f6facf465 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE accounts providers"
 HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index c8a6a0dd20e1..ef155e3c03b8 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
-DIST kaddressbook-18.04.3.tar.xz 547988 BLAKE2B 470fc757fbcf30accada18f62916fb21eb2710eddafacbcb6842562238ca74d04ee6b5e1271a1a15d3cc5482bcb9040930f6c1a1185279d784043ccce3395db9 SHA512 5afdfde4319977b31debfe662e2758080f0749229c087179e887272662eb23d69c06b3b634214b240af77b225c91c5b20dae531ea7cd58befa4d019bd28ebcc3
 DIST kaddressbook-18.08.3.tar.xz 537956 BLAKE2B e92b76ed56581f5d7759fabeb9d8b761061311f30f0d01a6158a6a3c6e0c399eceb5111b343f1805757eb2ae9924c68219cb46754482791341e10ec43faaf6a8 SHA512 f703b2aca2649df477d4dbaef623543af09029101dc8ca0617482ddd3d7aec6bdeeb44841feef2774261acd8cc4f4483faf4e51474418260535dd401164bda60
-EBUILD kaddressbook-18.04.3.ebuild 1706 BLAKE2B c6d7559fb3fac56b6d259836e03f72003d4f89921ae5c4116571ccf80e753fb8c07aa3215ef3e2aeec9eb30d13b7bea139c0ae11a9ef15db77162315587e8b33 SHA512 edecd0701d2519f20045375486ce5f16460cf16879c8c1f76403a4a088cae89a6d68fe03c5ae1183753896d496a6c6056dd93a4651088e929faa9ed897913621
-EBUILD kaddressbook-18.08.3.ebuild 1705 BLAKE2B 465b79f858b362c598d9e0d6d2792e8ee89f1be381fed5f029d137af4bc21caf1ad0c824e992b18ae9d7329fb286e154956e20f72c12758ea6404029877ea358 SHA512 dc97b17134c4b731017104874bc3979b3b108d5adaee5582e77017c4eb3d78316592a9fc913cfb2e409b40d60b1e69e8c366bbbc529f25babe10a0ed924ca315
+DIST kaddressbook-18.12.0.tar.xz 471032 BLAKE2B 8d3c59089cf81a32d04a10d67dc54e2868110ad2af16e12e7c36ff359f5e4951e74e14dda9f44df4bdb90306bcb4b9b229f8a21cee74822431478dd5dda51989 SHA512 a1dc82824cc61a575f91a986a4d9b9297cc661e3baefc89882bf2df714bcf2fcdc091f4bd5f14c68f03594c42ae4ebd37c1b09ea6d049a6d123d0d82a1704132
+EBUILD kaddressbook-18.08.3.ebuild 1703 BLAKE2B fa58bf1d6f073b80e2a5703eca1e962beb6c9587de5d666858bae4e69e34d3dd73b857eaddc327f84646227a5abd1e89dd1507814637fe2d1c67ea3b40a9d8fb SHA512 7d771584bcdcdb9620293c97a49d033d4a5332ccd45e3fb3c7b6d16f6a959f5f813618c9f693a9023324871f512ad46c51ec94db2c837051b0c1c27e3dc5add8
+EBUILD kaddressbook-18.12.0.ebuild 1705 BLAKE2B 465b79f858b362c598d9e0d6d2792e8ee89f1be381fed5f029d137af4bc21caf1ad0c824e992b18ae9d7329fb286e154956e20f72c12758ea6404029877ea358 SHA512 dc97b17134c4b731017104874bc3979b3b108d5adaee5582e77017c4eb3d78316592a9fc913cfb2e409b40d60b1e69e8c366bbbc529f25babe10a0ed924ca315
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-18.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-18.08.3.ebuild
index 805063523fdb..3a28702494b8 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/kaddressbook/kaddressbook-18.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.0.ebuild
index 92334be68336..805063523fdb 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.04.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index b6bc9399fe59..11184b79e2af 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
-DIST kajongg-18.04.3.tar.xz 4241892 BLAKE2B 764d0787917948eb70efca211d3fac59beeec0c1fcd4fb5f4ae7f48ce3235cf490a974b268e56ee4032bb4db0e5e6689ab8067c44cb937f70572d25d9019806b SHA512 ba447ed629b40ec8984d95cd324b06637d5d4131e8868dca36ed10451c6bf95e0126e0548322553b5ea15e8ae82211cb3bccade4cd0bd3f19f6ff4a415eca8f3
 DIST kajongg-18.08.3.tar.xz 4467328 BLAKE2B 8117c36832c8902bb8616f9f9cb9b9470bc35f1eb9831a16549644696a24bf97f7a10f6fe8a86a9a645eb30e372e0568a28fb0657e5be0e6bc1452a241f64379 SHA512 a19ff94dba7b968834117c7bd8157394732257001a2b8fc6fbecc3f5b4d7b9dd7f90a3ee455301b9c99fbc3563ef526aa5c0d10eb481bd0d36dee24013f98836
-EBUILD kajongg-18.04.3.ebuild 1280 BLAKE2B 1a60ed7e29724456829f6b27689bc3e9f0be2f3433da605a45f55b2e36d9ac1c5436858225d796ba41639d66c71a20f220ea588716942d4644bce613461f10cd SHA512 60c40554e4d71fec23832d1097e568a4727a38b8dd91b4e89210d1c6a7c0b219ca1de171205dd7650b179474e5c277280800d0975d876545a9670b0794b44bf2
-EBUILD kajongg-18.08.3.ebuild 1279 BLAKE2B 0a016a157f77d4c0ef11a55c02f9b230dce198ba955e2a7fdb95c4b3c141eba36b2008f684b36ffefc12556211591628d08be507f789984698cd6af1e86d2568 SHA512 6786caa824fa6441a5c03d2af064931b01f6577949a3183a5addfaa533e0ec54c68c603166dfe9618afb865ae79fbda2624f3d8279ac71dd6b3fdfa950243d51
+DIST kajongg-18.12.0.tar.xz 4466648 BLAKE2B ee65eb574825da627f5b2f6aae05bc137b838726c5eda20c30d8e02d8529e23ad36a90469f3ef16c541bd97e1f6eb1dcca13676677f2ced2840234dbe151a052 SHA512 568dc2494fec2465da6d21f0ae552ca466abde4dcb5693b55534665d2436ec8764799f54d205f6d8e663b6043b22f333954c0bd37bce25768f5069a6555fe80d
+EBUILD kajongg-18.08.3.ebuild 1279 BLAKE2B 04aea3ffa48f06d6a39fd3056924e5b6f5bb5a43446afea7f9ba4210894873454ed435ca14fead739abf7f57249ffb6b3559fd0df732fab952856a17b3b6426e SHA512 ed06ffd6e39698282b2df382a0c53e49beb7f3e9cb538e9b2fb48d501ec1218a7185e185b8b3d29d547e4b298443ebd3ef5b396a329c6ac3f267c91bc8380d6c
+EBUILD kajongg-18.12.0.ebuild 1281 BLAKE2B 782cafcd31bb9e53e0535c5f711d5254fd22b47795475da4765626f512e06f7634aad957f7ab15a649a5e4be76629255948dc91b8438a2c54e5d913b652878af SHA512 81a3a90c6f4798ec040d6e9ab3302a01a7675e4026b3963074410fd4c1ac9443413924dd1e9ecc61f257d0e367813fa4f40dda1c1c5723060a6a1903dd754c9f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-18.08.3.ebuild b/kde-apps/kajongg/kajongg-18.08.3.ebuild
index 208d94a67499..5d6e3cea19cf 100644
--- a/kde-apps/kajongg/kajongg-18.08.3.ebuild
+++ b/kde-apps/kajongg/kajongg-18.08.3.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kajongg/kajongg-18.04.3.ebuild b/kde-apps/kajongg/kajongg-18.12.0.ebuild
index 681c2b2c4ad6..fc30aeff8992 100644
--- a/kde-apps/kajongg/kajongg-18.04.3.ebuild
+++ b/kde-apps/kajongg/kajongg-18.12.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index c1d12aed0441..a47038603978 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
-DIST kalarm-18.04.3.tar.xz 1796128 BLAKE2B e4bf35dad7997c7f01f0a2e06efd4dcebe7d8c4493cfed7fdd1d49fd8ba3908925a4395478ecbfa8deee6e3241db057c03935ed2e4b6555b46307c550ab0d82e SHA512 05a524214c1b58db1d8d43d996771d37a1e17bdb9efa3e4e4f7475f1b48a984a2f8e28398a8d3d7cac9a5f7ef109fc82b35941bcd217fe2b6dc1a1de2e7924d6
 DIST kalarm-18.08.3.tar.xz 1814008 BLAKE2B 5c2b92932ce510b6276b183ad0f88a4e06073ee218281b450780ee8649bdf85dddfa3003d2b007d7ad1c7950d78cd32d14a20ed8090f93be7039cf9436d83f60 SHA512 09c27f22bb496f95685826ab2d8aa81b117ef224e04bfb8aa447809190228616883bbdd5841225580c8f291f90e5b1e93d0263797ca80553fb96728853e50772
-EBUILD kalarm-18.04.3.ebuild 2062 BLAKE2B 51f37557c4d354d47e423338cd0dae03cda913fc90caf123dfce6cade8e1b68e2f806f4153bfcbe9c4f2099665c42fbb00b7dd78b775b046db31fdcb4886b338 SHA512 b0fe838ed717f8c68454f178a6303c135882e5e82c436a8bcd3570aee33f40ecf2b5b4dd6d457da6f02e30ca4bae491f172b4f9f5f8fa9729f957ad2834e1aa1
-EBUILD kalarm-18.08.3.ebuild 2168 BLAKE2B e869fddec0dae53c56c6d27ed698ac1537d9d47fd3a8a1c75e12c5caa5f14704b50a242fe888cf7836df39b428f3fbe71258de9b01c230e1835d32992cde19d3 SHA512 a906de64f04c3e69ad3d5732f42898476046da40ab29adbcbeb3adbcb27a36510e70be73feb3df9ebbb5bd66d9965e0e740f613d648c8c3466cf881579b6b3dc
+DIST kalarm-18.12.0.tar.xz 1812392 BLAKE2B eb2e0aaa2b3785c3f1e36d08cf72be5894bac051a43852a48749799d5a29a1d6e3927472b2ef78be4db93852172e81be588c7231f6c86c58b720b953d4fd5300 SHA512 5b09dab136d5dc7bce0735d02a9a313b90dee51387605f4148ae476c8256e2adb88a1e536d1a2f1655751791def6c60a6310dee278275bd1fdbb5ebfbf4a639d
+EBUILD kalarm-18.08.3.ebuild 2166 BLAKE2B 6fdbf3e6ed1644452babdc8f089d95304e624638de408a933f0d1fbe00411594d81b9c79fcac4e73fd2e3754ad006851398813b3a7707fb9c7e0332027660f8b SHA512 4bbd79ece057c055faee032f4a9c77f9ba0e6c3e68977027cd283220aae63d14a46639693e4834f9a742aaa85e2e65ce5873dd81086219c7f3b023df726dd4b1
+EBUILD kalarm-18.12.0.ebuild 2168 BLAKE2B e869fddec0dae53c56c6d27ed698ac1537d9d47fd3a8a1c75e12c5caa5f14704b50a242fe888cf7836df39b428f3fbe71258de9b01c230e1835d32992cde19d3 SHA512 a906de64f04c3e69ad3d5732f42898476046da40ab29adbcbeb3adbcb27a36510e70be73feb3df9ebbb5bd66d9965e0e740f613d648c8c3466cf881579b6b3dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-18.08.3.ebuild b/kde-apps/kalarm/kalarm-18.08.3.ebuild
index dce7276b09f5..72484dc5b187 100644
--- a/kde-apps/kalarm/kalarm-18.08.3.ebuild
+++ b/kde-apps/kalarm/kalarm-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kalarm/kalarm-18.04.3.ebuild b/kde-apps/kalarm/kalarm-18.12.0.ebuild
index ae2a05492f99..dce7276b09f5 100644
--- a/kde-apps/kalarm/kalarm-18.04.3.ebuild
+++ b/kde-apps/kalarm/kalarm-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,10 +9,10 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
@@ -20,8 +20,10 @@ 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 kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
@@ -55,17 +57,19 @@ DEPEND="
 	$(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}
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 31635b158f57..0872aafe1b17 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
-DIST kalarmcal-18.04.3.tar.xz 548228 BLAKE2B 673a8cb71e1355790864295e3762da3f5c567b08b94b32063a293ce7b156f3a8d6ffc1fb8bf8fdee12d5ee4c3f3c30699f48e563b911f786f4fc4d840f859438 SHA512 d3ff9210cb999d83d108a359e996fcbb187aa0b2bf264331c13f744ac9539a64e678e99b4fac47c19c2edb560c041d07f45450cc3ee56e59c86442755df2c204
 DIST kalarmcal-18.08.3.tar.xz 573420 BLAKE2B 03665ba52d41a6ecf71bca0b6167b0b61cab733cebe3303b08c238d84eff18d7c9d5c0286a0f1150c1d968e86e7fc894868ea9e432d70213fcab53c3ec417a9b SHA512 18a2b4601d5b31ec3f4f1f12e63c0b4ae5d930c1364a649ff48881718bb43b2f254a482558f64abd106c684f71e13b6e91cf64aff7df183369bb57c19e384eb4
-EBUILD kalarmcal-18.04.3.ebuild 603 BLAKE2B a92cc38762957696e0a01e9cdc9a71c9318673acb9a86c7e22e03903cc5aa3954d6e086b81f3bcf3a39504dc47a56d99dfe74374ce371244ff8fdac812232019 SHA512 32f5bc44b552413d258db0370ff77ce65df8100a46f7e65e2e7e307447de200c1e77fea0707cad3e1e850254690663a77762c41e0a083a7992ae8bd2fc7322ad
-EBUILD kalarmcal-18.08.3.ebuild 683 BLAKE2B 4adfb48c2d2598218ec7887b030b86b566e636a712fd65a1aab9f0bf2db98865130214fbe68a81f6a42e6aa088494f5f9e854d939ae9c8f0de3a85663eba689b SHA512 ad327e326e0feb09af6e4ca34b7ce11d40ee3c3ea64e27cb28c94983dd9ec80f3fafad626c6fd2bdd3e7fc4b3aec166bda5aacfbbae0fd4e86dcd447c067e4c6
+DIST kalarmcal-18.12.0.tar.xz 572904 BLAKE2B 62fc0fc16622cd42c777e11398a5f9fa0976d9735b32838714da113852adc63beaf6ee4b208c43e62c80f7bb53be0cf02db0047dbbefffb10e5cdb32df2b95a0 SHA512 d584dd5ada8043b90225f4a80ab31a132c2dec873ccd86cff4e70e553706bdad1c4112578ec8c44e21de394c8f254daedbb77a286fdef657b8156b2b1146af2c
+EBUILD kalarmcal-18.08.3.ebuild 743 BLAKE2B 30bdfa2b3d325eb29d18c5f74618e797221c8f15dfe12f2ed6b99fb7bfcf6de8c4cdef7c548a9ffe6ad2506eade61fbd8058d43e44320778a717cd62274a450d SHA512 8b63e9a842bf95baee2e7fc80e154e2996c7e60541f39653f46b9967576db2881d71c56d1895b45ec8715f4645ac0b30ffd5bcd4ec0313ef25e7d9313714d67a
+EBUILD kalarmcal-18.12.0.ebuild 746 BLAKE2B a3e28f7aa433bfdfd971229f9bf9cf816cb383e771c00fbcfac4d78884d15f69b642fb7088872083b6c27e878e94e1db6731527bff4afaf47d0e3123ab6b9027 SHA512 ac3342754dfb75d3bfd66b8748a466753e9a90aa1279ed23fa9d8f4412309c4ab8849e2c3feacb8f432f739b8584ea2704d4b849e4c0c6576fb4a30788051adf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-18.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-18.08.3.ebuild
index c4abff879e9e..a9d6af18a036 100644
--- a/kde-apps/kalarmcal/kalarmcal-18.08.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Client library to access and handling of KAlarm calendar data"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -28,3 +28,5 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!<kde-apps/kdepim-runtime-18.03.80
 "
+
+RESTRICT+=" test" # broken within Plasma session, bug 665626
diff --git a/kde-apps/kalarmcal/kalarmcal-18.04.3.ebuild b/kde-apps/kalarmcal/kalarmcal-18.12.0.ebuild
index c65ec6495ab1..534df798c558 100644
--- a/kde-apps/kalarmcal/kalarmcal-18.04.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.12.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Client library to access and handling of KAlarm calendar data"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep akonadi)
@@ -20,7 +21,12 @@ DEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qtdbus) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!<kde-apps/kdepim-runtime-18.03.80
 "
+
+RESTRICT+=" test" # broken within Plasma session, bug #665626
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 6c5190e4fdab..2e06461af2d9 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
-DIST kalgebra-18.04.3.tar.xz 708516 BLAKE2B c3977b66bf126a2e1774401ff1fd4161e9ffb6e82d7cc25b1b43cac4604595f8ebaa2e8ac49ceffc65ee5486a88b4d780edf6196d04e1ee257af38e54787bf8f SHA512 8314e8193a29a611b3566eac8b98e2599e2bfde7ff767a7cf513acf51599e9f42b32f24e8f08bca8e824822260c298f97a64c662882eba1d977ce20ddb92a3f6
 DIST kalgebra-18.08.3.tar.xz 707208 BLAKE2B bf115642ba984156852670491120607f2fe37fef840a081df5d695fd1d25e04a12f728f3672e18bbfa835e6a485ec79a518eed75f2e7419fd0ef90581a312f83 SHA512 529fedf7e3146ee9d62ae1f3e2f0d58a95bc2c0f0280311535f03f45a2fb9ea1244a5475085904c7f96dca9bb8562faee8d792ea0e4ea6a956f17238823c0a42
-EBUILD kalgebra-18.04.3.ebuild 1007 BLAKE2B 9e112544f4654c52f84734458795bcfa4160f0e571d78be02699ec0e85a8839d130f23ca47d312534c1470dc292dd4cc3c7fa32ce6cafc09985b5a41d1a152fa SHA512 c895f264c4ca7472998cc1890e7b446d8ba05008ca97ad3d572bea333ef6a00030e872b78f487c0a21fd80c42f4f0d54770c706cfe8564e9127ef66654c1081a
-EBUILD kalgebra-18.08.3.ebuild 1006 BLAKE2B 02dbba6b1cc4fc322598629e986b7c2d347807875dcbc229c831be696fdf220ccd9b2290db4804d4f7b295b086600f2e904ce08b74168b30e40f9d17d4704b9c SHA512 664c7fe443fcd7f671b023769061a0106bef7dd44cf098410d088055014058ca247808f58a676b1a204ec8ca575b17ea5110d314299c0ca0a7012ba500274d45
+DIST kalgebra-18.12.0.tar.xz 716044 BLAKE2B b1a1134c085a32705c770f01ec8f390218c9f0c5369b1b6c3bb42174cf8a78e96089c611842e2a9d8427f81ea6c35496f7254dea4e9a3e271621eda4f20fec3b SHA512 604f5bad6cbe362f71e59f8e4757e94bbc8dd32d34c021d33b28ea53e97f4eed9e069975d4223bca49f43b27b710ee7275198da565aaedce2ff9800650b6dbe7
+EBUILD kalgebra-18.08.3.ebuild 1004 BLAKE2B e599d18f3bc9183a2f73ae49a352bbefe7fbc281b571f2f67c420d42d6675cbbd05e2e6b5d79448599c3d4f51d8150d0a339d0ce33a84512465e2ef5754f96d2 SHA512 4a4d9379cdf28e49a7001f24e00b0f4a02b04021ffe329559596dde5887819d925a18e59a36bf0b562ced104b72b32aee55b7fd1bbc5970ee2f6fe5df4db1298
+EBUILD kalgebra-18.12.0.ebuild 1006 BLAKE2B 02dbba6b1cc4fc322598629e986b7c2d347807875dcbc229c831be696fdf220ccd9b2290db4804d4f7b295b086600f2e904ce08b74168b30e40f9d17d4704b9c SHA512 664c7fe443fcd7f671b023769061a0106bef7dd44cf098410d088055014058ca247808f58a676b1a204ec8ca575b17ea5110d314299c0ca0a7012ba500274d45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-18.08.3.ebuild b/kde-apps/kalgebra/kalgebra-18.08.3.ebuild
index e302c62fb0ba..9153ebcafbd7 100644
--- a/kde-apps/kalgebra/kalgebra-18.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-18.08.3.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalgebra/kalgebra-18.04.3.ebuild b/kde-apps/kalgebra/kalgebra-18.12.0.ebuild
index 8d577bf884a2..e302c62fb0ba 100644
--- a/kde-apps/kalgebra/kalgebra-18.04.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index fcf9c92c2dec..2d157ff8323e 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
-DIST kalzium-18.04.3.tar.xz 24391996 BLAKE2B 54ff86420607eae2cfded6722eb5d12c0305fa5f331b1d8a078eaa62e8c82a4b51e253fcc4138123df33839c02d6e86dbb8fc14fe2ef47f5b6efb65a0576e487 SHA512 1a7a6d6dfc8d210fc29bb77de9b1f59cfe45eb774cec4f1783de367c9d67b4d73c83847ea2c99d2706a47e0d5b2c115decd7d3b9b4b1399bf7ca9d4d69a51cc6
 DIST kalzium-18.08.3.tar.xz 24377636 BLAKE2B 094167e7014afe89a17d2be3331e546c2079793b3a76e3262f5f390a13e9c0bbfdde094bcbde0b61e95b28582f76d7bc870709968d5ac1c9846151474d27fa5c SHA512 844fccca678b7909675cee73a76dc0b38e901b3dbae42884fe803f773bdf678b2aa9957caebb9aac50ddc58e177169e284de9303ad40886f16f5c51c72347d32
-EBUILD kalzium-18.04.3.ebuild 1588 BLAKE2B 12dde3693005357d77b3702ff117eebaf75151399b8bb130173d037805b83029fad3dbd8d7c7da5a493479f98bdafbfdd22a1e512e3edcdeacc7e9896514f27c SHA512 2f7f82bf2cae3daee18f9b7a4a7beef40baf7600e3a9e532eabac674a061a62f76d742f4f17ac44245e121c9246cbad077edb8ea6f9377a25a57470e49ca5e5a
-EBUILD kalzium-18.08.3.ebuild 1587 BLAKE2B 5f4c5f40eaf63aa52903c409df32a8d394dd4b3317c1d160180e392f0a7d0878fa63534e3863ec01ea6494e6308094276204b5f758358eb4cabccbc536541cec SHA512 5a7504e125a9cb2069ce201d6c9f9d524e6be60df79618087e8e483a3274dc4fead599b3d724f0d4185d2b7cf736f7dabb1f98090f9e68fd2602338660bd515e
+DIST kalzium-18.12.0.tar.xz 24375924 BLAKE2B 90a3ec78abf6373290ff393a7fb546a49ced3f7703c07949908adc4d00551f51eb18da2d4992ecf37fed3d630e02bdddc7960642a334da48daef6a6d2f30a888 SHA512 c813a9cc544b743ecd44f744d4da568688cc0ac7b8e0c6e1b53eb76ee60d6c795520f2b2a464fe5c4b21e98e66179762461aaa533971d400127f044598c173b1
+EBUILD kalzium-18.08.3.ebuild 1585 BLAKE2B ad0493cd738cf48edae09e0937014782aff796d1c0449df3b7276f9cb2573ebdfaf0e154906a054a4a8efb65762acff2a17723332de474f54133c9fa77f5f53d SHA512 efda0462b109b2f01402351d2c0b84366e834f7515099cf61e841f791b3e21a16877948d28f249493e53ffb8587bf9b7b0e612ebd0487333c08a52e879dffdfc
+EBUILD kalzium-18.12.0.ebuild 1587 BLAKE2B 5f4c5f40eaf63aa52903c409df32a8d394dd4b3317c1d160180e392f0a7d0878fa63534e3863ec01ea6494e6308094276204b5f758358eb4cabccbc536541cec SHA512 5a7504e125a9cb2069ce201d6c9f9d524e6be60df79618087e8e483a3274dc4fead599b3d724f0d4185d2b7cf736f7dabb1f98090f9e68fd2602338660bd515e
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-18.08.3.ebuild b/kde-apps/kalzium/kalzium-18.08.3.ebuild
index 4b6cd442ad14..63010865c3d5 100644
--- a/kde-apps/kalzium/kalzium-18.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-18.08.3.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="editor solver"
 
 DEPEND="
diff --git a/kde-apps/kalzium/kalzium-18.04.3.ebuild b/kde-apps/kalzium/kalzium-18.12.0.ebuild
index 6eaf1972fbd2..4b6cd442ad14 100644
--- a/kde-apps/kalzium/kalzium-18.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="editor solver"
 
 DEPEND="
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 23f1030ccadb..ea939b2ea800 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
-DIST kamera-18.04.3.tar.xz 97376 BLAKE2B 6368a6f736ce5b8e4af30d5b52f8068e3ada90f6914c6922d9d199f3779dac23884d16887ea29eecbf6187689ebd72f9766cb3d844c0478a475b4650cee97b86 SHA512 f0f85eb94377ab04e2ad8bd973ccdfb4ef5aec6fcaf4046dac021cc466168dcb8c79d8a4da0735dad015bd2a69ff561f243401c7f30ef7b41b2f4fdcc6c80032
 DIST kamera-18.08.3.tar.xz 98580 BLAKE2B db1f2aa886145d129adf7d7618431d4451b5719b2df08b6519caf3e44b0fab3fe32761033b5141bb27cc11170e8e5982116b024893633bf96ea641b180ab1fb1 SHA512 14bbba72d12bb9aaaae35d0abcccb8d42e9243eac4d778ea93310fbef6ab2e0e0688e451dc21ba42894aa5a7dfdd30b51604ede5f1b4aa28f17b6034a4f08206
-EBUILD kamera-18.04.3.ebuild 633 BLAKE2B d95148be451dbeb507d1032e69357812ccf0e7e4af0c127ef7e97deeff878c441dbaf332ad5f07f9ea472c6d829e54c57dc579f3d4c38dee64af53dad982e55d SHA512 ca69f736ddb956d31ee251b254959e37c924f9f4a79b91218bf2177ec6c681a405885b6d15058517d9e07de6e153e776161e6edd75d173c544f73f411a6cbe67
-EBUILD kamera-18.08.3.ebuild 632 BLAKE2B 97238f00b05ced99596074e41fe0e502aae61e9a742998cc317a197bb0a625f845727c164c85eaba9cf759486044b08bf163dd70082267f168f723ceb7610547 SHA512 4bf86dc9abb9e2b48dddf43ab1d498430d62d98e011dc13ec1155c0c97e73f2e94d5138330be4e85a21c0c97ada17281100b7466d47af05db68bdb7d02390105
+DIST kamera-18.12.0.tar.xz 98468 BLAKE2B 620f1be906606385484968a76abe786d63dd803a04a4a9c3aaf8e8dd6f29cf2dae53da35ef3f901dfc95717eff94731c1c83d765c943b45d562da2bf8b612962 SHA512 c9860639af02330dc9b3d52b74cb6ece7c9ad824b4c8b9eaf65fce078e83d1072ee02c800206357badd515a4f2e2f7759675be3734b205f7578ac9edfa905a8c
+EBUILD kamera-18.08.3.ebuild 630 BLAKE2B 696195f7093ea849193f74d74365c8a8fe4f581ce5348ce0288726d226377eb5ba4bf6447ab9a19e9f151552eec2471bdcfb558e7c791a6ab0ff2d699c9affd6 SHA512 f9567030b8a3afca6dd7fdc58395f8b7f4e4e2784a84e5f24e1f7220f9a592a8d9ccc4197dbfcafdcaf1a4c06ef06aadcf24860be5de3a3b687495b2c402673b
+EBUILD kamera-18.12.0.ebuild 632 BLAKE2B 97238f00b05ced99596074e41fe0e502aae61e9a742998cc317a197bb0a625f845727c164c85eaba9cf759486044b08bf163dd70082267f168f723ceb7610547 SHA512 4bf86dc9abb9e2b48dddf43ab1d498430d62d98e011dc13ec1155c0c97e73f2e94d5138330be4e85a21c0c97ada17281100b7466d47af05db68bdb7d02390105
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-18.08.3.ebuild b/kde-apps/kamera/kamera-18.08.3.ebuild
index 9d071a39c32e..d702024ed32f 100644
--- a/kde-apps/kamera/kamera-18.08.3.ebuild
+++ b/kde-apps/kamera/kamera-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Plasma integration for gphoto2 cameras"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kamera/kamera-18.04.3.ebuild b/kde-apps/kamera/kamera-18.12.0.ebuild
index 80d9e28e0fee..9d071a39c32e 100644
--- a/kde-apps/kamera/kamera-18.04.3.ebuild
+++ b/kde-apps/kamera/kamera-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Plasma integration for gphoto2 cameras"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 93cad1a33e4a..a883fdc37e59 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
-DIST kamoso-18.04.3.tar.xz 185160 BLAKE2B e1fcf8299f8839815208c6d12bb5099c29204db48a66932c6ffdb37c3ce8f22da6c3fc8d5b5722f76d6ed38dbc2f64d80d367da318a8645418f9d53d5ed887c3 SHA512 f6f513b4da9d882104f8c8d8ba4f0aa484fa5430be2cab7fa57a8abca4befd5f4f704b46e83b44ae3cba161e309aa0b36e82361cdd0a197fe0d2c6e51101eab3
 DIST kamoso-18.08.3.tar.xz 183368 BLAKE2B b57bd30f783913b7dcdfdbf4931086411234d4f6f53c8695161526eb8c4bfd34717011518e38356bbf855d4f4b66b81f76d3298f1d28c22137bfb4b3fc27c3cd SHA512 d9d165e265825d95f0d8a3d72e3e1c2a67c1f2ae08b5b523dd581630fc96bc0b7769c7d094812ed8a306541aecb10cf9f8f66ac1ea89067c1cd021c2e7588561
-EBUILD kamoso-18.04.3.ebuild 943 BLAKE2B b087f6e8e4945a5a778609386583dfd0819ee11281907ed8b77482facfdf0fef979206f68b3897c64b7c4830ce1deaebeb9a6c388e9120659415b9836f224631 SHA512 57049451dc5a0064971b36e8d821cacc0e50330d65f41df65c802f79d852c5524430daa4f3fb46b450d378d3482e8fabf160d44b9cb0397a9d10221034b57aae
-EBUILD kamoso-18.08.3.ebuild 942 BLAKE2B 915b5b3c6bf8f0d00c7f8ae64441d5a3e536fa8a7a83ae9d793341c227f35c8c179c91be49f447ba3189984d8224eeb23cd5a993acf320083ba2cf6f81e741e3 SHA512 fed3a451a39c9f973d1c4ab91bb1a394c084263add44f8be511bfac9e035aeaa71a1b0f32deae5cb844cb7a3b77e112e0ca96404f2604100abffbaf236be08fd
+DIST kamoso-18.12.0.tar.xz 166324 BLAKE2B afc856390cce54e4c10371f7b5a785f1c863840b30bed1c16eec88fcea345b686e80861a5da8b08c01260f549cb11599e128193d493722d448196da73363e67d SHA512 2e01bb18049fdc4b6a4740f7595a9cf788a73d28bc8886e63b55946fba2e4bf7b00a462982bc1a04712f96e4ec3bd92317488c7368e09aecf5112683b0dbed39
+EBUILD kamoso-18.08.3.ebuild 940 BLAKE2B f766de15aee245da36153b3accc487cd4a5b305356a3f4690f36f4774768f4411af5ac2a863a90c53c667d56545266fb611a529408c20dea98210ed9fd3bcf0d SHA512 9d65acb3e32f2e7663ee61baead9026a715bfc39358a51b65eac6e22f084abba88426b4cf7fa7b2c7bb34927b1ae67711f2a59a473366152c22faa1edf7c48ce
+EBUILD kamoso-18.12.0.ebuild 942 BLAKE2B 915b5b3c6bf8f0d00c7f8ae64441d5a3e536fa8a7a83ae9d793341c227f35c8c179c91be49f447ba3189984d8224eeb23cd5a993acf320083ba2cf6f81e741e3 SHA512 fed3a451a39c9f973d1c4ab91bb1a394c084263add44f8be511bfac9e035aeaa71a1b0f32deae5cb844cb7a3b77e112e0ca96404f2604100abffbaf236be08fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-18.08.3.ebuild b/kde-apps/kamoso/kamoso-18.08.3.ebuild
index 663611c787dd..e17c4604a90e 100644
--- a/kde-apps/kamoso/kamoso-18.08.3.ebuild
+++ b/kde-apps/kamoso/kamoso-18.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
 HOMEPAGE="https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kamoso/kamoso-18.04.3.ebuild b/kde-apps/kamoso/kamoso-18.12.0.ebuild
index e97cc83d6ebb..663611c787dd 100644
--- a/kde-apps/kamoso/kamoso-18.04.3.ebuild
+++ b/kde-apps/kamoso/kamoso-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
 HOMEPAGE="https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index f02b446d0a50..3cac0748534b 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
-DIST kanagram-18.04.3.tar.xz 7431284 BLAKE2B 49704820723996c7326c282cacd14991d8a0bb2b7dd6dddba882b7e3398d359e9cb564328e196a657cfbdf057fa09fc90a5199a6c49ca09e8b70cf97a918aa41 SHA512 a1b65cfecb6274d79fba8fe408d5941e4fbf52a7c5359903416801e246e08083b3a9865a21a570920bfd0e02dc403e36c9f7076a5e66ffda814e1ade4becc8c8
 DIST kanagram-18.08.3.tar.xz 7432608 BLAKE2B 58859c5ef613e97671727545577943ce66bf3ccc94e9e4f1d24bba5d0e38bbce05bb1c5ab50503b883f7934b5e60a6d1c00ce080dbdf81e7b4f0ebc977bd0fff SHA512 96aa8de77729eb1aea1a76de8cc737dff4bf17ad47cd48ae89e63bed3408c357f886c01a1780ee336b9c4dfe1862e5a7c05dc82cbe3a01fa97cb179e34ba4300
-EBUILD kanagram-18.04.3.ebuild 1085 BLAKE2B b55b8f7e63892dc7ee25e80c53d13ab12a7091c260e44c300b0e20de20fa11765c501e83f8af155d4d9469f60ad7578383899a2638cfc538989dfc5dc85faad3 SHA512 de7945997daa902534b2e89c7ee9c2eb089b84329c5aa4c3aa63722d776dce28f8ac8fb26c458dec9c88d0d7d839fc15ad0bff4d62b4675b7f320541b5d4135c
-EBUILD kanagram-18.08.3.ebuild 1084 BLAKE2B f4815e7cb79c8568bdedf12428584062e9c76357343b42c7facf0d0c218568d4bae7a586777f9ef8318d54a343ca55d049edd2cdef346c5c3b3073b6d0077975 SHA512 ea0acabc02c6e570d9a8f886c321d82e7bbe07844e9ab131eff805d2800cdfc05cd76fc0ddad880b8adbd62563e0e3c378a89c5be06ec79be5e3ae997740fad6
+DIST kanagram-18.12.0.tar.xz 7432488 BLAKE2B 47fc77ac9d383eb538573a3ea4a00b1024bf64d0fbbb55b8b48498bdd056b20f326a9bba377864c7a715c5ba570bebc5dfad56b3c2ef79fae273d255e6047350 SHA512 f8717b521ef4ef8cc81ad64fe966879be2e3c77a76e9a4fdedf47a1923a986339b257ae43f86a8003baf59ab33c0ce027e51edeebca374801eb01bc153ed253a
+EBUILD kanagram-18.08.3.ebuild 1082 BLAKE2B 5a9a6c3edd9cece6db398187feab09ae7ead7e576a49937c02eeb95f9941862d42f403b9c25ae6e9e0df7968f903aa97bf12fb382833945b8c6fb0272a3cf82e SHA512 0e89efc213b01d9eeb9fd4e9e622f7d7d9e40b9bdec2c721d617db5b6d2b794e8b90998243de567328d0bc253ae19de2c92c75527a07ff682fdce9570579e73a
+EBUILD kanagram-18.12.0.ebuild 1084 BLAKE2B f4815e7cb79c8568bdedf12428584062e9c76357343b42c7facf0d0c218568d4bae7a586777f9ef8318d54a343ca55d049edd2cdef346c5c3b3073b6d0077975 SHA512 ea0acabc02c6e570d9a8f886c321d82e7bbe07844e9ab131eff805d2800cdfc05cd76fc0ddad880b8adbd62563e0e3c378a89c5be06ec79be5e3ae997740fad6
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-18.08.3.ebuild b/kde-apps/kanagram/kanagram-18.08.3.ebuild
index cb1797d5ef70..90a1a6c4a6e7 100644
--- a/kde-apps/kanagram/kanagram-18.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-18.08.3.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kanagram/kanagram-18.04.3.ebuild b/kde-apps/kanagram/kanagram-18.12.0.ebuild
index 4e07375b62fd..cb1797d5ef70 100644
--- a/kde-apps/kanagram/kanagram-18.04.3.ebuild
+++ b/kde-apps/kanagram/kanagram-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 8adbfc37e58c..546594c69f80 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
-DIST kapman-18.04.3.tar.xz 2525652 BLAKE2B 6b96e74bc70cadec5ea75f9f95b651cf19a3083b7562849606783ca9e034238f45e0662beb59a316821ec5724178ee30b5fa38fc03b416fd3c89001a707c514f SHA512 80f6f2dce23244e4da3cbef019a97323ec4dfd146fb2844001339d096c1137a5b4b51b9d19c72c1ac5a404bde66cedd4bdd43b1df06a5deda0ef4adf8ebf0b5d
 DIST kapman-18.08.3.tar.xz 2525576 BLAKE2B 4514c9e59fe67926cbbab1b0faa7e564134bfea20fd73bc775be8e4968a92b79249895fa29b1a0c4465f5433e053a11b590dc0515e099074dfb549e191bc9755 SHA512 9b9bbb86d926f7138f8f8cf4610064a92e044980eabb837aa4a39a1aa82807067f0bc64f977cc3abb2a1d120b500926f11ff993f93a072113006010df6834f70
-EBUILD kapman-18.04.3.ebuild 700 BLAKE2B c1a3f8e5d562345539feb4ecaf04028c9bbd0b2007750f5d3af30872b35257454e2fb07dcc1b72c1d02232837a40a2f3265f1df9202ead97be532918cf34b2d6 SHA512 1bf1c4c78b22de7300801a9acb3b2fc311881664640bdd06272fb5ba1dcabb5c1319509e2d55b3270e8d3d90eae856a63151e1957d0cb9b747c2bc70c124065a
-EBUILD kapman-18.08.3.ebuild 699 BLAKE2B 3ccf94268a6afb065058c8f66d3ff189859e1e80acc11c797ecce1af4f39eb9494bb580a99041ae5f55fdc1198a766f029ccab481d0d8a6aa5331498d6998dcc SHA512 52b1174643043ed9a793babbf923565cb6e15ee6c6cb8d1fa27f490a8bbdd5775b206154b67bba1d4548cd7bb518e24e526afc410a436ef840707b8346c9a05c
+DIST kapman-18.12.0.tar.xz 2525540 BLAKE2B 9850f02fe2881f1d987be2e9788ec83686f1995e753d45c2bef33c90c4d0f45cf98aef9a6f7990be12c5744646d582cfdd37d7d186d2418325b30c54d56d4f5a SHA512 79d2b9843d1b43efd9e338b49c8a8aea773ccd49844006bc5077c69b9202f5fd80c7820f1bc6459b3ee330b0f5cf80c36ba4bf9a3759d76521625cf3a8f6c88a
+EBUILD kapman-18.08.3.ebuild 697 BLAKE2B 46d63aef5ae68520154ab97979ad8cc3595ec7daa2df81f54e5fe60a40847e4a86b58eeeae27626a092c23a2cfbf0f68f4c6526de4bf543b57a8724f1be52c92 SHA512 ce998f708aa46171679126bb4af861e6d28c0bce6829ef0a2a92d183e162348cd45bb691bd4487bb913d26f169685310f3dd36016914abb00c35646ba6307626
+EBUILD kapman-18.12.0.ebuild 699 BLAKE2B 3ccf94268a6afb065058c8f66d3ff189859e1e80acc11c797ecce1af4f39eb9494bb580a99041ae5f55fdc1198a766f029ccab481d0d8a6aa5331498d6998dcc SHA512 52b1174643043ed9a793babbf923565cb6e15ee6c6cb8d1fa27f490a8bbdd5775b206154b67bba1d4548cd7bb518e24e526afc410a436ef840707b8346c9a05c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-18.08.3.ebuild b/kde-apps/kapman/kapman-18.08.3.ebuild
index d2fb8aa8fc1f..ec4078e7de00 100644
--- a/kde-apps/kapman/kapman-18.08.3.ebuild
+++ b/kde-apps/kapman/kapman-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Pac-Man clone by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapman/kapman-18.04.3.ebuild b/kde-apps/kapman/kapman-18.12.0.ebuild
index 49bee5fdd8fa..d2fb8aa8fc1f 100644
--- a/kde-apps/kapman/kapman-18.04.3.ebuild
+++ b/kde-apps/kapman/kapman-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Pac-Man clone by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 5b2ad77eef58..f2d045557af4 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
-DIST kapptemplate-18.04.3.tar.xz 316568 BLAKE2B 92bbfeabc7bc3b7d45ab4e805d244404cca8c9a959e27be5e9b5de697bc0f4b8973e12f65198bc675e2977dfa08db07e28304a33b1d786769ac4072a43e2a266 SHA512 35e120bbd5a9dfbfcb9ec9372940ba7420f3e53bf926f2ed77d3facd99343f4edc644bc1ae91a147f73d7a1bcd28730051dc8a1c5990631ceab42113c6c336de
 DIST kapptemplate-18.08.3.tar.xz 317384 BLAKE2B c2b036ec4a7698c1da7fb77987435f2571b1901635fde14d57602973067ff31fa6a1b1577bd8b934346bc7dfbcb12ecce0ef28f5e9d23d05be48611f73ebd3ce SHA512 48d91554904eb7b6a527824f786d43db0a4347a1594089d46fd5526d8ee78e283e7e4baccb2b639e5e8de72acfe35bb2be1c98ee151751000b8f2e9ee530993a
-EBUILD kapptemplate-18.04.3.ebuild 716 BLAKE2B a463eb5207879e6949c7961f872c177e64c85ae7288987ccdc3245cef428f472624f0d1293cfa8f0ff033417ccdb19d1707d797c8ea718526584ef4b5de6e81a SHA512 54f108f307fdd01e40242592d56da88d6b61ace68f5ab44f18b890339016e8f6dae53b392a6d73d6171fea5ac2cbbfe36509de29e405f219883529bca9db6e38
-EBUILD kapptemplate-18.08.3.ebuild 715 BLAKE2B cbb54135c0ddf8c666b98d2f0dd736269b5ce1686bba2b91901354b08ba90ccb234ffee30444641d434f075af26eeb6f30a39bddec955ca917f87d78cab306f4 SHA512 8e812abfb0d73fcf06220f8a1cbd43462415820d8c59b174767407b748c882580a1ecbe5b5b5f911424c6c3b2100065552531e4962ef42b2a9251d53916fe15e
+DIST kapptemplate-18.12.0.tar.xz 317244 BLAKE2B 93b16e447e6f8a300d2af5bc445418036f5901c15fdc5f08417f6cbe8c52a05be2e5bd2664970a88a67cc856706c134c852f395cf6adaed3701ced5f6e77b4cb SHA512 d77c493e97e5e575cc73519bc5fcf081ba1c325ea521ee2fb9f54fa465e6703e5a8b85be053640b039cdd344d92ccc95a9fedb13de69f2e37a5dd7efd8df4fcf
+EBUILD kapptemplate-18.08.3.ebuild 713 BLAKE2B 21107b27eab4935c99982a9b512dccdecbd429084f57fa2a83f7ee255fdea52c2004b2b919c86b20f04a303f1844d26a6f811ab166d068fac7afa4af2b21834d SHA512 9e4f1a19fa2e8ca43183c3be303c48feea9119148bca306560d0bc1e139e117951f88e5d66e158eddc46a7a32e7f1503ef9417116749b86b80d76951216e8dfc
+EBUILD kapptemplate-18.12.0.ebuild 715 BLAKE2B cbb54135c0ddf8c666b98d2f0dd736269b5ce1686bba2b91901354b08ba90ccb234ffee30444641d434f075af26eeb6f30a39bddec955ca917f87d78cab306f4 SHA512 8e812abfb0d73fcf06220f8a1cbd43462415820d8c59b174767407b748c882580a1ecbe5b5b5f911424c6c3b2100065552531e4962ef42b2a9251d53916fe15e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-18.08.3.ebuild b/kde-apps/kapptemplate/kapptemplate-18.08.3.ebuild
index 35165f143775..477a1f4e116f 100644
--- a/kde-apps/kapptemplate/kapptemplate-18.08.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-18.04.3.ebuild b/kde-apps/kapptemplate/kapptemplate-18.12.0.ebuild
index f7ed1ab511e5..35165f143775 100644
--- a/kde-apps/kapptemplate/kapptemplate-18.04.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 169f423a9500..89f9474fb636 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,5 @@
-AUX kate-18.04.3-root-user.patch 2754 BLAKE2B 98c0edf87332b3cceecc1af326730603adc72088915bd4373799cf8376b22edee536b1d04a97b0f303b2f4563288b48211fed899a363c70d5884d069c41fe122 SHA512 0b4cf0dfddc7060702c19824d4aa9b863a3ff1958e809d8112eec2cc6f3e4f3c594a69ee36390ba20d7067facb87f0c83a2cdee28c643cda7690cc3876aaea2c
-DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
 DIST kate-18.08.3.tar.xz 5664744 BLAKE2B 6645600156844c52ca8162bec98f107b45f8f4040aa94adbcf51470fb0102c300fb6755b6d6fb6bd856e6792ce770cae72d3675a2ac7fe0519f0c18d4df70e7e SHA512 08eee6b06d0fc0272b8ed73b6100e9afce07596ddab09337309f31709db4dac022e36591228eb1c06e65c064f7ea8bc18bf77fca30962fd277560b35081402a3
-EBUILD kate-18.04.3.ebuild 2166 BLAKE2B d23223dea86c2a770358ba874466ca50b6a14248beac2a17e3d92869f9b532e925b04cdb5fb1022288fd969c565f81ac4fb15a175e4146f88524eead3bf18bd3 SHA512 0730e7eddf12c896a8739f1c356bbe96ff8deb3a4ef68f61ccd089327309a89018ae3d5b3a646371037382f4e979e5e3afc0a070184335a5cd2a1628614bfa09
-EBUILD kate-18.08.3.ebuild 2108 BLAKE2B 4c25ff3239dc6912b391b270e16f24aabd5ea634fe7569ec97634fd31438016de30107bb78ac022cd22bbd8d0b847d54749678b03d1fd8aae81e970aec4e426c SHA512 b1a128d1610843a62ebd58eca5af5f9629dede704549647916b188753c838b1bdb7cf70e78d55f50a1bdf70a9bad2de15269d8f2986a96141f4c025337b8c965
+DIST kate-18.12.0.tar.xz 5770752 BLAKE2B a50b755497bc1adcc4c117c39f942f34ff2c2b80ed4b5e3ddb28942b11b0e823fd2865607949ee6aaae714dd0974611bd99175baec5f524e701dd8e7f4bde5cd SHA512 72fcec478a3beb789cbb6fa104c11191a8389866a4cb15e0a10d91392666b16f8ff6620827dc4756306fa58dc392c2735c1a683decc725a2ab477f8b421c53b1
+EBUILD kate-18.08.3.ebuild 2106 BLAKE2B e776a85fd1750c79d578cd4289893095b59993341ac11aedbdfc8bd474e769a23fc3b8f33aee4e0e8658c28a58483faa57caa6e1b37fbba47d183eedb63ebb8c SHA512 95a4d5fd6139f150224774873700105c9327165d2c051d37acb29c8c01585a91145ba42753ee1bbe8f169440abdde61332b10281e40fc7bd6785f42cafae46bb
+EBUILD kate-18.12.0.ebuild 2108 BLAKE2B 4c25ff3239dc6912b391b270e16f24aabd5ea634fe7569ec97634fd31438016de30107bb78ac022cd22bbd8d0b847d54749678b03d1fd8aae81e970aec4e426c SHA512 b1a128d1610843a62ebd58eca5af5f9629dede704549647916b188753c838b1bdb7cf70e78d55f50a1bdf70a9bad2de15269d8f2986a96141f4c025337b8c965
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/files/kate-18.04.3-root-user.patch b/kde-apps/kate/files/kate-18.04.3-root-user.patch
deleted file mode 100644
index 320c17403595..000000000000
--- a/kde-apps/kate/files/kate-18.04.3-root-user.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bf6d5b7532968763bdc629aa90426c53500af13f Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Sat, 26 May 2018 14:50:24 -0600
-Subject: Re-allow running Kate and KWrite as the actual root user (but still
- not using sudo)
-
-Summary:
-The original change (9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e) to prevent sudo usage broke the use case of running KWrite or Kate while logged in as the actual `root` user with a GUI session. This is how the Kali distro is set up by default, so the original change amounted to making Kate and KWrite not launch at all on this KDE distro.
-
-This patch re-enables running as the actual root user, but keeps blocking usage via `sudo` or `kdesu`. There are no negative security implications associated with re-allowing usage via the root user, since if you're running a GUI session, you were already exposed to the original security threat and Kate and KWrite do not increase the attack surface.
-
-I have submitted a similar change for Dolphin that has been accepted (D12795), but @elvisangelaccio wants that to go in at the same time as this, to keep them in sync.
-
-BUG: 387973
-FIXED-IN: 18.08.0
-
-Test Plan:
-- Log in as normal user and run `sudo kate` or `sudo kwrite`: you get an error message.
-- Log in as normal user and run `kdesu kate` or `kdesu kwrite`: you get an error message.
-- Log in as the root user and run Kate or KWrite normally: it works.
-
-Reviewers: #kate, dhaumann, cullmann, #ktexteditor
-
-Reviewed By: #kate, dhaumann, #ktexteditor
-
-Subscribers: kwrite-devel, elvisangelaccio
-
-Tags: #kate
-
-Differential Revision: https://phabricator.kde.org/D13138
----
- kate/main.cpp   | 14 ++++++++------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/kate/main.cpp b/kate/main.cpp
-index e20fcff..19f7a99 100644
---- a/kate/main.cpp
-+++ b/kate/main.cpp
-@@ -61,13 +61,15 @@
- int main(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
--    /**
--     * Check whether we are running as root
--     **/
-+    // Prohibit using sudo or kdesu (but allow using the root user directly)
-     if (getuid() == 0) {
--        std::cout << "Executing Kate as root is not possible. To edit files as root use:" << std::endl;
--        std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl;
--        return 0;
-+        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-+            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-+            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        }
-     }
- #endif
-     /**
--- 
-cgit v0.11.2
diff --git a/kde-apps/kate/kate-18.08.3.ebuild b/kde-apps/kate/kate-18.08.3.ebuild
index 451e525f55cb..3f406c95b912 100644
--- a/kde-apps/kate/kate-18.08.3.ebuild
+++ b/kde-apps/kate/kate-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Kate is an advanced text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+addons"
 
 DEPEND="
diff --git a/kde-apps/kate/kate-18.04.3.ebuild b/kde-apps/kate/kate-18.12.0.ebuild
index a2aecefc4f84..451e525f55cb 100644
--- a/kde-apps/kate/kate-18.04.3.ebuild
+++ b/kde-apps/kate/kate-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Kate is an advanced text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+addons"
 
 DEPEND="
@@ -53,8 +53,6 @@ RDEPEND="${DEPEND}
 	!kde-misc/ktexteditorpreviewplugin
 "
 
-PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	# test hangs
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 8d0d0694304a..0dff701b5886 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
-DIST katomic-18.04.3.tar.xz 1237012 BLAKE2B 3880b39d5a2b2a4d87909d7403bb528b5e287ca48250807f937265e03c2a0109e09f5d5881712c70721c7f4751ea0e62dc0ab04c192811fb498d996bc913bf58 SHA512 0aacb62e4c56bdfcb3a861b2ccca8c856d482bc31b89923a20d6a4a0d928bfbe7028553001a897f27742036856b057157b6ae4a226a8adac6ae73baf2a98b1d9
 DIST katomic-18.08.3.tar.xz 1422820 BLAKE2B d134207c16d3104da13b805d5e1bf30031498ed3acd999933b954730b62c3cc839377b952d09ae3419a6f3b22f371109d0ef16843a4ba401c98d4eedbfd31758 SHA512 f77a46a52a8039d5b67465033e38ac11713390ac7fc21bbc15981dded19ec4355e4585904ca7e0d830a52831b9e3a8ef5bc3ca0c4a270393207f50c7f4a64eb7
-EBUILD katomic-18.04.3.ebuild 738 BLAKE2B 06d61d0c6e462e9df7f11bd63a69b231948deb734e6d901789f1bd0efdec80496ff5f0f33121342645062e05d75125e8ab402e583d0594fbafaf839805c08b4f SHA512 767d7acf0f646f59ee8f45bb93d85e2f6c78a870747ec2e795663c07edb7595d13effbc343267f9fcae4c096ec19e84c7adad0edde92b0e26e1acb46a1d4e455
-EBUILD katomic-18.08.3.ebuild 737 BLAKE2B bb7d121652cc950a5b2143356f27d351b2db0afecd404470bc7ff11937378e96a8391df798e634d4e81f2254ededcdf7ca0f05d43a2cf0f0a440e979434e7981 SHA512 abb60853f5b5f2412eb4d10748e86ea595bf59f0673895a2d9d02e16f32ab829dd98df02a046e9aa5aff3c90f515ee66ac7237992a054bfd0216dc4f2508422a
+DIST katomic-18.12.0.tar.xz 1422636 BLAKE2B 89548b8a4fbd1900e21713396076269619efddfa7c41f0c2b23df5b17cfa1f4776f3df53baec80cba02133c8565bd09ee6b0b0358a85b7de2267f4736b93ec37 SHA512 071a2846485d4befd70dce12b35fb57bab187a34413af2b8b8360d043d47e46985348ed7839fe6d8c9cb963046ac0d91497e3a80bbc2e97865471049ed4adc37
+EBUILD katomic-18.08.3.ebuild 735 BLAKE2B 04d46f21724d8b658006cb6e7d442e207850beffbfcc8901450b7230315afb9bed886d6046d141361360be05427b42604890c3ad8a8e14c25333566720f1df74 SHA512 484b850a5e1b8d43f78bfb71c1f6e3667728197f921445db52ea255a860b4208539743d787a6ef90d5996a67142b21adc28e81a9bb1a6e925ba23c9fafd15ba9
+EBUILD katomic-18.12.0.ebuild 737 BLAKE2B bb7d121652cc950a5b2143356f27d351b2db0afecd404470bc7ff11937378e96a8391df798e634d4e81f2254ededcdf7ca0f05d43a2cf0f0a440e979434e7981 SHA512 abb60853f5b5f2412eb4d10748e86ea595bf59f0673895a2d9d02e16f32ab829dd98df02a046e9aa5aff3c90f515ee66ac7237992a054bfd0216dc4f2508422a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-18.08.3.ebuild b/kde-apps/katomic/katomic-18.08.3.ebuild
index bef67483f532..a2240c3bd798 100644
--- a/kde-apps/katomic/katomic-18.08.3.ebuild
+++ b/kde-apps/katomic/katomic-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/katomic/
 	https://games.kde.org/game.php?game=katomic
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-18.04.3.ebuild b/kde-apps/katomic/katomic-18.12.0.ebuild
index 31d34fd47d2c..bef67483f532 100644
--- a/kde-apps/katomic/katomic-18.04.3.ebuild
+++ b/kde-apps/katomic/katomic-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/katomic/
 	https://games.kde.org/game.php?game=katomic
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index d76046c8f3f6..cd8eff8643dd 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
-DIST kbackup-18.04.3.tar.xz 344572 BLAKE2B 704dd6fbf7558205f28f2242c748f20675f6fc58373b4a1ce1d4ebc5b02834cd137c9049142db766473ed84e1deb6e520fa9e2bfacee476ebb5ea74b2e7cb6a8 SHA512 871efe26475248bb25e5b303c36497607d8e33701fde00756db1962975f78ad81903c8176454ddb274692c774f06e8cddf93d35c248372ebc68e5bb0e7c71c08
 DIST kbackup-18.08.3.tar.xz 351320 BLAKE2B 1b78a5804feeb502a2ffe35bc2a4e562257da9567128c1ac13048c0be17e1d2a456a549d3af7d3bd3c37eb7c4298c0ea87b89381dd68abcaa5502d0c951cadd6 SHA512 e6e44326c775932992fc2223238784908fccfb5db3f2b001523ce1caa5b2ad739ca9863b529f626938af278240e9464aff9aef0984330cbe922aab988a0358a6
-EBUILD kbackup-18.04.3.ebuild 826 BLAKE2B 8ee7ab8b83800d2b948b9165916bd54419ac806aeed1eb8663fc678f5c39b0b3de8d54d5ed9b1fe10c0d08cc4fb10c27300177a922a4d0e048aa065c0a168e29 SHA512 2e52de424b2508f2b5393a4d689139bc55e21b7df2125d0adaf831f4683bf9fc2d7f177569206f7ae24326ffe716161a1b5e0c1b5cd2b89ea29850a935b4952e
-EBUILD kbackup-18.08.3.ebuild 825 BLAKE2B 2f1e3d4a1808009f7acd4a212f24344c15f5db3b81aa6b1fb94509a97b449f5854a6507fb7db4436c8715eeec85582b2a5992d5defb7d5832ea7ebbd0b02814a SHA512 e4f7c018a674d920b48dc88db95cedd67718f26cbc202824ce151373e3e7f6b3865c22b7189469d0960d84b74b9fd3e19ebc7a4d5a9b87099ba441bcffec728f
+DIST kbackup-18.12.0.tar.xz 350944 BLAKE2B c1880c477be0ac3293885a4432cd6452059ff76c14ba91aa09b6a6e1835d0779987f3d5e8d9015a90c696f97cf8746735f2713917c6c1658d57fdb4e33cf7c64 SHA512 4feea3771c734651c18ad06c7619a66d06e972d8e336ffd438606e49ecfea00963e8266ce5a2c04c8c430949c9e7eb1437755881b07b6df5fa99960710dfed6b
+EBUILD kbackup-18.08.3.ebuild 823 BLAKE2B 72890aba213dd9ec7ce017ec08a91dd4226995f232229de15c39c3cf1e76596d030b93ab2f4f87a8ffb01a5a27d2e8bdd86c936eaa90d18041088d431cd0a723 SHA512 b4320d28b11ca2c21018ef833168cf5100f4c7598eac108383d471bbd1a65844aa2879a6e3bbd893ce91e2aa2117f2b665ed39e94c1e82b635614f4232d9b450
+EBUILD kbackup-18.12.0.ebuild 825 BLAKE2B 2f1e3d4a1808009f7acd4a212f24344c15f5db3b81aa6b1fb94509a97b449f5854a6507fb7db4436c8715eeec85582b2a5992d5defb7d5832ea7ebbd0b02814a SHA512 e4f7c018a674d920b48dc88db95cedd67718f26cbc202824ce151373e3e7f6b3865c22b7189469d0960d84b74b9fd3e19ebc7a4d5a9b87099ba441bcffec728f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-18.08.3.ebuild b/kde-apps/kbackup/kbackup-18.08.3.ebuild
index 3d5a596c33dd..bf2881d925cd 100644
--- a/kde-apps/kbackup/kbackup-18.08.3.ebuild
+++ b/kde-apps/kbackup/kbackup-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Program that lets you back up any directories or files"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/kde-apps/kbackup/kbackup-18.04.3.ebuild b/kde-apps/kbackup/kbackup-18.12.0.ebuild
index 27d4f841b207..3d5a596c33dd 100644
--- a/kde-apps/kbackup/kbackup-18.04.3.ebuild
+++ b/kde-apps/kbackup/kbackup-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Program that lets you back up any directories or files"
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 236e7f957a47..8c7daca14282 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
-DIST kblackbox-18.04.3.tar.xz 404564 BLAKE2B 2cdb7412327ecc8fffde975178d8ce3e16e3bc7829c9dfb5705719a1943d8a259085db159ef9c6f2895979d3fa28cc39a1566742bacda1166f171df0b7b71eb8 SHA512 1d29e375de5671f3c9752291d793a5576ccc6acc89996ad6257f1bf54f1982f84047d65e9da7f3c633284092d0c19a883eb389579925b49ec7a1464370eec8c1
 DIST kblackbox-18.08.3.tar.xz 444540 BLAKE2B b290c7a556b4054385cf256b790be21acf14ef6822eea4d32a00356ef939183bf1c164d980c31b48e5996f37c2d882a574c21214831a2a78942007da8d1a1084 SHA512 45b70cfce300b5d9d649ed41862d53bf67ab8ad8744f6381794dd28e34711c878d48b8816f4d31b74757a1ac175ecaeffc0a0ace708131fcf4d2e50ccbbb281f
-EBUILD kblackbox-18.04.3.ebuild 734 BLAKE2B 3cd04225e1a8a871bad2c2caa8f52c4b23587ca247f78d17b29d3f5d6f03967cab156ca3940ec606f08a42e9fb966ea1ee890af6da5affacce8abcece4f689fb SHA512 30f4e1bfe5f0751145cdfc2be517c02c062474a3241d89397495699e1192a2818614ccd76a3df171d1e3169def087ba0e8a7ffb12c08275e20045677614b94d8
-EBUILD kblackbox-18.08.3.ebuild 733 BLAKE2B ba83dea8141e27728d0a8d86a52026250c30dbd05ec5bda293620dd5cbc44474bef0812a0a2bddb0a7cc20d0de5261c1badfe2e3b263da83a561fa3fbc2c64d2 SHA512 2ad8e6a1b222b689a24023baae3a7098750fdf9fe32b20ccc4b3f80669c21317a7708f1addede4db8a6803a00c611dd77ad3b29c7057656c74a0193582911d64
+DIST kblackbox-18.12.0.tar.xz 444276 BLAKE2B 49b85b728d2f577426c692308e4f293fb234935d68bb21a12fdae687a3673929e16f9910e8d523307b21202d3b4db200c550282db7f15a9a341aa1a02981026d SHA512 9249871bcc150beb278426ab797e0f395a008b5bcbcbd1d09f07bfa00b8f067bcac8fe11d387fefd545615daa2c5e5b38e6a129a1651dc1acd7e9681083660ba
+EBUILD kblackbox-18.08.3.ebuild 731 BLAKE2B b73e433a7b7ecb06e7a0c26d2b7c60fb45e67189647bf64d41011cd6eba3527550b71e43e30b44b8f0daf97e1be3f9c2af6ce788fda788cb88ae9dc296c9f171 SHA512 3b8def9c5b781f889d6641d9ca1594e45d423285f085bedb37ba5c8d529d0c7bd23d2dcf4cce809a248219999dc7d351274165695cfeace0909562b7400f679c
+EBUILD kblackbox-18.12.0.ebuild 733 BLAKE2B ba83dea8141e27728d0a8d86a52026250c30dbd05ec5bda293620dd5cbc44474bef0812a0a2bddb0a7cc20d0de5261c1badfe2e3b263da83a561fa3fbc2c64d2 SHA512 2ad8e6a1b222b689a24023baae3a7098750fdf9fe32b20ccc4b3f80669c21317a7708f1addede4db8a6803a00c611dd77ad3b29c7057656c74a0193582911d64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-18.08.3.ebuild b/kde-apps/kblackbox/kblackbox-18.08.3.ebuild
index 32e8f4464f01..476ec2b826c4 100644
--- a/kde-apps/kblackbox/kblackbox-18.08.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-18.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-18.04.3.ebuild b/kde-apps/kblackbox/kblackbox-18.12.0.ebuild
index 2967f9d8cfce..32e8f4464f01 100644
--- a/kde-apps/kblackbox/kblackbox-18.04.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 93238f6b198b..bbbe03f2638b 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
-DIST kblocks-18.04.3.tar.xz 1750604 BLAKE2B ea372def9f55992980c32b4eda9f938c7ee7e5c6e8416ef99bdd6c752467658afbc2dd065aef2ccef6690a42dccda9bc3360ffa3c33b28feab76b9b1bbb5bcb4 SHA512 6ed96980cfb78ad0ebf62b9742b768e211689acc667120a390be7a0dcc63a4732c9fb4302b594066de4f9e6ecbe3b7b2409a5c4b56dae13bc7a90249de65f48b
 DIST kblocks-18.08.3.tar.xz 1921152 BLAKE2B 0a6a39559b220431306532ee8fc880e5e846a24250af7d95cf7d39261b52687f0e22ae44e16fd15520629708c5fc758308ce5d42b3bd2701e873f22754ad396a SHA512 2e664661f387ebc55ad9621e9ce7836079c2fb330cce82986ce1dd69b115bf99e31faa4e55e497748f9ac750801e98bf73e46e1556c87a1c5e72268837435cb0
-EBUILD kblocks-18.04.3.ebuild 686 BLAKE2B 5af8815669b58db0ff6f0cd3641e833a8f70cb792ca2122ae488c34c630dc4244f98a5d1547a9bb9852be31c7787ce664bf973f7be02648ba544e26c56cee5ca SHA512 5701312c7b1fd2389e341f8068cc4c7566930e7f170a623b886cfde6d32a3b16ac29b52bfdea8d4926d2edb0f32a65c8e2b6b6ab98350acdad484e0a76d65032
-EBUILD kblocks-18.08.3.ebuild 685 BLAKE2B bad3689301214b3c3cbe800d3c24ae69676014a7443a13543593944deefd318aa0381d4102b460f77c3e768fceeefa7c8ee04735ec6bbdb14e5dcf8340c4b0cd SHA512 ad14e2c41d1a84d09fc9068ac739d799927c56ea65d09a0c1d1e2787004acdbfacc972c85b91116d1caa9214841fa6fc0005692579c84b995d0cd9a1e188e8dc
+DIST kblocks-18.12.0.tar.xz 1921632 BLAKE2B 930900ce60771da8dbac21c392d798fc18b101908c197b7147879768eaa14003f7173f24562b62217598a56ee903f3c0ba0a056d2ab57419a2b6eef6396a3b88 SHA512 6ca7760abaa54bb7a7e05da4dd7a421c7b87e351f9050987d58565a1f7eb05f186656e02cf03550b835d6aae1d8f02ec7c377f10d3477ae4934d59cd6fa8763e
+EBUILD kblocks-18.08.3.ebuild 683 BLAKE2B c1849dab6ba8a6cabb234f02beadf74e5b04f5fdec1c0331a8e116f07e38bf6c8caaeaa0a26b385a73957eaa944d25cfed12c2a45715f2b94f65efbc3fa2fe04 SHA512 44d3d212700b08987b00739d58a25005acaa16212b3ec638b67fbaaee126d272b29c31926d52e834e51c8cae5b1380b3bf18446519c5265a9c8a6008fd6ddddf
+EBUILD kblocks-18.12.0.ebuild 685 BLAKE2B bad3689301214b3c3cbe800d3c24ae69676014a7443a13543593944deefd318aa0381d4102b460f77c3e768fceeefa7c8ee04735ec6bbdb14e5dcf8340c4b0cd SHA512 ad14e2c41d1a84d09fc9068ac739d799927c56ea65d09a0c1d1e2787004acdbfacc972c85b91116d1caa9214841fa6fc0005692579c84b995d0cd9a1e188e8dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-18.08.3.ebuild b/kde-apps/kblocks/kblocks-18.08.3.ebuild
index 6a12a96eaca6..a1e0e781fe71 100644
--- a/kde-apps/kblocks/kblocks-18.08.3.ebuild
+++ b/kde-apps/kblocks/kblocks-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="A single-player Tetris-like KDE game"
 HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/kblocks-18.04.3.ebuild b/kde-apps/kblocks/kblocks-18.12.0.ebuild
index 1c20a0c0d4f5..6a12a96eaca6 100644
--- a/kde-apps/kblocks/kblocks-18.04.3.ebuild
+++ b/kde-apps/kblocks/kblocks-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="A single-player Tetris-like KDE game"
 HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 01301ed9265d..bdf9eb220b1f 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,7 +1,5 @@
-AUX kblog-18.04.3-syndication.patch 7655 BLAKE2B a2025972f39d3642eeb9a743f65f9c50865879a54ca3ca9da1a185578343beabb5f09763d96d0bd09ee750f5c925eb141aea2f8aeacd931212815260938c7835 SHA512 867791284a67d41ccdca77c2159a9ea348154455f12e3781138261653e869727aefbb9cc604c246870bd83d85766da1a8dcd134adafb9195001e5a5792a9099e
-DIST kblog-18.04.3.tar.xz 72472 BLAKE2B e4460ad17033afba4be89f29348d5849d98455f4ab479f626cc59b44243932017ed546b0a3851e4615bb892ab33660018d44d8eff38621b62c6ee66fa36fd136 SHA512 c12df99b010a67a3b653a6a0c79209b37b03195b94df27e2bc805ae939f572df99c29e70a182fcce5aee8c792a7b48446e1e6f032493a420896dd39c207cafae
 DIST kblog-18.08.3.tar.xz 72956 BLAKE2B 0c084723c856ac09066046ee0ad456812929a15cdc57972f49dcf6b6b77a00c3c8f0f46150a0c6dec968cf8e6e50a97bdf03f3d3c47f0c0804c98aaea13651e0 SHA512 1a319774f8d76e59615276df785c3ac602eeb2c2bdae7db0d94d4a3ed5c67af19a670593ca1c4e5dbcf17a8769f1d4abf21ed609240f76d3e7b01010d73fea3c
-EBUILD kblog-18.04.3-r1.ebuild 580 BLAKE2B 2d236c586c2506c74d908df6ec23b401befb6a10a648a8517a7ad1492695388c835c0ad8c408df18e2a1e5323b541c16c0c70f8fc3f1e7ee98dc55bd7e8c30b6 SHA512 ec9a8fad568612b466558498175bee5c085523b8b1e36c66e79137d9aae23e374653086572c21dd460ecbfa85e15b7a4837cd8047738be661bdeda75a6a3d745
-EBUILD kblog-18.04.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
-EBUILD kblog-18.08.3.ebuild 532 BLAKE2B c14b0879987b0071f2aff503ffb5ce2566247731b6b76ce083ffdadb12f70738c96a4cc063530d09683aa4924db60eee5e1d48a74dd06ca8e93b2ef601c65781 SHA512 c802b0956385989b0cc2a1ef93b2dfe9987f1e6d5de50fc3f828b49a476c7d80ce6c68356c5ab39ad7aa59e6218f134c8bcc3e2b349afa060ea7d26fe17b678b
+DIST kblog-18.12.0.tar.xz 72768 BLAKE2B f556a40a8ec9269b003e9e395cbb2541e863ee128fd91101254d305516a5091159b7f16d14a57b89e0efe82c5ab664ebc9ef22404aba53ef0bf05f1dacbfeab4 SHA512 64ff83bc1bfb130571ad56828a8dd6777dfd3189dedc7ac6a09ae2837c246e3a8cf17482d03431df817fdc779c198fa9645b53f71ee9ff847a5c6e19817eacbf
+EBUILD kblog-18.08.3.ebuild 530 BLAKE2B a8b72dab312f634f34a9ff3ef5d1f40ce0943188389a58f543ae5a3ca740857becbf2a10874891d47c2223c3f5c44dc7c7d9061c2a86a216d6c15e1524b3b185 SHA512 85d737d8262e7d75958f60ab65508241bd67ac967156278777384acd4b21eccb2bdd9d1a566181977f46a3458febf47d3e5593c1a0854b3f6b29712451fcb74b
+EBUILD kblog-18.12.0.ebuild 532 BLAKE2B c14b0879987b0071f2aff503ffb5ce2566247731b6b76ce083ffdadb12f70738c96a4cc063530d09683aa4924db60eee5e1d48a74dd06ca8e93b2ef601c65781 SHA512 c802b0956385989b0cc2a1ef93b2dfe9987f1e6d5de50fc3f828b49a476c7d80ce6c68356c5ab39ad7aa59e6218f134c8bcc3e2b349afa060ea7d26fe17b678b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/files/kblog-18.04.3-syndication.patch b/kde-apps/kblog/files/kblog-18.04.3-syndication.patch
deleted file mode 100644
index 4771666c0f02..000000000000
--- a/kde-apps/kblog/files/kblog-18.04.3-syndication.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 85fc601b7c622a04c383331841733d681bfc50f3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Sun, 22 Apr 2018 15:37:01 +0200
-Subject: Fix build against Syndication
-
----
- src/CMakeLists.txt    |  1 +
- src/feedretriever.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/feedretriever.h   | 54 ++++++++++++++++++++++++++++++++++++++++
- src/gdata.cpp         | 11 +++++----
- 4 files changed, 129 insertions(+), 5 deletions(-)
- create mode 100644 src/feedretriever.cpp
- create mode 100644 src/feedretriever.h
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 03cef4e..1742abb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,6 +4,7 @@ set(kblog_SRCS
-    blogcomment.cpp
-    blogmedia.cpp
-    blogger1.cpp
-+   feedretriever.cpp
-    gdata.cpp
-    # livejournal.cpp
-    metaweblog.cpp
-diff --git a/src/feedretriever.cpp b/src/feedretriever.cpp
-new file mode 100644
-index 0000000..9d481c6
---- /dev/null
-+++ b/src/feedretriever.cpp
-@@ -0,0 +1,68 @@
-+/*
-+    This file is part of Akregator.
-+
-+    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+    As a special exception, permission is given to link this program
-+    with any edition of Qt, and distribute the resulting executable,
-+    without including the source code for Qt in the source distribution.
-+*/
-+
-+#include "feedretriever.h"
-+
-+#include <KIO/StoredTransferJob>
-+
-+#include <QUrl>
-+
-+using namespace KBlog;
-+
-+FeedRetriever::FeedRetriever()
-+    : Syndication::DataRetriever()
-+{
-+}
-+
-+void FeedRetriever::retrieveData(const QUrl &url)
-+{
-+    auto job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
-+    connect(job, &KJob::result, this, &FeedRetriever::getFinished);
-+    mJob = job;
-+    mJob->start();
-+}
-+
-+int FeedRetriever::errorCode() const
-+{
-+    return mError;
-+}
-+
-+void FeedRetriever::abort()
-+{
-+    if (mJob) {
-+        mJob->kill();
-+        mJob = nullptr;
-+    }
-+}
-+
-+void FeedRetriever::getFinished(KJob *job)
-+{
-+    if (job->error()) {
-+        mError = job->error();
-+        Q_EMIT dataRetrieved({}, false);
-+        return;
-+    }
-+
-+    Q_EMIT dataRetrieved(static_cast<KIO::StoredTransferJob*>(job)->data(), true);
-+}
-diff --git a/src/feedretriever.h b/src/feedretriever.h
-new file mode 100644
-index 0000000..fb28020
---- /dev/null
-+++ b/src/feedretriever.h
-@@ -0,0 +1,54 @@
-+/*
-+    This file is part of Akregator.
-+
-+    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+    As a special exception, permission is given to link this program
-+    with any edition of Qt, and distribute the resulting executable,
-+    without including the source code for Qt in the source distribution.
-+*/
-+
-+#ifndef FEEDRETRIEVER_H_
-+#define FEEDRETRIEVER_H_
-+
-+#include <syndication/dataretriever.h>
-+
-+class KJob;
-+
-+namespace KBlog {
-+
-+class FeedRetriever : public Syndication::DataRetriever
-+{
-+    Q_OBJECT
-+public:
-+    explicit FeedRetriever();
-+
-+    void retrieveData(const QUrl &url) override;
-+    void abort() override;
-+    int errorCode() const override;
-+
-+private Q_SLOTS:
-+    void getFinished(KJob *job);
-+
-+private:
-+    KJob *mJob = nullptr;
-+    int mError = 0;
-+};
-+
-+}
-+
-+#endif
-diff --git a/src/gdata.cpp b/src/gdata.cpp
-index 9ca5b84..115e0a0 100644
---- a/src/gdata.cpp
-+++ b/src/gdata.cpp
-@@ -23,6 +23,7 @@
- #include "gdata_p.h"
- #include "blogpost.h"
- #include "blogcomment.h"
-+#include "feedretriever.h"
- 
- #include <syndication/loader.h>
- #include <syndication/item.h>
-@@ -103,7 +104,7 @@ void GData::listBlogs()
-             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
-             this,
-             SLOT(slotListBlogs(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
--    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/blogs").arg(profileId())));
-+    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/blogs").arg(profileId())), new FeedRetriever);
- }
- 
- void GData::listRecentPosts(const QStringList &labels, int number,
-@@ -145,7 +146,7 @@ void GData::listRecentPosts(const QStringList &labels, int number,
-             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
-             this,
-             SLOT(slotListRecentPosts(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
--    loader->loadFrom(url);
-+    loader->loadFrom(url, new FeedRetriever);
- }
- 
- void GData::listRecentPosts(int number)
-@@ -165,7 +166,7 @@ void GData::listComments(KBlog::BlogPost *post)
-             this,
-             SLOT(slotListComments(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
-     loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/") + blogId() + QLatin1Char('/') +
--                                  post->postId() + QStringLiteral("/comments/default")));
-+                                  post->postId() + QStringLiteral("/comments/default")), new FeedRetriever);
- }
- 
- void GData::listAllComments()
-@@ -176,7 +177,7 @@ void GData::listAllComments()
-             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
-             this,
-             SLOT(slotListAllComments(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
--    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/comments/default").arg(blogId())));
-+    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/comments/default").arg(blogId())), new FeedRetriever);
- }
- 
- void GData::fetchPost(KBlog::BlogPost *post)
-@@ -196,7 +197,7 @@ void GData::fetchPost(KBlog::BlogPost *post)
-             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
-             this,
-             SLOT(slotFetchPost(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
--    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/posts/default").arg(blogId())));
-+    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/posts/default").arg(blogId())), new FeedRetriever);
- }
- 
- void GData::modifyPost(KBlog::BlogPost *post)
--- 
-cgit v0.11.2
diff --git a/kde-apps/kblog/kblog-18.04.3.ebuild b/kde-apps/kblog/kblog-18.04.3.ebuild
deleted file mode 100644
index 582ecc3b742a..000000000000
--- a/kde-apps/kblog/kblog-18.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-18.08.3.ebuild b/kde-apps/kblog/kblog-18.08.3.ebuild
index 205141fef707..4f1d4a3fa046 100644
--- a/kde-apps/kblog/kblog-18.08.3.ebuild
+++ b/kde-apps/kblog/kblog-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblog/kblog-18.04.3-r1.ebuild b/kde-apps/kblog/kblog-18.12.0.ebuild
index 9c93a45c0d09..205141fef707 100644
--- a/kde-apps/kblog/kblog-18.04.3-r1.ebuild
+++ b/kde-apps/kblog/kblog-18.12.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -22,5 +22,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
-
-PATCHES=( "${FILESDIR}/${P}-syndication.patch" )
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 9f63eeb10665..fa55c77b4888 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
-DIST kbounce-18.04.3.tar.xz 3485332 BLAKE2B 15b329c20f77f6d5dec1a77e0eed8e294c4917fcad4e9415dfc08fca23bef14883068365fb144026f2c6d19bb4d2feab49c533b7a07c0d3434c84b7a67f59bf4 SHA512 73dfa5736780cf06d88125af12141ca5e76342923fb1ad9808998742ea147d6fc6b0d3e7815bdc8bc897671da29d50a749a9278db4dd931c21804fb683d48fe7
 DIST kbounce-18.08.3.tar.xz 3465668 BLAKE2B a79731464ffbad50007260c62541268457b91ea5191990c514717ee5bedf49c19558ac5fab0c5d9fd744a5780e9cf557bebf6aad08ca29b47dcffba9e2f3a5fb SHA512 2d98f5b5badeeec04bffcb116930973f0c4313a6dc294e96728ee420156b6875faf996050c47a6feaaa0691c95965391a5367db06898cd70fa8e327f6591e06f
-EBUILD kbounce-18.04.3.ebuild 817 BLAKE2B c1344737ccc3e0884ed0aedde6ea0e70832996761448e02325656d595af247a92983cbb79c68ff6a039fd9c68b139eb997cbef02580b8d5782643a89b23567a7 SHA512 52bc73ca5c7f4e1923c93553e14ddb9e9db8ab8e5d407d2743ae29fc6796bd39c9793f59752ab63c6b42fd1154ac539f1ee4ef675d68bfedf4364983f602fe3b
-EBUILD kbounce-18.08.3.ebuild 816 BLAKE2B e3fdfc22f9a43080926331c34dac9c52fdd310e75d27f2d9312292747bdaeefa6ac007277ba58749e2b04ce96d65a597f88a8e72e3f594c8a65341a6274aa173 SHA512 7c77e5a6165f9377b184f9c0e9f51b2d0aa85b67a9b15d3fe1fda3cd210e10026a3e8c6e4fec5e5481b3aea41535aabdfb6a6cef0cd4372708ec9a2789ec0d46
+DIST kbounce-18.12.0.tar.xz 3467460 BLAKE2B 5f2118637200e6d33b951dd2a61c70fb868161a0b4265b5d54629fd2b131f6e41e5d7b8f5a761962fcca63e14dd80c61ba3fa3625d8578ac441cae57c1ef0e8c SHA512 65872dfb24f0d6231c854202aa16f94adc18e590715c0871f6f2a1d3a4e590d87dfebc3ebc14faf4dd73cf29a1637ebb28082c4c1e4f72700b8000a1225a88c7
+EBUILD kbounce-18.08.3.ebuild 814 BLAKE2B fd43555c4ec7b477d88f7b9193dd21fb00f587176182e5992342529fe416961e2cdae3a0a9d62993cdddbf9ee798e7acdab14f6c86ec19f10ebe9b74b2082549 SHA512 3a83d123fa877b11d1d9397791ea7397d4c9b21630b3d01398ffab90ce527be73c9fef6d967489531cb5fca4fc41ce0e45f8a56a13d663c4b717638e4be05e38
+EBUILD kbounce-18.12.0.ebuild 816 BLAKE2B e3fdfc22f9a43080926331c34dac9c52fdd310e75d27f2d9312292747bdaeefa6ac007277ba58749e2b04ce96d65a597f88a8e72e3f594c8a65341a6274aa173 SHA512 7c77e5a6165f9377b184f9c0e9f51b2d0aa85b67a9b15d3fe1fda3cd210e10026a3e8c6e4fec5e5481b3aea41535aabdfb6a6cef0cd4372708ec9a2789ec0d46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-18.08.3.ebuild b/kde-apps/kbounce/kbounce-18.08.3.ebuild
index b9d12510fd03..abf1f0514d08 100644
--- a/kde-apps/kbounce/kbounce-18.08.3.ebuild
+++ b/kde-apps/kbounce/kbounce-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kbounce/
 	https://games.kde.org/game.php?game=kbounce
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/kbounce-18.04.3.ebuild b/kde-apps/kbounce/kbounce-18.12.0.ebuild
index 5c6330c29e26..b9d12510fd03 100644
--- a/kde-apps/kbounce/kbounce-18.04.3.ebuild
+++ b/kde-apps/kbounce/kbounce-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kbounce/
 	https://games.kde.org/game.php?game=kbounce
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 39580384c73f..cd13e57ef46c 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
-DIST kbreakout-18.04.3.tar.xz 2023544 BLAKE2B fdab111fbd2364fb135f2e408436f0dbbb25d1ac75e1dd18d199ad72878af047f838b2ec6d267df0c051ed3f239b2b9ea60f4250fdd674f86066efb11d34a424 SHA512 d0296c7a66c7e54c7021bad5624894cd08dc52e6284c102817a43bf6266f5b30165a3c7b1d2f52f23024e6626a83b5e3ac35c4a24b484534f63692a642a1d270
 DIST kbreakout-18.08.3.tar.xz 2274256 BLAKE2B 2db6120a7f2a606643e60166d3df0d6d572640aed77e22406aacb9bcf8b79a18073e8829835de1e3a23db29f152cf372b86f90b6ea68fc20f65e76e9f46c636e SHA512 c195fd04a7f2f98af435f052ebdb8026e696ff709bacd54fbf15c928b5baecc649535e2949022cbbaa134f7130d69e792b2a6894d97bc69e5fc2bd4ec0a788fc
-EBUILD kbreakout-18.04.3.ebuild 766 BLAKE2B d5c1bdfe47144def260c6f124b99ca2c0ac8567067842de0de128f9e7c5df56b26acd049cf9d32cc04201a5b47b50a923829ebd5ef6f88c9685bc78eeb501b72 SHA512 4137190afc45eaef707c4fe2008cef9a06b7f1021fd3051d993ca5a101c989c3f1440feb758d01ecb71a0da068eec3736d53bbc3dd40575bea06091c216b9346
-EBUILD kbreakout-18.08.3.ebuild 765 BLAKE2B 7867c46cae46844ecfdf3cf862fe2692d7694cc85f19fbfe07409e04ca6dd7232c66dafdeffc0414a73efe710029c4418152088cf3958f013e74a0ec12def8d8 SHA512 68dcd722d108bd5112308db6850f65b266bf7bee2712341f8a1d4eeae9c0b4b0f35f8eef00373136a39b42dcd1f9cf6b1f672678eceb7f82acc088e7467b7241
+DIST kbreakout-18.12.0.tar.xz 2275564 BLAKE2B 7f59602f698a60050d9f270c00bd0871f834a44176a61166df1ce50e8a307cb259a863fde75d7ce6c7563231d34d34f3296567cb9637cd434399f10ffa4bd480 SHA512 f3cd431415611242e67ad0f3f0f86fd60d2d29a9fa38b331849f5da7834ce54424cdf5fa142bdfa0057e12e7299c2672e3fa7a8b6d03f93c16db87cb60b2e007
+EBUILD kbreakout-18.08.3.ebuild 763 BLAKE2B 91fb4a817a2357cdc29f1bac91517d670391e262970a8d6c78fb3bc905c123f819566f773fca04aebccc3d252797472c8c201134da3ab22f341c676830eadcf1 SHA512 2996faf15ca672d03af15d8d30e0f2cfc70ece17621f8c7df31ae184cbf53945863e87a11a0e6f752975b2a669c57b0e46b6b18cfcb22441a0d632ac81925ce7
+EBUILD kbreakout-18.12.0.ebuild 765 BLAKE2B 7867c46cae46844ecfdf3cf862fe2692d7694cc85f19fbfe07409e04ca6dd7232c66dafdeffc0414a73efe710029c4418152088cf3958f013e74a0ec12def8d8 SHA512 68dcd722d108bd5112308db6850f65b266bf7bee2712341f8a1d4eeae9c0b4b0f35f8eef00373136a39b42dcd1f9cf6b1f672678eceb7f82acc088e7467b7241
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-18.08.3.ebuild b/kde-apps/kbreakout/kbreakout-18.08.3.ebuild
index dd41dfd9cf90..96e5b967dff9 100644
--- a/kde-apps/kbreakout/kbreakout-18.08.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kbreakout/
 	https://games.kde.org/game.php?game=kbreakout
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-18.04.3.ebuild b/kde-apps/kbreakout/kbreakout-18.12.0.ebuild
index d78bbc462cbe..dd41dfd9cf90 100644
--- a/kde-apps/kbreakout/kbreakout-18.04.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kbreakout/
 	https://games.kde.org/game.php?game=kbreakout
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 680d13063648..a895d72ccbf3 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
-DIST kbruch-18.04.3.tar.xz 5604504 BLAKE2B d728f78f55abdeb763c30247483ad1df0dba1a7f5293a1fbd50f85ca5f1f75802733309e9ce6b772ca8a888b5ae2f8e39bfcf645317358fdf9bc21e2dae1e147 SHA512 566111d6b097d9b24e98c5911dccf6058b1f7b848a558d004f977fb82d27cbea102f9c84f53ea67a9f006a2537cf76dcd958474474d2cef1480d223552031cc0
 DIST kbruch-18.08.3.tar.xz 5603772 BLAKE2B 96f4a41ae2be6babd6125b338df7e0fc0dc3dc78191ed12940dba7e2c59c2bb5a250a7ab1f035ca9637881478d7d7f0e23d888602204b23fb81f77e284749915 SHA512 c8ad6634fdd05b4537fe3b2aa50afced142d7892f07513840f698243acc3137762fa906f125a1dfd8baf7da1002adf4609da5e2132129ec19a309d150480cd69
-EBUILD kbruch-18.04.3.ebuild 630 BLAKE2B 111e2fbbe4ad95c8351455c57ccd531c3390679a9fa5da642c7f14e4d7f6850f510a1429b7c257cd8e151cf7b05b6df67039fdf63b43407b64027ce3eedb9d6f SHA512 53031739e69852f412c0fc32318f46d5c710e1d8dc9b17810fe0f009fa377bf5c13cdcd72db9132f17d50d901f486b34c76d958ae137c0b60359a2fc533d64b0
-EBUILD kbruch-18.08.3.ebuild 630 BLAKE2B 3a62dedf88da5d6f7c38d819623c67319ed3bf66e71d0c28f1e906be3fd1f479ab0ce365e311ea95a5a04c137b9c33a2741f4b9a94f995724eff60344f324825 SHA512 a5836e8fdc4d58a968da597c8ccf342a936ec5bed8932bf6b521edafb519f076e6b1dee01b23c1296eef319989e47ccece3f1b77394c0590ab0908cf6706b514
+DIST kbruch-18.12.0.tar.xz 5603332 BLAKE2B 5d7e27a84c9c7068d244d02f8ec93c9b5a007c4e3ce8781e204e8bd6fc7c3ce2578d566d0e147a9d9f4eab7b47b7c6c8da0126407c5cc7cb8566adde8c1ca48b SHA512 ce0040bcf2e9bcad5f49566c69c7f169597b653bb3bb7830a1a41faf08447ad4bfa848ae2c7759a6c4a42faa45004f701bffebc09cf1196c590c455bb72282be
+EBUILD kbruch-18.08.3.ebuild 628 BLAKE2B 8e7e61882d5f26958d66b90807a6be9d2b1c7bb18bf3b721c9ddfbad2c70abc9577d689890972bac0493361b5dbe3e68a3d9cf58e1a43778b530a184ab0ce0ae SHA512 7109c23532ff234490ae1a629e90693402911c7f12bbe88cfeca6305ef515aaf78c9aa3dec3062e5c659a6731a29add8775cff310fbb7af82305175cc8ddf27f
+EBUILD kbruch-18.12.0.ebuild 630 BLAKE2B 3a62dedf88da5d6f7c38d819623c67319ed3bf66e71d0c28f1e906be3fd1f479ab0ce365e311ea95a5a04c137b9c33a2741f4b9a94f995724eff60344f324825 SHA512 a5836e8fdc4d58a968da597c8ccf342a936ec5bed8932bf6b521edafb519f076e6b1dee01b23c1296eef319989e47ccece3f1b77394c0590ab0908cf6706b514
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-18.08.3.ebuild b/kde-apps/kbruch/kbruch-18.08.3.ebuild
index 9cae5742b41a..dd70a2721f44 100644
--- a/kde-apps/kbruch/kbruch-18.08.3.ebuild
+++ b/kde-apps/kbruch/kbruch-18.08.3.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/kbruch-18.04.3.ebuild b/kde-apps/kbruch/kbruch-18.12.0.ebuild
index 3df4deb70143..9cae5742b41a 100644
--- a/kde-apps/kbruch/kbruch-18.04.3.ebuild
+++ b/kde-apps/kbruch/kbruch-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index b472248bb231..6c55661e6521 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
-DIST kcachegrind-18.04.3.tar.xz 812516 BLAKE2B 48811c28f5f4a08727d04d7220e1696eee93be88404d0e3c18781169c17af03b4a66ac8b26e656d4fcf176d631469cad7586a7c90c2e47124f14f6da670414e8 SHA512 c82fc6fc980c08acaea40c9ada4489b8ff7864cacd0705ac9842723f9a0d93c718951617efc0bca17acf187f7400115c04aace9c5b0fd9275193449d083dd3c2
 DIST kcachegrind-18.08.3.tar.xz 808440 BLAKE2B 489c1219f50c24393d754eafa2eee7956c6229d36c1a147829615d4db2689e6f91745ac34f06b0fe872da60c431407f0067e6af71c2493c69e53077eee1be706 SHA512 abbbf7ba539da1fa71d31e4603d1b8a76178a48bf503c735ebce9bbc9887e9ec64b2338ce77de2f38114faa27dee51e19af61cf4d3e9fbbe942a417edf2558c1
-EBUILD kcachegrind-18.04.3.ebuild 879 BLAKE2B b6a504162dfc611bded522a77895b797dac2d2fdc9dd9cef6ae89746f1a4c9d5157bc589ddcc1d04ac662065b6bb21cab9582aa9da16aa8564029fd7977b98d5 SHA512 cebea211513f766df63d127f369b9a539bf6137f7908e103e862d706c9f64679f791a9808efff89812c690a7da149204f75a9904896706927fdfe12724d44b3c
-EBUILD kcachegrind-18.08.3.ebuild 878 BLAKE2B ff8d9b472b3bb7df5c26361dee547d9c7c177db4106165f76e93563136dd4b734629b7467c4225c7d68cabbc5742bade40f4c0d882f51cdd6ce74f9018f2e7ec SHA512 357caa814941f00d71c1d7655f2b58c90234245c1a9d3b2db4d8584f4428bbfbb9066d9bf458e91adb6aa5c8e437f32a76d40737469d9a90197fb43487057b4d
+DIST kcachegrind-18.12.0.tar.xz 807824 BLAKE2B 13761c896963f1308298372ccb446b5460a8f0177b4bccd972db090e1e5e81e5f3cad517b01a0d5aacb9a912a2eea78efc89a9f607dccdc59707f1b793d23a1e SHA512 b29b8493c9c0fd1c442be931d50d4412e1ce01fd615b88864b7d687babab8be47ec5527b40c5acc95a65518deeec91241fc469dcd24bc5f003878e11d1b096c3
+EBUILD kcachegrind-18.08.3.ebuild 876 BLAKE2B b9265fbf159492354f5a6758bd0a94570b3ee6f57bde8f564c7fa92bc7bcaddd4bb369cebe0faecf16a805712fc99be3a2b4e99b9e00d7957b1fefbde2e3ce4c SHA512 331111603257484b3527753145a8d16157a879e8aecb69cf636f576f67c4aaf8d0217ff515c1f2160a779963321465c1fd76ad6d87c80398a5b263c36a52463f
+EBUILD kcachegrind-18.12.0.ebuild 845 BLAKE2B 7ff632c8938938a736819939693827679346331c37a312ec38db33f06d486371db29e6a4a350e6bd3ec190eff3621f4e66d3a215149ee220c53199de8140dd0c SHA512 040839dcb2aea9beedc5ea5db31a3fc81d72813a7bed6f1d3b13bb89d9765bf9c9b6d21f6e98a8103badca8aff0d0ff05c392f55627678b08d8dfbc4ead2827f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-18.08.3.ebuild b/kde-apps/kcachegrind/kcachegrind-18.08.3.ebuild
index 9f23e9d49621..60067f7e9ad6 100644
--- a/kde-apps/kcachegrind/kcachegrind-18.08.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-18.04.3.ebuild b/kde-apps/kcachegrind/kcachegrind-18.12.0.ebuild
index 2fc4bb25de8e..4e6b7763b19c 100644
--- a/kde-apps/kcachegrind/kcachegrind-18.04.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 COMMON_DEPEND="
@@ -31,5 +31,4 @@ DEPEND="${COMMON_DEPEND}
 "
 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 107de38eec9b..33df6344950d 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
-DIST kcalc-18.04.3.tar.xz 362048 BLAKE2B 4e07d5236bb807705c4fc7617c7422269812187255277046911011b801310034ef1783e90273732e1bdef241d5b4fd024d58e42f5c57218e9797c9b7c9afd6b4 SHA512 372f0e2660836108c405e9aa48a07f042a86ec8c66f43a7ba4a64c5ac1da561b3ead94f7c9e496ec270826813c77e21144b12b720f6a3872a3c49859bb637c83
 DIST kcalc-18.08.3.tar.xz 362192 BLAKE2B 8fa45fe7ab30b164c773752ccaa375d1f082b272a13eaa10183d2ccdf228bfe53a913b8b375bdaaa5a0023f2636c5000f33845f8dc087c2da2b3fdd13a4783e3 SHA512 55c58bebd13f73e9b9a4f6ffb06c43700493f268eef9ad7357ef7a7e6857ffa134fe396ef3ab1fa3bd4544f01ac35bbb1d2b729acf93c271f9dbfc694b18b144
-EBUILD kcalc-18.04.3.ebuild 771 BLAKE2B c5c8f2f21e376081aefb2763784572876c9541b1221762eb9c43c36b8145a5f172f363b059c7bfa399fc6310182e8b5177593b1d9b36f59d2bcc010430f797bc SHA512 7991e7adec9c5bb4735a755fdb91cb2ff8ecde7c352ad13e1cc98d58970cdd4439621765ca66f8870f54101265af1021aade8a6a4bfe0c3ef02ab5fbf9686c3a
-EBUILD kcalc-18.08.3.ebuild 770 BLAKE2B 2845f7f41c61e2f6e18f2d59d70eeb3a2dc28a03204bb2d0f1a34805f6c85a87916ac47dd42e2a3890402516ba78e2806c2f879b4397a0a5ccd7509d02d4bbfd SHA512 0d34ab65b533999a21f39dbf690bfed4ddfce5d891e340fcf6b9c7a6c4f158cdb93bb0a762083b9a785b737264dbef406ebc14c50184d60be3192c4aa2e4d234
+DIST kcalc-18.12.0.tar.xz 362668 BLAKE2B fb60ac093fef13661832a551446967ccdca7d262d97d40c4fa7b95f80af653d6375c661da30fbb447fb3e6a05178379c7fab57a500859949cc8e04eef2119816 SHA512 3bc8075210f62e69434e721a5be93d0c091377ad7b72ca256fffbe0f4658c4d47646930760557f66f290d03bc851fe3fcb7d8b24a966efe4ba415d490cab618e
+EBUILD kcalc-18.08.3.ebuild 768 BLAKE2B 1038f425ed9ac45b0e8241b4727b3f53e4d6e24615165d4d45c7b5272557d273684bee827d5b27fac7d80135b4979b22d521ee06fc4a7cf84a1da924e88e57b6 SHA512 cf2162eda7b62f7827a90875f221830ab740250f725f009c404b562bfa5075f39c6fb2981070259d9033dda6404fc55813d2cac45e604db56ba80f00e73add8a
+EBUILD kcalc-18.12.0.ebuild 803 BLAKE2B 93988210c1d253c29c3df4d032ede4a850abe91eb486e8cb7c18c659f4e95ed278ab27405f13db03c0593ab0f6338f08a11fcaee724dbf2df2d00865e4cb06c7 SHA512 376798fe35eb391b92e513f8758b0487e8bfce6bdd66a6e52282002e5adbd843fe2b216d1b83d50c77d5ab95d6372605943dd28e87dae342b62bc71483724f41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-18.08.3.ebuild b/kde-apps/kcalc/kcalc-18.08.3.ebuild
index 150699d9a9a4..5db8a74fd014 100644
--- a/kde-apps/kcalc/kcalc-18.08.3.ebuild
+++ b/kde-apps/kcalc/kcalc-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE calculator"
 HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
 https://utils.kde.org/projects/kcalc/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kcalc/kcalc-18.04.3.ebuild b/kde-apps/kcalc/kcalc-18.12.0.ebuild
index e2e4d0992fe4..d826dfff8f09 100644
--- a/kde-apps/kcalc/kcalc-18.04.3.ebuild
+++ b/kde-apps/kcalc/kcalc-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE calculator"
 HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
 https://utils.kde.org/projects/kcalc/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -31,3 +31,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
+
+RESTRICT+=" test" # bug #673136
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index b38b0181dd07..4fae88e19b8c 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
-DIST kcalcore-18.04.3.tar.xz 251228 BLAKE2B d1bef3986badffd3e11b15a52619e653a2e8d1ec05fed6fa4244122493bf9947f542403c0dc167267b0fbca92b7569a08b786c908f8216ce5808aaa16a6fe277 SHA512 2da0993ab1d0c6facbf7f02af186f3554ca38408468dd72f57380817ef1f7f0bf236409a8644d7e84b5019d1eb918f2fd6ff1c1190a89a4e825845659ea84a1b
 DIST kcalcore-18.08.3.tar.xz 253392 BLAKE2B e43ab2781326ca5a9758fd1c49ea547ff837fb1d2d95d55710247c8f5725ac126f287587aaea2d0fc2376d948d013b965c04b7f8758e37373e7c9099a96816e0 SHA512 a20145604fd809cc04078e689efda7634b1c4bf3c4593a8e7bd662e66193ecd79ca1a5c9eeab9efdb71f94fa1c8868f0f2bdf28806fb585ad6dac2f35294e520
-EBUILD kcalcore-18.04.3.ebuild 438 BLAKE2B 6d19c4126c628848ba833d0eb807d8221b1e82844646b34fc0e2743b900260d3d647c3f85fb290172e10339efc64e8dad5b3fa6e1a21621e3a06dd29ce214883 SHA512 a8ab920761ef69473ec447e42a108829bd8eb5a9d77e5fa3c814c1c28a8234fae375c33ff25b0597bd41b4b46260464adb47deec7feea401140acf6b7fc23947
-EBUILD kcalcore-18.08.3.ebuild 437 BLAKE2B 8f8c5079d8b0cfb927940b3af3fb81134184de70944b38cf69c503c2d59bea105ccec85f782d62d9b4a390ba35e54075e559395a69db9d48222db39850b7843b SHA512 68e1c9abd081b9950015b7da0cdb6725b61591a50ad82a9248c3a58b930629ebbca01ca494ed9874a37a1e26fa2b288c60fbcbdc1797401d21b276f8d80e39e5
+DIST kcalcore-18.12.0.tar.xz 252592 BLAKE2B e0ee2f99d7543cccbe527c57b6c98673f7ed7b98da5a0c0e7f5801474f1fb2ceed3c6ffd91fa5eb13f71aee36388a550237fa277afe5d8fb749bae58164e5e41 SHA512 3c7a015afde62821254f27683836fe8dc40db374ed452a51c0c8640a6a39f8f0a474bedcf380465af952f7854799dc33a3853e5ea5fb205ddd738eb610da60ba
+EBUILD kcalcore-18.08.3.ebuild 435 BLAKE2B ecbe954d58328a89642658281475bd52990180ba92e84205bfe2791cb8aa99d44144489832e22ad2dae92c960beff81554d7a616ab7d7919831532765489fd28 SHA512 f662b451b23ec7ee55e254ea580d3a0475b338abc4b34af9f03afa391359646fe98c8f3c9a1bc9b9160dbaf2b84e5318fa320f57a61dec062c12e0ffa4a477ed
+EBUILD kcalcore-18.12.0.ebuild 437 BLAKE2B 8f8c5079d8b0cfb927940b3af3fb81134184de70944b38cf69c503c2d59bea105ccec85f782d62d9b4a390ba35e54075e559395a69db9d48222db39850b7843b SHA512 68e1c9abd081b9950015b7da0cdb6725b61591a50ad82a9248c3a58b930629ebbca01ca494ed9874a37a1e26fa2b288c60fbcbdc1797401d21b276f8d80e39e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-18.08.3.ebuild b/kde-apps/kcalcore/kcalcore-18.08.3.ebuild
index 5f227c441423..99912803eecf 100644
--- a/kde-apps/kcalcore/kcalcore-18.08.3.ebuild
+++ b/kde-apps/kcalcore/kcalcore-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for handling calendar data"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kcalcore/kcalcore-18.04.3.ebuild b/kde-apps/kcalcore/kcalcore-18.12.0.ebuild
index 37d7708da1c2..5f227c441423 100644
--- a/kde-apps/kcalcore/kcalcore-18.04.3.ebuild
+++ b/kde-apps/kcalcore/kcalcore-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for handling calendar data"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index f334f3fabadd..cf3c9861be80 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
-DIST kcalutils-18.04.3.tar.xz 326484 BLAKE2B 64787af00f304ef03c8bff17fbcd0b861ae061aa3e11fb235d72bcfb7fe60bb407a7299a402cfbd58d1a43db562f8fb3fecc38319bf7ddd5118031fb30d71743 SHA512 8105755af6ee6ff08f072ac58f66ed688bb9c43a6d1947e68234dcbe6e784346b15410fe136d13df822e3ec3f56cef1d1be59dc3ba70a415c1a860f38a0d962a
 DIST kcalutils-18.08.3.tar.xz 324988 BLAKE2B b3d8a89ec71dea9f8130ff04c56afbf0b8d74fc4df43fa494ba4640197c6f656fa9a3fe402eb94a1042f8dff90c35b5724d0ddff2b6527a80d9096c60212b719 SHA512 95b7a17c0d4788591ae4ca48e5cfc7f7d91562e1193953629e723b165a3b0ee17ecc5b92c0228a958ce9d32e0250cbb2c702730385463159f0a90291506845c7
-EBUILD kcalutils-18.04.3.ebuild 852 BLAKE2B c66c865ec1692f6a5cae8e1a9da86a0581da30e716b73d29cd4e4dfd651fbdb05f437ea04268c7b2be190af4efb84deaf583aa0d49ffed47b2915414acb43ced SHA512 7af85697ceefc1adf93fc20abd3d2a04c14077dd72e91c7f5751364dfbf2f509ec6165a56431ec8fb062465e89fe6e348ff4e145cae5ce9d8d8290a600b7a9cc
-EBUILD kcalutils-18.08.3.ebuild 851 BLAKE2B 62fee68b29bf04b741710bd6aea7699d9b8db38583a5bb1a1165ffe15116faed54e8f8709ae123c5a97c6a0357304b17c7299b7632a393ed1fafb1e07ebc8021 SHA512 5222a5b149c62dc7cbf5b55cb375b870cd20791ed802d31cf331f3e9871b3b8f5d97236a74bc57abbef071d3c2af3910c778f0b72ed4f7965f3daadfc1e9c74f
+DIST kcalutils-18.12.0.tar.xz 328988 BLAKE2B f72974b48f5dda3e7642872d07bdaaf89c04125b65e97fe4b0122b965320b9f32a6f79544c871877bd820c876b4a9ebbfd10a97234ec06e48e2575b72d914511 SHA512 e88fc10e0aeb437d6e25955c2a1b9dbffb8086abe452ae0701c188f7d989f46a78c0d1516d4c0ceca2e413f1ccd74c771d110232a6fb292a991b449b13f78a21
+EBUILD kcalutils-18.08.3.ebuild 849 BLAKE2B e4fc595a5c2f0614f79b0113fe869149169c19686023cb1fa779182a411a1e31673cbd48745c9692ec82545b882c6eeefabff04f6549dc51530311630ab6d80e SHA512 caf98dcaddd011a671b76fb42a450539d3b8f416aaf11b73e0506c00201f53f8231ece1efa94a24acbe4b93d9356ad3f76bad552d4b47283dc69cc5cf317a23a
+EBUILD kcalutils-18.12.0.ebuild 851 BLAKE2B 62fee68b29bf04b741710bd6aea7699d9b8db38583a5bb1a1165ffe15116faed54e8f8709ae123c5a97c6a0357304b17c7299b7632a393ed1fafb1e07ebc8021 SHA512 5222a5b149c62dc7cbf5b55cb375b870cd20791ed802d31cf331f3e9871b3b8f5d97236a74bc57abbef071d3c2af3910c778f0b72ed4f7965f3daadfc1e9c74f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-18.08.3.ebuild b/kde-apps/kcalutils/kcalutils-18.08.3.ebuild
index ed19674a46a2..31e5d4566582 100644
--- a/kde-apps/kcalutils/kcalutils-18.08.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library providing utility functions for the handling of calendar data"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalutils/kcalutils-18.04.3.ebuild b/kde-apps/kcalutils/kcalutils-18.12.0.ebuild
index 6b06eaa5061c..ed19674a46a2 100644
--- a/kde-apps/kcalutils/kcalutils-18.04.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library providing utility functions for the handling of calendar data"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index a737e1107959..911c1270ed50 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
-DIST kcharselect-18.04.3.tar.xz 351764 BLAKE2B f3b9d678e89ad1952077e1e42740c0b36356068e5a1740c4b607acd56d8615329691fc43132ad9359d2a3e820d9e833281b462a66c749be798ac2061b254eba6 SHA512 a0ab55769acb4cfbb33f54d5fbdafc48464c306286321ebd2e8f8b932217d5ae42b0b23c3ca3b40156a4770cb6980b832b2f8ae2dd8e7b6ac81d24c141df5140
 DIST kcharselect-18.08.3.tar.xz 355564 BLAKE2B b5f48e7c4a0fde82790da190f2fe01de628c8e7847be152b9fb646a998288cff659ba3754737500da42ad1d5d36fd103acce25b10d28c8a7ede95a4f1de7693b SHA512 2152b3d6e2e0ebae15e9d2f5fe2d042d0f43df3b48f6e1f4115ab62c8d493c8e0896d42824b11021543a6e38e6e55d02f5332007f24512a093584c260018bad7
-EBUILD kcharselect-18.04.3.ebuild 657 BLAKE2B 02d4eb97328d7a29bc35b38d7fbe1d36adec5bf63917e132ef4d3c73af36f466349e0fb69e8e117bac93e81818f24de79ab219a67863741065b9c48146c05a4f SHA512 1b4ad8686d4943234182a53b25579e0f44e8c1a4b5cd6dd1e3b132461906fd70eae7ec3e48603912813212cc8f82d93dc35f331a2c6717a2d393824ddbfde5f2
-EBUILD kcharselect-18.08.3.ebuild 657 BLAKE2B 1d83cbaee3e4cc7e8969baafc2a03b55ebf3bb5fff3d49d2bbe3e8eca39a191189af2f73a5b9614aae09d82eb74307c1859e4d82d4b023ca5181aaada3fac0aa SHA512 53cdf00b118d8682e889056c74d44d46159dac88371642106d47893262ffab3abe73d840ec532cf8712f0a62c0163e65b86a5a388be01f37215a176469a2b3a9
+DIST kcharselect-18.12.0.tar.xz 355688 BLAKE2B 4925e31dd81c591dee7086a0fff117585b033a5872aa9d985caa2319d74192f3299baa2a197f0519ffdf56ee4a46d34f2b47669a426d7edc4b083fd0e7ca7139 SHA512 5a0b40a77355736bed7aca069580b47aeb81a39092c3968559d0a010eedb94c7f97145b174d1c551b64d75c1611fa28f20a8f30d6734de54557887a592e651c8
+EBUILD kcharselect-18.08.3.ebuild 655 BLAKE2B dbd698990452a51c57d4a377d1a15225ab72272b54d695334f032a4d90d86d712cb8dcb0bf69504330f06793908cc229cd3fad6102f422847a30b6e16ced89b2 SHA512 22940524559cba4a7778f9cb540574cbd59ed86eaece81de1df37cab5a97fb0922e01c0053ef274b44de57944a0917efc5d8b8b8f8285f48fcfed300b5878f07
+EBUILD kcharselect-18.12.0.ebuild 657 BLAKE2B 1d83cbaee3e4cc7e8969baafc2a03b55ebf3bb5fff3d49d2bbe3e8eca39a191189af2f73a5b9614aae09d82eb74307c1859e4d82d4b023ca5181aaada3fac0aa SHA512 53cdf00b118d8682e889056c74d44d46159dac88371642106d47893262ffab3abe73d840ec532cf8712f0a62c0163e65b86a5a388be01f37215a176469a2b3a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-18.08.3.ebuild b/kde-apps/kcharselect/kcharselect-18.08.3.ebuild
index daae6f7715ee..03e076e5f20d 100644
--- a/kde-apps/kcharselect/kcharselect-18.08.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE character selection utility"
 HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
 https://utils.kde.org/projects/kcharselect/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-18.04.3.ebuild b/kde-apps/kcharselect/kcharselect-18.12.0.ebuild
index c1c8a166a56a..daae6f7715ee 100644
--- a/kde-apps/kcharselect/kcharselect-18.04.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit kde5
 
 DESCRIPTION="KDE character selection utility"
 HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
-https://utils.kde.org/projects/kcharselect"
-KEYWORDS="amd64 x86"
+https://utils.kde.org/projects/kcharselect/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index b7e3d6c26b9a..90b3e4b99d96 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
-DIST kcolorchooser-18.04.3.tar.xz 16888 BLAKE2B f39573acb38aeeb609cbfc42d5f8961436bd8aff62eb5b1d8316227cd68a88f30415ef8920016599e5ede291fd543a4af0c955a3dd594d97ed43a01a43296853 SHA512 3adbc920566089bc12e83507dfa25d7215a1811c8adac530a059bbcc5d35dabd8fc122143dd0a238a1e1d586fae18fdf32a24b4685ec044f1fee1c3060d0b667
 DIST kcolorchooser-18.08.3.tar.xz 16944 BLAKE2B 156e630ba735e43e274702c1fd8e3adaa598001b39331bb577dab17a9c3c553b38a0fbd3cd7733d65d3746a46c9907996d80c3907bca14fa4305265ec907911f SHA512 4985587ceb4714197a5948f54b879574b4747588ec18dfc14111d7eebaf179de7a87c03c78392164a53b950ea9a095a1b256e2cef035c5e5727048e32a2afd21
-EBUILD kcolorchooser-18.04.3.ebuild 455 BLAKE2B c2b3df4178abef5b4d8d821eb5a598a0d560eb800de0142ef3372189ad9a793d5da46140b669c0f79d4bcba19c9d9ebd78fd597966d12fd80dd3b0eee30529a9 SHA512 6a489f07659676ff90dde300a299efb31711f3eed39bfef10f68a8be4b12c9c2a23a0058dac542b1bbc758bb0161238174f6dd08ef2bd821d0c1b4ed90d09231
-EBUILD kcolorchooser-18.08.3.ebuild 454 BLAKE2B c93d2331c14558e92496ed8cf7891735a4d610b2c0883ca8ee2f8a2cc8d406c8c2ad21b68f4ede42206ad1037d521b4c4f5a295077d051a49901b5309ac9fe1c SHA512 07ffcaab57d4279f840ddc9e6e6ea5e6f8f51ce68a8ef02631e97cea267e853e830f5f4ea20a16efed536d822448b0c14a46f26f9fe0857098f5308c87435345
+DIST kcolorchooser-18.12.0.tar.xz 16944 BLAKE2B 7fc9f6f50b165947f19014f89d7ba64c277323246db4d38ae37515646ea493ac77036ed25856bb20a06496f1bc9debbbfeab78fd291a1df0428fb4226b051d72 SHA512 578ac3c74b1a19f294f2d97051d1f36265371feb3807f18a2d83808f4879f507d233a2cc51c95a325ef5261d2f25b10d518336197e4d0622919bf9afa9f42b8b
+EBUILD kcolorchooser-18.08.3.ebuild 452 BLAKE2B b62c80e530b90db1301c94f4252474e420c1a96f261078f294430dc7ac30cd56f6fd1f379e730f67e867c01a4560af4d8602483a8f912f2386b52b027e206b2b SHA512 f6efbf7b9402765536d268c92158ecf93503376add340cb1426a016afa1b94239c381fd21d1b77957141517d72c35dfa3c6693195684e2e6ae0c85e60b4ae3c9
+EBUILD kcolorchooser-18.12.0.ebuild 454 BLAKE2B c93d2331c14558e92496ed8cf7891735a4d610b2c0883ca8ee2f8a2cc8d406c8c2ad21b68f4ede42206ad1037d521b4c4f5a295077d051a49901b5309ac9fe1c SHA512 07ffcaab57d4279f840ddc9e6e6ea5e6f8f51ce68a8ef02631e97cea267e853e830f5f4ea20a16efed536d822448b0c14a46f26f9fe0857098f5308c87435345
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.08.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.08.3.ebuild
index 93c9a19c6587..c8a6d0d3b6c1 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-18.08.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE color selector/editor"
 HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.04.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.12.0.ebuild
index 5b16b202b023..93c9a19c6587 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-18.04.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE color selector/editor"
 HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 8f3e8d340094..3afacdbdc6ff 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,6 +1,5 @@
-AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
-DIST kcontacts-18.04.3.tar.xz 206936 BLAKE2B 00df6e8da4a3d70f7d630b8dd671c6214bca8ed7d938aafc2342dbba97337f077cb77bc9d0bab31a91b7b0b8dd9074f667846120e667a52bcb477ec6b29c20d0 SHA512 bf177c4cf0ecbdb71e75ee32a4e71599f864062524f5663e3c1d4b49a06d58a3abf7b18d2840cf7e70248a426fa6b6367375a2aaea211ba15a697e0dbd27953e
 DIST kcontacts-18.08.3.tar.xz 207328 BLAKE2B e39f313750ef9a21d8c85aaa1b21902151e6e21d542d0ccf26f9297e48e62885c27b77ab82f14dae66aaab1992a275e2fa389a93ce0fc64894eac8744a09590d SHA512 866c8d70e03985c346e1a4f8c6ba0114045e1650cb846b1a15ff44cfbe569de3107b9f6c75e2354d6bb5a08ce388ce78c0871e57ffcdb28ff246e69a5444aeb1
-EBUILD kcontacts-18.04.3.ebuild 889 BLAKE2B be58d2731e6ad0605817bbcf6e5786c03c7ffc5b49dd9d0e22967bb46d2f20d0d865737a8c0c0cd127201b50ea1d68414dc4c223c0162f74ea5d18da489b79ae SHA512 1d45d48805a52ee73219d1eb8b61dd66ef4f049fc02b25f4f3d63f79c32a6b1a9ddf037a296c28b86112ea2fe82fc95c1ef9f27f086286767c367e90c375fcdb
-EBUILD kcontacts-18.08.3.ebuild 830 BLAKE2B b93517236b74bbaf059523c2832aef00e01fab902924f54c59e233be03d009ce0c246ebc91a99512331923150f81e991252c4eabc42ae339537a3112864ed143 SHA512 0e3804067ffdcef4c78c9abdbcdfa9c8d67c0439398a7b40865aa76e32179411e45e77af8e112fb19e9bacd01e0840b13d07e7f392c405bfe761677201ea4ce6
+DIST kcontacts-18.12.0.tar.xz 603652 BLAKE2B 9786a81995912c2acb9184e6dc74c93fb75b52e54b493091c827a725089830bb69d1b633578d1b780157112a25db5b7e675296652dc0b96823b350541f496971 SHA512 be59dd2703bdbd42811ceba2059279d6f5ef47c839dffe72c722806ae87297caa5f5997c7600ef0a050cedda82bb31d7c5ddfed579b747aa0aa97e0929780e05
+EBUILD kcontacts-18.08.3.ebuild 739 BLAKE2B 930d3720029f351a741a9d9bbdd30a9a6ca27c8d31c92b6477b073db7c10d063950e6666b8725e56aab890064aa8a5572c2c14601b103872971c80757abe3468 SHA512 932e8b7297c0f6cf7de1bc1a9515438011722bdf2fdbe362df96c155c846692671453e7a5d36919e0ff20eca8cfbca1063df3ec8a17a14862cb4e2cecd6d01a5
+EBUILD kcontacts-18.12.0.ebuild 644 BLAKE2B 351a9dd762baac084abc109df9de93bf34fb4b427cd34bdd4f0e864f514e0ad49697f8f0fd5ba2659bf9a622ad5332bc1426bdb42e857b7124a514bfbb10fb16 SHA512 444d5df10c68824beca3ec9e842d14cc8c99ffbe6274f97fd210ada5d292fa91e4049a947318d7644cdb05f90b38c5368a0cda144d746b619a27b8ec69b5f9af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch b/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
deleted file mode 100644
index 2843c6d5422b..000000000000
--- a/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fc512cee665f1e2736a701c9960efce5c093bca3 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Sat, 14 Apr 2018 18:08:38 +0200
-Subject: Remove unused D-Bus dependency
-
-Summary: Makes this much easier to build on Android.
-
-Reviewers: #kde_pim, dvratil
-
-Reviewed By: #kde_pim, dvratil
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D12198
----
- CMakeLists.txt     | 2 +-
- src/CMakeLists.txt | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f47888b..87408d9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,7 +33,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KContacts
- )
- 
- ########### Find packages ###########
--find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS DBus Gui)
-+find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui)
- find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS CoreAddons I18n Config Codecs)
- 
- ########### Targets ###########
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 819e7fe..e1a2094 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -63,7 +63,6 @@ PUBLIC
-     KF5::CoreAddons
- PRIVATE
-     Qt5::Gui
--    Qt5::DBus
-     KF5::ConfigCore
-     KF5::I18n
-     KF5::Codecs # for the vcard parser
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/kcontacts/kcontacts-18.08.3.ebuild b/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
index 43629f6fffa5..7c758a9e8b61 100644
--- a/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Address book API based on KDE Frameworks"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
@@ -23,17 +23,12 @@ 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
+	# bug #566648 (access to /dev/dri/card0 denied)
+	local myctestargs=(
+		-E "(kcontacts-picturetest)"
+	)
 	kde5_src_test
 }
diff --git a/kde-apps/kcontacts/kcontacts-18.04.3.ebuild b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
index 3deea51389bc..4a670d9b6da3 100644
--- a/kde-apps/kcontacts/kcontacts-18.04.3.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Address book API based on KDE Frameworks"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -23,19 +23,10 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-PATCHES=( "${FILESDIR}/${PN}-18.04.0-unused-dep.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Fails test because access to /dev/dri/card0 is denied
-	sed -i \
-		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
-		autotests/CMakeLists.txt || die
-}
-
 src_test() {
-	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
-	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
 	kde5_src_test
 }
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 44a255cb6bdc..eae76d11a565 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
-DIST kcron-18.04.3.tar.xz 1056624 BLAKE2B 2d10df38eccaeac408313480527a40eaabfc1d6ae62122c00add9aa03e644cb1a7c15b8ded9bb7027198550b64e7d840ce274d89805ba123fec1b9f9ac79af07 SHA512 3d0b78135c026b64ac9e08f0e963a6c2e54c00d8039b73fc82c9c305eb1bb766bee4ee06b5cda5756a8e8a816c1d8999304c3295ff941f0ef532843d48699141
 DIST kcron-18.08.3.tar.xz 1056628 BLAKE2B 3aef5da9aad21e1974372484f58bbb0e874d796e95ecb93a3705708d89da041d9706e049fa30d999ce1cba8c8c0f92ddfd80e19ceacda513b2ecffd528087131 SHA512 64de22be2d7e64682c70129bdc6a3ec421cf883264cf87d0a8137e2c6d7faf4440a3b94f4b45ea8b347ddd3bdb5b56903d735a9220e82a99c58ff0b9222b37f5
-EBUILD kcron-18.04.3.ebuild 546 BLAKE2B de16dc20e75300dbe368a416d5c5af632e83da1e88fa2dccd81bcc7ee00184aac4a3bdb7cdbe992f12665d19b4bf24996a46ac6965252fbdf3e169ced32ca9a4 SHA512 b214603847e53d62d6463d75302485fa2d1107e8a0598272287cd5b0278af3703aa162cc85b19c950bb57808ccba627f8532334422a71efcacb79093050365df
-EBUILD kcron-18.08.3.ebuild 545 BLAKE2B a4569f45675ab967975da79a923940d64a7821a78679736db75cd438e4edfaf85e42144277a45238e3425e5c68e3242fd297f9dfd9a9f60ca21a8bca72fb267b SHA512 bdabc3813c719471c9b7247865f75bafe0fd727296dd337a3da2ae6eea3b1fffde0c92f294c83cb8b77abe8b613bd196893811583f87ee87b464e7b7d44889a4
+DIST kcron-18.12.0.tar.xz 1055804 BLAKE2B d7fc41a6a216445178f451b497f6473c3e73d60ffa79b8f3fb24d04745c40e80c531cb59f0e9f72511892cd570e3d64b1059951de975cac7fd5c2a4373116189 SHA512 d8fe6e1bb63062859c14b95563075ad0b51dff5586d5fa8d4a1102a37afbe1a316a3a2b5152ba6f7acb1406f9699413cae24a54a874e1ab805a0e2bbdcf027c8
+EBUILD kcron-18.08.3.ebuild 543 BLAKE2B 55be7d10ac65036a21bc051252c4487411274396fd78e586582f6180a27baf2df3b18a6adbec75938ad890e28892ffe3309e0c9119b0b0d0365cf8123e63d1fb SHA512 7a453e7435ee784f8e5ed66c2c89eb07fe13f9b44adf2f649d7b514209f4bc7e3c779be1f225075870d5cac755116a20fa942f5613f43b0b38b82feddfdfff79
+EBUILD kcron-18.12.0.ebuild 545 BLAKE2B a4569f45675ab967975da79a923940d64a7821a78679736db75cd438e4edfaf85e42144277a45238e3425e5c68e3242fd297f9dfd9a9f60ca21a8bca72fb267b SHA512 bdabc3813c719471c9b7247865f75bafe0fd727296dd337a3da2ae6eea3b1fffde0c92f294c83cb8b77abe8b613bd196893811583f87ee87b464e7b7d44889a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-18.08.3.ebuild b/kde-apps/kcron/kcron-18.08.3.ebuild
index d82373236177..24ab53ee28d6 100644
--- a/kde-apps/kcron/kcron-18.08.3.ebuild
+++ b/kde-apps/kcron/kcron-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/kcron-18.04.3.ebuild b/kde-apps/kcron/kcron-18.12.0.ebuild
index 7ca409d2892d..d82373236177 100644
--- a/kde-apps/kcron/kcron-18.04.3.ebuild
+++ b/kde-apps/kcron/kcron-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index a6d838963912..61a0d8618333 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
-DIST kdav-18.04.3.tar.xz 49040 BLAKE2B 2c26e92bc83120f194afa9442322d470302d236730c3d7f3d7ba5e3ba317d3de99cb77e250dd539f1c61d1d2fdf3903da7c6626b9a42eba7d850d648551be0a3 SHA512 5b593fd2345cb0d40dae7732d1e82b8eb84a29a3afe6f3fbddaf4269c2b58cffd5ed34690dae3fe92e59de9979129e567acc1cd41085bac14a42eee81b439363
 DIST kdav-18.08.3.tar.xz 49764 BLAKE2B 4b77a8346f854750d6fb3fb611c77bb15b953858db308e1020b077cda356d0027de8cf20eb63083e8e26611c70cbf8fd7b7d82807648143fb8630b223f328a46 SHA512 d5009f2b25038bca9037db6399906f9292d0eaf8ebd3491cabfbc7b3bc534e72068a51812ab8a75d2846c472daf25a002cbbc5e0e2bca042a4976ed99ecbc2ba
-EBUILD kdav-18.04.3.ebuild 682 BLAKE2B 430f8c8f9b66227c832ab9d7fb986d7c43c9a9f48cef6d93c621ce0b5dc99e2bb70ffd815c2be7710575e3a338229e126bdd8567a64870ae9b0bb22ad7233e7c SHA512 9b3d5ec01c7dc376023b492b032025c533f9c9d0b598ef56da26c4830b92f2dc3ccf9aab5bc5bc820356f8b75be96516ca5d935d3d339d4310eca4ca20c29c59
-EBUILD kdav-18.08.3.ebuild 681 BLAKE2B 412f7ebe776665f07d61f440a5ca4bad5e877c378c770adbea8a03b0edc43410dcbe42a8a4def6c56a818022d248f0b4ddd06a77719631201c1df4e246e5c88a SHA512 57e48496bee8813e5bb4d5757ada10d3886116f34839aaef7f8e30f66d334078d6a8aff1c8bc7a92a128b424e1644c2bb5cfbb3e8fd9ce80cd49c1e2194b0e98
+DIST kdav-18.12.0.tar.xz 49564 BLAKE2B 5a868f20dbc9d7efc2e8abd92c31baff0fb6d817fdb471a2ad248d298edeaa33fc394373fc1f5e908e56018d08574a2d122de5c3d613771d28094a8572faae90 SHA512 09e79087435dae4e6dfb0a69d0c3539490c5312252443d899088aabda10b7260b1a830a01ece81cebb6c16d7fbe1d05e9966d9d0037baa183e4ed1e4fa421c72
+EBUILD kdav-18.08.3.ebuild 679 BLAKE2B 48a5ea155f722eb467f0a7e15d31d0e9cbfee1defd06947fa7421dcd800a5812f4cd3e82f95d706040fc7d55234e307d95044b7db2fcd8ca47c909dbd5f67910 SHA512 bf44836f3113baa1498cb71aa08f728173ae5cd1b387d81402defeb8cf6981d69b964f30510dc5cf4c6a725566bbb56e1f60a7a1022a3f48895988ab1af40f25
+EBUILD kdav-18.12.0.ebuild 681 BLAKE2B 412f7ebe776665f07d61f440a5ca4bad5e877c378c770adbea8a03b0edc43410dcbe42a8a4def6c56a818022d248f0b4ddd06a77719631201c1df4e246e5c88a SHA512 57e48496bee8813e5bb4d5757ada10d3886116f34839aaef7f8e30f66d334078d6a8aff1c8bc7a92a128b424e1644c2bb5cfbb3e8fd9ce80cd49c1e2194b0e98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-18.08.3.ebuild b/kde-apps/kdav/kdav-18.08.3.ebuild
index b886c0149146..121eca1b1d7f 100644
--- a/kde-apps/kdav/kdav-18.08.3.ebuild
+++ b/kde-apps/kdav/kdav-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="DAV protocol implemention with KJobs"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdav/kdav-18.04.3.ebuild b/kde-apps/kdav/kdav-18.12.0.ebuild
index f68c6247aff2..b886c0149146 100644
--- a/kde-apps/kdav/kdav-18.04.3.ebuild
+++ b/kde-apps/kdav/kdav-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="DAV protocol implemention with KJobs"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 9d6258216ca0..813b4d72d7e9 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kde-apps-meta-18.04.3.ebuild 712 BLAKE2B eb22f68f34234dac478d2c68faf184e3d15c1628a2375e8f0195f390559d76372e2af8f71e11bc706ba32232444ddbf71f7dff07a5feb4d80a99a143ba0b41a6 SHA512 68230fba9f71b944ae1f6f5751c56b7d86e9be217a7cff4dc0e35d2f7190d6ead515322f0f4643441f6b46cc3ef06e588869bfe61ea93db7e7a6b8d83a2b1c20
-EBUILD kde-apps-meta-18.08.3.ebuild 711 BLAKE2B 87174c54abfa4e40dcf86d36d8b683b0cb8f0effe2d5e2c578945bc6f77950f5eff99be15ca55e85c4271848edd296a07683c0d2fb7daaf3ed5efc6482d37fa4 SHA512 9ea08ae026782bd5519522c99e1f1c5eba37ecb2d9c8e99d4ca8341eb99b3b2baaabd219634792070cbe05ffe9ecc37133d4c7599a80b6a4558a12f8b7c0cf08
+EBUILD kde-apps-meta-18.08.3.ebuild 709 BLAKE2B 1479cd6085b435c85683b022e9c9f4760e635022fcd34289392247f856193522f792486aedee63dd9bb4a8ee1d7654edcfab9752dd687c7df12f6ed20a29b94c SHA512 0315e479503f14e2a223aa78ca3d19d2d4dd5bb764cf0a68a3bfd247bcbbc081889b285f306d861a8f0eec7d0aeb5087cf4a82eb1492bedb5ebb1849346a9cb7
+EBUILD kde-apps-meta-18.12.0.ebuild 793 BLAKE2B e1549d6042c9ff4b9849026eacd3d14277b104688032dfecb7f120b6e3ba23205ccb49abaaa4c9e68b0033c115f11e6b4db3e831cf1561fd702c9d6ad0bb79f2 SHA512 2f5d4f93e93878e683b6254b6d8be1f8e5ef3dd4822c889d5bf044c4f3d9e8658b9d9d9277cc9733ba05b53f078397453183db48b7c96f72c3af82f6c5544cb5
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.3.ebuild
deleted file mode 100644
index 89bd145c9f6d..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="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-18.08.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.08.3.ebuild
index 5d8ad60cd02b..e76042074828 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.08.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Meta package for the KDE Applications collection"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="accessibility pim sdk"
 
 RDEPEND="
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..bd13687b358d
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package for the KDE Applications collection"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="accessibility pim sdk"
+
+RDEPEND="
+	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
+	>=kde-apps/kdegames-meta-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
+	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
+	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
+	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 6eee91ff77e5..46f279a181dd 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-scripts-18.04.3.tar.xz 377672 BLAKE2B 462e59e9782cb82719354fdfe1133a68aee6b9ae27661eb55fca1b36409b313057c8efc64b6dfe73bd2cfb670990b9abd61cf6d327d4883519a4bca0c1c629fa SHA512 270afbe47f0f03f37acf23046ed1d1c09d25a7b12d8704fab27e5f1c181d42e1609dcb257a28fa55813b1f8ad7196afe67523a188a057bc2e98a080f10b5299c
 DIST kde-dev-scripts-18.08.3.tar.xz 377700 BLAKE2B 39c70d2fbf9d6a5812fe6d866ba57acc029f260a530ed36c3733e83209059df0f48fb335c515b886a4cb50ee3c2e72ecea74ec90ab7a9003d3d3e37a39116f47 SHA512 7929966632626943ff5b6629d4b7a334e6ddbe39679c09ee3fe617788a42e00b79624efaafcdc37eb6a0e324af13b2aafb21b5ba7d161182be1a724e553b233b
-EBUILD kde-dev-scripts-18.04.3.ebuild 578 BLAKE2B 9449129c76d4f80488dfebf4536e575c1b29770ab5605ad2f271a0798eed4749f3f773754d881ea4c5234a53eb9f0d5c373696d8b30c2d7a92bcef70c6bcefed SHA512 a7caeff730912bb7805c61987203e5f2fae1b7c994a16271d9bcad01ae741b3579d092309c6a25e334c1801a16711cf4b9e0cf24f40d6039e6e2522e6c39d836
-EBUILD kde-dev-scripts-18.08.3.ebuild 577 BLAKE2B be41f93da1f0ffc31d1601e73b1373ecb53e8efe456554a94fb589c65562c7d1aeb4fe741ea34c3acca034637934212432fafd923d98038a5fc2cca8b9a0fa00 SHA512 987f8607fe745bac9d20d464b70750d9c9e7499be3728fea6f9c78768a79f4334873dbc08916f400b5c48753bd39726ce9f67c4bfabc454a2ef70db5d7477a6f
+DIST kde-dev-scripts-18.12.0.tar.xz 378220 BLAKE2B 86160511b519f25b615e4368cc3a8fa92e62a07635cee64421b54124b592539aba0f6dea081bd9d8905190e3aee94e013320b3901a2994b500b3e6c33d556e17 SHA512 2c4d0cb9b1c1d8b11c941fbf0b863bf33f89f5c05f9c8e7133f280d63d8971912cefd9e9a7edfcfdf059f9a2e3f1340e3324508cd1fde717fb6c4b8813b8f997
+EBUILD kde-dev-scripts-18.08.3.ebuild 575 BLAKE2B b759de104e595947ba21959be3ff83e18a2e19391eb8d3ae153f9ee1e8e778c947585eb32d29aaa99c117d59f2ebdc8bab871a533131b7724cae8e5a5ba0f61c SHA512 fea537b77ad328330276600520f832fca562015a7808e7ead6558ee39d8d393bbbfcf55e6ec3853fe32aca66a872f38e7835b6fc4a716450962b98f0a82e0267
+EBUILD kde-dev-scripts-18.12.0.ebuild 577 BLAKE2B be41f93da1f0ffc31d1601e73b1373ecb53e8efe456554a94fb589c65562c7d1aeb4fe741ea34c3acca034637934212432fafd923d98038a5fc2cca8b9a0fa00 SHA512 987f8607fe745bac9d20d464b70750d9c9e7499be3728fea6f9c78768a79f4334873dbc08916f400b5c48753bd39726ce9f67c4bfabc454a2ef70db5d7477a6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.3.ebuild
index 695a6b13ea52..0bf850e9ca46 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="KDE Development Scripts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.0.ebuild
index 79fb8d781153..695a6b13ea52 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="KDE Development Scripts"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 59de2117a008..7e6182d96045 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,6 +1,5 @@
-AUX kde-dev-utils-18.04.3-ki18n-5.48.patch 826 BLAKE2B 7b1bd3b9c427603070592e795b6df82d9ff015c717909c3b464844a4ac14ed6ef42e7865e9113240a95ff56cc6534a554f71e4ad98bdfaac8e094e81a1893b77 SHA512 d5c3206f47a8b94d3bb11bfca15613c3a2d7681c46bea68bda00529cda5ed16ba4dcb6648726459c18a980832c765e6728481e7e8403e89aca4d84ef7cbcb36b
-DIST kde-dev-utils-18.04.3.tar.xz 61300 BLAKE2B 4c5ca2a6e813146390eb65f6a4e78adf9d70873e8b97458a99786aef1892ba86864280f8e9f4db9b68b28ac17f4297362f85f96eae92294b9835094f069e7bc3 SHA512 585c9d4e7bc426fb758bd352eb1e34091bca3051fd7cd2b29f79f05bacee8804d4a794dab1d4e2329dfc3379b01fb449f406589e4010e1f2d1d065c201f81646
 DIST kde-dev-utils-18.08.3.tar.xz 61472 BLAKE2B 710100def59e037e4002db2ddbabb94c85194d5a97a578521c2484d0c75c69fda760bd76b32346ce8a0aed0c373c123c0f7d2388a5ea21dd3bfab4f26fbdde13 SHA512 1f1d9da9709b860a0559943d6b9d003d0ab32062c77cc9d61866baaedb3d6c342b8aa8bfcfe0327407aa34bf275d6782751db8f4cb03b83f9ccf756ebce2ab01
-EBUILD kde-dev-utils-18.04.3.ebuild 695 BLAKE2B c8f18f9772edfeeb0c431ccf00e5db163d0d28d9918696be1ab798f857f42685f18646a81b262b2ff963d146beb83b3065a449c72f55bbf1366a49dbd9404f8a SHA512 c86372cda9db57d9df3c4fb2ae8f3987b330f781e195d5eefe7f44e528eb031db2783af2e33913258dabaa339185638349d9533e585b9f6d58abfac24a3c9542
-EBUILD kde-dev-utils-18.08.3.ebuild 645 BLAKE2B a2b68f68cd1e19f0ce8f8428ebd1e0a918c4559989ca4c6b4b719951ea857061a02c0b452824b6e74248608bcabf83c02eb71a65b98b3b4533752462f8b5268e SHA512 195411898a486328f7aa1d23366b6df62b6676dec27241e84cdbccbe1428bdebd8e9850c8de893ef719c6dbdb8aa5cd6a45c0acac705ee75443a681ef1cb902f
+DIST kde-dev-utils-18.12.0.tar.xz 61100 BLAKE2B a8f31b43cb54e5299c50f6f3ec711593f7e9923a0e293717308869b4ed5ef8a10a627ee56f5f66d2c037b6e5621ac6a635082e7d8f7bb328b5d26a49ccb458d6 SHA512 9a4f7c196cd8fe3bff6577408deac8da928296c6ac9ca11598f10be2163bbed45272da522d52f964590de37b4dcd5384e2abb27153bbd216f986d69351807cf5
+EBUILD kde-dev-utils-18.08.3.ebuild 643 BLAKE2B f1993c7db9eff55e52b92004ebc92b1675d3f1d372be5dd3ae65fc7f694e52d611e58997d3bdc5c23e8e5b4448d29cade8122e65c8c6316957babfbf0e4a4e40 SHA512 a83be97a4ed3122867d5081575fc57ce3f48ba5c517ba2c0ee14179d500382c8414e3011258a478c8d5795838f02150859ed1475d77baddd876c3691207120c1
+EBUILD kde-dev-utils-18.12.0.ebuild 612 BLAKE2B 4eedc8a4c43a06f286118c15f0734cefeb5e75be57051eae72dd64ec060befa57c008f12adae4b22b37be9d07f49db8cb577676e055f4e779dff18f95a071599 SHA512 6f1f465ec2998a0ae2436b8e960b31c0602b74ae3524171c6efd67205064800386e8285f6bd2617b29ed5aaa68d4383329f153a99fa45e3c537ab1307ef81a7b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch b/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
deleted file mode 100644
index 3713839d32de..000000000000
--- a/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,5 +10,8 @@
- include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMQtDeclareLoggingCategory)
- 
-+# Required for ki18n_install(po) added on tarball generation
-+find_package(KF5 REQUIRED COMPONENTS I18n)
-+
- add_subdirectory(kpartloader)
- add_subdirectory(kuiviewer)
-diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
---- a/kpartloader/CMakeLists.txt
-+++ b/kpartloader/CMakeLists.txt
-@@ -11,7 +11,6 @@
- find_package(KF5 REQUIRED
-     COMPONENTS
-     CoreAddons
--    I18n
-     Parts
-     WidgetsAddons
- )
-diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
---- a/kuiviewer/CMakeLists.txt
-+++ b/kuiviewer/CMakeLists.txt
-@@ -15,7 +15,6 @@
-     COMPONENTS
-     CoreAddons
-     KIO
--    I18n
-     Parts
- )
- 
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.08.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.08.3.ebuild
index 7f9d6120b84f..7d72866a7916 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.08.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KDE Development Utilities"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.12.0.ebuild
index b51e8a1cc0e7..688491146e06 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,10 +7,10 @@ inherit kde5
 
 DESCRIPTION="KDE Development Utilities"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -24,8 +24,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-ki18n-5.48.patch" )
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index af50497af54b..2a86f07d80e0 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kde-meta-18.04.3.ebuild 323 BLAKE2B 50ad12fb1fa077e45f7d87d15d01ab510e6d41ee4d7686830906784c17fc9b742f75d591f37b6e9271b9de3b79b6d463d1837c0ffb059a1b5612997be88e1e55 SHA512 af6bd77fdcabbe77fd664a4da5cde15c790b1b3459dd04aa747b612f12a6953d2030a9c8a0143f3699d1a029b1b463c54be0b61c5b9268a5735dd3a6ce35e885
-EBUILD kde-meta-18.08.3.ebuild 322 BLAKE2B 8d2dfceb0082510fcad0c4f7005f36e28cddddb563ae660d1b4ab7e7ffbcebc4f4634435277584e3f229fd33f2cb81a1a8dad441e1078b1c58e8a51627d28aa5 SHA512 670dd6a417aa9a80120bcf3a2a0f7ccb211fa1ba2054025722bbba4eb0e68423965c8b019d199a0dcc1ee93545f6207e446a40007dc18c5b8ed322aaaf057e17
+EBUILD kde-meta-18.08.3.ebuild 320 BLAKE2B 14f6ffdfca577766a52cd8564867009a5c4edd7d954fe4e9fcd026145882fe46d1e6041d65a373b57f61ce1482a452940aac6d716e0c00ba82d54b06b3fec8ba SHA512 de5b9eb9e8b777f83def25209468cbd9cee78af7f1ce132056af221ad4a3098c6159303700245a80183f172b936450f82d1f6ed1aacede3293080c821c29c54c
+EBUILD kde-meta-18.12.0.ebuild 364 BLAKE2B 8cec8bb8c1cf3199caf4974b2692f053e195e5b81077593be04901dad00c1ec4f92f3bfeb7979b437ebade3ea59bfa2b8df15ea40560521265e501122558a778 SHA512 b7e6262f143e527f77cfb867a8b8c0f3397d34d924b6d73beae836f42480cfc96ca465cebbae62aac3d0fe7b9ed543eb817f6f08473ebaa59110c3a3c1a979c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-18.04.3.ebuild b/kde-apps/kde-meta/kde-meta-18.04.3.ebuild
deleted file mode 100644
index 39ec36b68982..000000000000
--- a/kde-apps/kde-meta/kde-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="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-18.08.3.ebuild b/kde-apps/kde-meta/kde-meta-18.08.3.ebuild
index f819f9b194dc..1f799df507a4 100644
--- a/kde-apps/kde-meta/kde-meta-18.08.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kde-meta/kde-meta-18.12.0.ebuild b/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..977c8ae36a36
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta:5
+"
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index ccb941bc6bb6..2302a598caa0 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeaccessibility-meta-18.04.3.ebuild 356 BLAKE2B 670b57674d38cd325e3116e6cfb1634827f67526a7a7d43045a4477db227199dff1d21740b19a386a295bdefada351b1320ee969a9ead23bf7431a25f7c6ee9d SHA512 8813797ed8f108a321eddc24c98f2e73834c1aedb4cdfd826b0fc30e66edcb5f55b468b840448be613669777d7223333d22c34d755b44ae31d4a5096099922a4
-EBUILD kdeaccessibility-meta-18.08.3.ebuild 355 BLAKE2B 5793feb42d2cb002de4174fc33bbf2dfda111401a4c4447003d5a941f77066ec410c19cd9d59371f86c77a0457c618e0c6f95c9a2deb03dd1dae359b98f8c914 SHA512 80d39f5813108ade4ebdfb9a09d1177afd77f986d362e6e6c62784eccf5cd05becc7311f560cbaa542ff2b8f80a7fb716f74edbcf7b3e8c363f916d675375dd1
+EBUILD kdeaccessibility-meta-18.08.3.ebuild 353 BLAKE2B 3341b9a02375644c15e5c7d6b241527d0452071c121e1adf834782c8efce9c6acd83379ce3b5885a3a9307f1e9f0e2d1ee6ea8911a2d99091c0aa441b74b3f89 SHA512 e7a4df768d9a6d702d665f1d64260bbd2b9b19f8c7038de3678fe1fc404ebd0d6eeb26c874f9137ce4e39205c02930da41872de14914b36a4cfefbd32b0ffd3f
+EBUILD kdeaccessibility-meta-18.12.0.ebuild 414 BLAKE2B bf1e9279eeb78861c326c583ebd6996444b57eb2a69c588299f3b68f1db01b1b55ae489ad3ebf6b850d4a6153c0905074beb8efb47ec8e44678c211faefc1dd6 SHA512 8156d6cd6404105bd1d9e2a828b8dec6515564af2a11031458307b8905e709a0b6ec9309b6a7b9e28bbb8bba86c2c09957e192e255c6c5dcc18b3c4ea6fd24ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.3.ebuild
deleted file mode 100644
index ef9e5012866f..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-18.08.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.3.ebuild
index 8c927204963e..e6d5ba2c8bf2 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..ff81519fdc07
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kmag-${PV}:${SLOT}
+	>=kde-apps/kmousetool-${PV}:${SLOT}
+	>=kde-apps/kmouth-${PV}:${SLOT}
+"
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 4a2fe592ee99..12e226ac4111 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeadmin-meta-18.04.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
-EBUILD kdeadmin-meta-18.08.3.ebuild 345 BLAKE2B 5205566bc5f8a6afa98710d9d5ac1cefe8724535420908af0e1e971c46af3ced38c388b1e1d9bb00a1d97fc777a40f2e05aa8c66bb11fd18315b05c5a4868be1 SHA512 e934c11312db226c00831142e4ffbbc21f81c5bc53cb2cc63c0396c2c2f2d4c5686d48c54c6adf057613aef9c395c205bb2f655f9d69e50e1757d0cc55e883ac
+EBUILD kdeadmin-meta-18.08.3.ebuild 343 BLAKE2B 9c4d5bb6cbede83503129d6952208202dec0442faacb1a5591649abb5dc87c94f428866536254b1db1cca63567b94b310056540d988242994d1b569407bcdb7b SHA512 be7d8cc3841a14b7df8d163769261f84f0f45401b3df486fb5246c4dc28ac1d09ebfc2b6de33077d3ca3bd61bcb4e623a0a153c03ecc55e614f307f005fa1615
+EBUILD kdeadmin-meta-18.12.0.ebuild 398 BLAKE2B a602697838f6eab447eb3770088c16fd72982db4b8dadf7de5fc78fcc2f15869851df64337efdf772d887c50c1dfb950392e92946da7daadf8fc440e5998360d SHA512 9c31cc676c90e1a0ba6d49ff16011945148c2b0baa1fc0f015e3c04d282b9e175abcd9aed309eb3d308165b3d38a969fcc7fee9c991dabbc12f3ae676e637f80
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild
deleted file mode 100644
index 6ea3535889ad..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE 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-18.08.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild
index 0c2139b095f6..b6316938d249 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..cbdb7d370e0f
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cron"
+
+RDEPEND="
+	>=kde-apps/ksystemlog-${PV}:${SLOT}
+	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index c045170107d8..d87d7adfbb44 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdebase-meta-18.04.3.ebuild 327 BLAKE2B 279c2650f074343a4ee5c30c3fb2cf145c4e017c0127f4c7e2ffe7046169b565addbb5fc14e7538b38e96a6871d5846b24ae98d0d3cdf153b649d684fb3a30f7 SHA512 c8fbb53ffa1784e26082357b04e3ac25a0a7a93dc490bcdb4e618181a53d545fb7093877b1086933ca0a9a8e3da40f23d1c7c587e793804ef3f23fdbd1367de1
-EBUILD kdebase-meta-18.08.3.ebuild 326 BLAKE2B cbf66a1acadac919d8679b19f9033a3b955fceec900dbfc0d964835bf823e649659025040ca781e16d333e746470a764333d4b1dea00d9dd56f6bfb0b4d4b51e SHA512 e98ac5ec608a85e73cb3b67927dfa29d00149d48e948846baae8d9e705ee9f285f81502bae0c150689a77dee10fe5562ab33d70c6ce1e6689dd5bf7b5dea956d
+EBUILD kdebase-meta-18.08.3.ebuild 324 BLAKE2B e8df3bfd386b952707790050c2a387d1d77481eca3a1ac071b27d1190a681305f4f0ca75dbce48cdce5ebb2074b92039e02756fd53b87ac3dc620235b19a5697 SHA512 fd454d88d42876d2138beae20eadcd18091243e61aba908f2ed0dd02aa210ebabf95cb37f3158b3f5f3330b938ead871d6d827e05c335ea2218b9a04e0badf6e
+EBUILD kdebase-meta-18.12.0.ebuild 366 BLAKE2B 9d4a2948785e56a0494dabdead3017573342f302699b39e2f259eadf1350668187674435110a68468633d2cd8d3745d9e8e8a1506f705b015bbff8725db5c593 SHA512 3ac9d92b26ce4c0226cd994e2ecf9e0c73cbe6117acf7c6ed3778c213b65049392b4e8fe43b85b9f560111b2e1c4f715266b1143460c4b942a933a38e689db5e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.04.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.04.3.ebuild
deleted file mode 100644
index 7cb3672400ef..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="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-18.08.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.08.3.ebuild
index 07a1b900d353..f7acc0cff844 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-18.08.3.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..2d1a6df395ba
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index f620245bc7c3..95278c979a83 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
-DIST kdebugsettings-18.04.3.tar.xz 51832 BLAKE2B 58254c1a12262674e5d2ead5deb414a8060fe19c68dc004d704d72ec57de5f48e91bd878ce7fa827e251eeb768767c615f5b956454a6a98bf7ddf6dceda2fe18 SHA512 582dde5bff461355ba5a2d2173e5a94b129cfa9fd3db6bd70471f1b8f92a0d03df45231c9b69c8c9eec78865b2e45283a3ffb00f2dfd41c88e57003730430023
 DIST kdebugsettings-18.08.3.tar.xz 52540 BLAKE2B 111532e80686159c9543fc8572e3a2e6fc7e561794da5a1aa9957991863743b2339c0f3a27848b5504f28d7102bb179610224f41c1fba713343f2697093d95e0 SHA512 40802fe99cf2ce8d4306a1b1caec34f710ccd337b729d0e0fd665d10591f3b330cf9f3b55ec32adb4f94ba6ee470cca1194e6cb19cd0ca4d4ab3cf1476852976
-EBUILD kdebugsettings-18.04.3.ebuild 595 BLAKE2B 23e604f648131c3c51d620b8133a1494c1466ff0883ce2037b10fdf402f819e2a7f0b0ee236fb2cd0fdfafb47fe9e6f6bc6eb4d96004d4e7eb63a7fad3ef7d04 SHA512 7facddf48cd39adc8910819bac603a5f2ff784a110364affef27c3c0b8944c36ca2ebea2b89de6a96e7736dd494eaf6a3bea9bba43aa0de063d04547ae8e39f0
-EBUILD kdebugsettings-18.08.3.ebuild 594 BLAKE2B 420578dc0af5e55c7d2882ea6e3024542aaca5fcb0871d4cf6201e2046534d56ec399e34261c86479cc9cbfdbb6f1ac2f36c7db271bde38f8e5b78dc4cff1c1b SHA512 974b4f36fb6c0ece0f5777bd8d6a247c1c99eaaf8c5a8b55e4679a4fd1d790544a172aed40fd233c16e71cfebf9d5443a864ee90c77318f8ff769354da35dabf
+DIST kdebugsettings-18.12.0.tar.xz 55024 BLAKE2B 66b47def43fe90f93f06b62275599f4d01b42c65a755dde5190af316e7268cab0dbaab3507ac10ef2ee7246dd38c8585e15bd06636163f6ae71163824b763edf SHA512 41085f3037c09b91e06aca4e2f6f05980c01e8351f7817520a87de41c12ec44671293cf18a4c63ace57d7a1a3ef7fad438cf3cff365c6847d2bf94a157a5868d
+EBUILD kdebugsettings-18.08.3.ebuild 592 BLAKE2B 0cbe811df31f64ee6f41f8ca7663c46b62f4f664e3b053ba0059e31d67ed892e6140ccc39429cef969f71a6d7f0afc496944dc939af5b51383adece320c11b68 SHA512 f20c9308bf08b916289dcfd195de0ab62bf5974a8b0f1fd11ff4bcb89ac64e21d420c062622c4b3dc146fc15031ed3af0abe2f40d369978f3cff7a79d1dbe963
+EBUILD kdebugsettings-18.12.0.ebuild 594 BLAKE2B 420578dc0af5e55c7d2882ea6e3024542aaca5fcb0871d4cf6201e2046534d56ec399e34261c86479cc9cbfdbb6f1ac2f36c7db271bde38f8e5b78dc4cff1c1b SHA512 974b4f36fb6c0ece0f5777bd8d6a247c1c99eaaf8c5a8b55e4679a4fd1d790544a172aed40fd233c16e71cfebf9d5443a864ee90c77318f8ff769354da35dabf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.08.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.08.3.ebuild
index 8e09d0982935..7e4b3474e159 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-18.08.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.08.3.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.04.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.12.0.ebuild
index 74b2fa4674a0..8e09d0982935 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-18.04.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index fd55ebf57c44..a6e6060315ee 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-18.04.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
-EBUILD kdecore-meta-18.08.3.ebuild 541 BLAKE2B 1e1dcccc525dc571747f6c51fd5c215c8d9db1adaf1a21faf62a74f3c6a967a4362d001f22c549ca7a46221db9a6bb4264f4459a46653a436bb3b5c1207e3939 SHA512 e3b9b0d3d7df1a7d78617e11c3b67ee88fa2bc6daa40c249e61f15b5a04a466806e552b34e894c59842113dc6baad1d006f8408cfdf6437318caad232af03fe2
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdecore-meta-18.08.3-r1.ebuild 614 BLAKE2B f4f08be0d86f2373771f2298ad8d2425ae18da26d481c4c83f31f8c7df6e15d99595866eb02d07cf1424019a1bf0eacf2bb0a06a740a276de9bdccd88a707c93 SHA512 b4eb2309283655dba67e3842256260abf0778d8c0f283e38d015a5af693fee41d60f404dc9f797c04635bc54c27fbc3883c61316ef07f879bcbfec666bc05518
+EBUILD kdecore-meta-18.12.0.ebuild 704 BLAKE2B 7e4f3d5d2ed1c7f7b7e284ed90061927f05c7b1f0ba98abfa68472a56912697fa8d0c2c9eb8fc5c0923b353b7456a6d299ecba5eefe3da6256b101421cb9c6de SHA512 d518bab2b00e6677a8650997759175e8b99473ba28031c808740d2b4d11dfde1e17c18ae0586240c5d6304d58c54ad169908d12728aa2335342c887453be22a7
+MISC metadata.xml 379 BLAKE2B 2a24219261d6d38e3bd4b1587306924e5e313cb4e1670f9067ae32cc2a139f04d1b8c1e626580723d01e0c75b98304fa48eb1930792e9d68d0b28a65a05bc9d3 SHA512 bf09bd560e358d4a279b8b4c3f8e937bd683778c60cd0af445168fd5bf6a4ba571b42e9efd3d202a0e2da11c5e481583ff55e67881cc12945da3a5f35f1985a6
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild
deleted file mode 100644
index 71c701acb64f..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="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/falkon
-		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-18.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.08.3-r1.ebuild
index 94065acab4a2..e40f6e06852d 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-18.08.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.08.3-r1.ebuild
@@ -6,19 +6,20 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="~amd64 ~x86"
-IUSE="+handbook"
+KEYWORDS="amd64 x86"
+IUSE="+handbook +webengine webkit"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
 	$(add_kdeapps_dep kfind)
-	|| (
-		www-client/falkon
-		$(add_kdeapps_dep konqueror)
-	)
 	$(add_kdeapps_dep konsole)
 	$(add_kdeapps_dep kwrite)
 	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	webengine? ( www-client/falkon )
+	webkit? (
+		$(add_kdeapps_dep konqueror 'webengine?')
+		kde-misc/kwebkitpart:5
+	)
 "
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..1a31e8c41e72
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+handbook +webengine webkit"
+
+RDEPEND="
+	>=kde-apps/dolphin-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/keditbookmarks-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
+	>=kde-apps/konsole-${PV}:${SLOT}
+	>=kde-apps/kwrite-${PV}:${SLOT}
+	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
+	webengine? ( www-client/falkon )
+	webkit? (
+		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
+		kde-misc/kwebkitpart:5
+	)
+"
diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index 2fdbf33d963d..8a440f7049ca 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 120e39301e74..805ac0013456 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
-DIST kdeedu-data-18.04.3.tar.xz 327812 BLAKE2B 7bec203b7f40c6909291a3c31f72b768e46b32a9678106cadfb24c7872670d886c46a85a21c6dc071c009e688012235872c01db9a46d9cfff9c299cbb2763648 SHA512 aec7224798e47c257fd4411a6432689a9a583262a32f875895c6205a276c8af3aa2ee5d57ffcb0b725334a3cef3982d85ad2c61d4b62e6b2f211a7cdfffeda26
 DIST kdeedu-data-18.08.3.tar.xz 327688 BLAKE2B 9cc6961bbf7e6fdf78142d950b83a90945b55b9a9bd278f66160030c1c02ca026a50e69bf92ada72e5320d4bc6b47430e10e39a00a936b3524c028628e1656c0 SHA512 9e527a15f062cd5f6107c883391c810a02bf3576894a2aeaf9e3d4ba97168ec0b9a5c2411144a94cd0c746e66c6b04485a667730591291cad6d8ea8160cbd183
-EBUILD kdeedu-data-18.04.3.ebuild 410 BLAKE2B eaa18f5506043dd8df271fed9fbb0745270caf4ab9ca37dddaea6bfd86febe3145e9eda889a1869c0dbb25c276262c81bf4f2f4a7da457a14cc78af7bbda98e7 SHA512 8f1472dc7549a96e75b1d2de05bc4c72c9b908c41c8a7a7fb5decf85b62366914551db39eac1414c2e18c69f134f8067ff086e2d00f47138c2b19877e3656f09
-EBUILD kdeedu-data-18.08.3.ebuild 409 BLAKE2B 5ca5853bdc7679fc4e31c3e41ee167e17318aab469a331a5dec685f1d66eaece62214df957035267d63c86f1b7a60bbeefee29811ab34be297fc292edc65921a SHA512 cb85ca0e6f84911f0cfad089dacaeb6cd193c68f54bc6a0c3709acf47bd52b1ecd01b87faf5154a075a3df6005832bfbb8cedb204b7530a45ffa5fd0c566e2e6
+DIST kdeedu-data-18.12.0.tar.xz 327856 BLAKE2B 148858b93decc270a2ec42749d1badef9bd7c5a3384c142745b941fc65a07ba8f0fe21461b89dbf8600625bdcfdadd74beb7d4cfcdf5ce878420d97852ef4a55 SHA512 7872d422ada152623e69094cc37d8eaa3efe2106e07b842fd21030f63f7b825088ddcb69e7742283bf55c1412bac6931a5b941d24945fa4b46ddbfd27055276e
+EBUILD kdeedu-data-18.08.3.ebuild 407 BLAKE2B 3f76adf816ac3d858155d1bf2be939baab3d699484032c73f4b5b0aa9c816e003ee3aa6c70cdb340a4cdab10458486b1768b08551ae868617db0d2b12ffac240 SHA512 7af7decb3650a2e0b06724b29640a3ed36cdb1a289ef16857f8bcb62b443366b2c934b6c53c02bfea823a4ea48e37035e62a241576f5c70b423f6eee0a81ece3
+EBUILD kdeedu-data-18.12.0.ebuild 409 BLAKE2B 5ca5853bdc7679fc4e31c3e41ee167e17318aab469a331a5dec685f1d66eaece62214df957035267d63c86f1b7a60bbeefee29811ab34be297fc292edc65921a SHA512 cb85ca0e6f84911f0cfad089dacaeb6cd193c68f54bc6a0c3709acf47bd52b1ecd01b87faf5154a075a3df6005832bfbb8cedb204b7530a45ffa5fd0c566e2e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.08.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.08.3.ebuild
index 1e7c7461e834..9961cfb96abb 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-18.08.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.04.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.12.0.ebuild
index 26f0de9b64df..1e7c7461e834 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-18.04.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 4adcc07f003f..63dbeb6899fe 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeedu-meta-18.04.3.ebuild 1044 BLAKE2B 1d20c11f4dbb093f4822dc84c36baba673e4f215dc770d8414654c6298f90d18f8082f4f51865cadc129a3d1d472ba70e64ade7985a28c256984944bdff564c1 SHA512 bc2217d651699fe4306cd9a30eaaaab0cf59a60cfd2da06e4e0494910b54fe520fca5e7141b0a5d325f770a6699cf8b7a3331ce29a967ebce43f17d1ca1926f1
-EBUILD kdeedu-meta-18.08.3.ebuild 1063 BLAKE2B b44447e639ebd4dd13a8a54090dc16dc1684bfca8ae8eae1186e642085a5ad13e64b08001fb14c8e48787217d95426eced4c1dd3afeb7a30ec08d58216017eea SHA512 dc5306cb7b3370abe8d2d1e2d36f1d037582c3451826ff078cef542074dba84119bccb5018a9df452b2f22c6da1ec53b9df717a754a19e68a0ff0c1012010801
+EBUILD kdeedu-meta-18.08.3.ebuild 1061 BLAKE2B 5cb235a62ba467633ffe9f60ae71bfec2f725b18bb7e1715c287b1f64fcdbfacbc2561eabbd308d526be4035248011013c5d2595278fa090d5692a2add2901df SHA512 350d485e3ce1ac5f4321a7a660aedd7e3d13c1591b5fcede5bf5021e2cc6cc4bc8a3aa40e62ca91627fe9a27e711714552fe9e1717ed9800c7aa2e67bf2eab9f
+EBUILD kdeedu-meta-18.12.0.ebuild 1222 BLAKE2B 66fc65f472178d1c193defb18c16bb455697ed67d2f4a61fcb7bc251461b0dd8185dcddf4cb94212a11139fbc83da98ce7b5c015305d3cd5e607b65517315913 SHA512 044e9fc21c312e168e82400aca614e56a316fc1f40825b10b465a9bd292aacbe5a29a80cbc9edf703bd84453ab0ab54089911c453f82daa8838c4defdc7ec0ad
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild
deleted file mode 100644
index bf36c2eb3623..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-KEYWORDS="amd64 x86"
-IUSE="+webengine"
-
-RDEPEND="
-	$(add_kdeapps_dep analitza)
-	$(add_kdeapps_dep artikulate)
-	$(add_kdeapps_dep blinken)
-	$(add_kdeapps_dep cantor)
-	$(add_kdeapps_dep kalzium)
-	$(add_kdeapps_dep kanagram)
-	$(add_kdeapps_dep kbruch)
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_kdeapps_dep kgeography)
-	$(add_kdeapps_dep khangman)
-	$(add_kdeapps_dep kig)
-	$(add_kdeapps_dep kiten)
-	$(add_kdeapps_dep klettres)
-	$(add_kdeapps_dep kmplot)
-	$(add_kdeapps_dep kqtquickcharts)
-	$(add_kdeapps_dep ktouch)
-	$(add_kdeapps_dep kturtle)
-	$(add_kdeapps_dep kwordquiz)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_kdeapps_dep marble)
-	$(add_kdeapps_dep minuet)
-	$(add_kdeapps_dep rocs)
-	$(add_kdeapps_dep step)
-	webengine? (
-		$(add_kdeapps_dep kalgebra)
-		$(add_kdeapps_dep parley)
-	)
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild
index df0c70a95b08..f5c5beae015f 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="+webengine +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..798b7d6d7040
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://edu.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+webengine +webkit"
+
+RDEPEND="
+	>=kde-apps/analitza-${PV}:${SLOT}
+	>=kde-apps/artikulate-${PV}:${SLOT}
+	>=kde-apps/blinken-${PV}:${SLOT}
+	>=kde-apps/cantor-${PV}:${SLOT}
+	>=kde-apps/kalzium-${PV}:${SLOT}
+	>=kde-apps/kanagram-${PV}:${SLOT}
+	>=kde-apps/kbruch-${PV}:${SLOT}
+	>=kde-apps/kdeedu-data-${PV}:${SLOT}
+	>=kde-apps/kgeography-${PV}:${SLOT}
+	>=kde-apps/khangman-${PV}:${SLOT}
+	>=kde-apps/kig-${PV}:${SLOT}
+	>=kde-apps/kiten-${PV}:${SLOT}
+	>=kde-apps/klettres-${PV}:${SLOT}
+	>=kde-apps/kmplot-${PV}:${SLOT}
+	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
+	>=kde-apps/ktouch-${PV}:${SLOT}
+	>=kde-apps/kturtle-${PV}:${SLOT}
+	>=kde-apps/kwordquiz-${PV}:${SLOT}
+	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
+	>=kde-apps/marble-${PV}:${SLOT}
+	>=kde-apps/minuet-${PV}:${SLOT}
+	>=kde-apps/step-${PV}:${SLOT}
+	webengine? (
+		>=kde-apps/kalgebra-${PV}:${SLOT}
+		>=kde-apps/parley-${PV}:${SLOT}
+	)
+	webkit? ( >=kde-apps/rocs-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index e85bf85f9628..50baed11d0e5 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegames-meta-18.04.3.ebuild 1512 BLAKE2B 3a5f0d6dfb9135330701276aee09b4e5400ffadc4cb6879f1df0934a6c0553ebb52b86850825bf055b212a08de4b66640dfb9970cbfebefbf497c0962d754fde SHA512 dc97ada20d5b222a9bb252ad15e1c6c771a5bd20655b4a7874ca92d7e263db7eced138eedac778992c7bee28f2000dafbbbd3d8cf8b5facaee35b4d61b36d81d
-EBUILD kdegames-meta-18.08.3.ebuild 1522 BLAKE2B 77a5978976e972bbc4f339ac90f81836dde718e4b44bfb25a4d783b2c135f60d36992d056f7f0aa4f5f82b111b1dc5c8aad5b542f4b86cfd4c676ae63d6b2c3b SHA512 905673e74789089bcfb094cd6e33adf7955be582a250b43d7df205d3d1ce06e095ab84b08833b7d6cf6679f4f5b095bc6108c6d2ffa9ca0475904c755326025c
+EBUILD kdegames-meta-18.08.3.ebuild 1520 BLAKE2B 6aaa1425ad3592e9b65940ea017222712c322660a8f976c20bb0fd1670c57e9a13fa8dcba59a4526abcf99320cd3dffee99751a2a515a965b2664ef035e7b7ee SHA512 716c003d14e02ae24843ac10d3b0f3a922b826481f9317cf2d58a05f7233b9d87d7c55f13b462bbcdd2166b1af56036786d8e1c9b4a6cd676e7869eb9aa6a18e
+EBUILD kdegames-meta-18.12.0.ebuild 1802 BLAKE2B 81cdcf33b582c6890c3a3caf0ec0deafb9194cfbce135b44aa74c596f3c35e71a2b57c52328dc8a369f5d0cc654b50cb2019cc3ad0ac046a37fb8dd904474cc6 SHA512 c8586d3ec016ea9943ffbccbf8e88c66e7d63de43b649495a67a98ff2b4d1959c1899114c05b0e8a573f96861cc8166d27c762d2e76d9ede7a4604b17322e876
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.04.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.04.3.ebuild
deleted file mode 100644
index 4a126824e683..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="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-18.08.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.08.3.ebuild
index 0c65fbfefd9d..27783604622d 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-18.08.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..0f37c61c3ffd
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+HOMEPAGE="https://games.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl python"
+
+RDEPEND="
+	>=kde-apps/bomber-${PV}:${SLOT}
+	>=kde-apps/bovo-${PV}:${SLOT}
+	>=kde-apps/granatier-${PV}:${SLOT}
+	>=kde-apps/kapman-${PV}:${SLOT}
+	>=kde-apps/katomic-${PV}:${SLOT}
+	>=kde-apps/kblackbox-${PV}:${SLOT}
+	>=kde-apps/kblocks-${PV}:${SLOT}
+	>=kde-apps/kbounce-${PV}:${SLOT}
+	>=kde-apps/kbreakout-${PV}:${SLOT}
+	>=kde-apps/kdiamond-${PV}:${SLOT}
+	>=kde-apps/kfourinline-${PV}:${SLOT}
+	>=kde-apps/kgoldrunner-${PV}:${SLOT}
+	>=kde-apps/kigo-${PV}:${SLOT}
+	>=kde-apps/killbots-${PV}:${SLOT}
+	>=kde-apps/kiriki-${PV}:${SLOT}
+	>=kde-apps/kjumpingcube-${PV}:${SLOT}
+	>=kde-apps/klickety-${PV}:${SLOT}
+	>=kde-apps/klines-${PV}:${SLOT}
+	>=kde-apps/kmahjongg-${PV}:${SLOT}
+	>=kde-apps/kmines-${PV}:${SLOT}
+	>=kde-apps/knavalbattle-${PV}:${SLOT}
+	>=kde-apps/knetwalk-${PV}:${SLOT}
+	>=kde-apps/knights-${PV}:${SLOT}
+	>=kde-apps/kolf-${PV}:${SLOT}
+	>=kde-apps/kollision-${PV}:${SLOT}
+	>=kde-apps/konquest-${PV}:${SLOT}
+	>=kde-apps/kpat-18.04.3:${SLOT}
+	>=kde-apps/kreversi-${PV}:${SLOT}
+	>=kde-apps/kshisen-${PV}:${SLOT}
+	>=kde-apps/ksirk-${PV}:${SLOT}
+	>=kde-apps/ksnakeduel-${PV}:${SLOT}
+	>=kde-apps/kspaceduel-${PV}:${SLOT}
+	>=kde-apps/ksquares-${PV}:${SLOT}
+	>=kde-apps/ktuberling-${PV}:${SLOT}
+	>=kde-apps/libkdegames-${PV}:${SLOT}
+	>=kde-apps/libkmahjongg-${PV}:${SLOT}
+	>=kde-apps/lskat-${PV}:${SLOT}
+	>=kde-apps/palapeli-${PV}:${SLOT}
+	>=kde-apps/picmi-${PV}:${SLOT}
+	opengl? (
+		>=kde-apps/ksudoku-${PV}:${SLOT}
+		>=kde-apps/kubrick-${PV}:${SLOT}
+	)
+	python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index bd6cedbf73e3..b65eb67e623e 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegraphics-meta-18.04.3.ebuild 765 BLAKE2B a5a9d2bd8dec75e23280998d581e2359a827ab2b387ab6f2958e1839e62d7c2cf49763099824748b69cc27a894ff349892abcbf492be0d9d4629992bce3b0c9c SHA512 76ff544e418bf64e34d1ecf2034d13ff6ef37c0f107bd92d24d52b85208bef19bfff1c83f90aab64da143845a7438e0223ba52d8eebd1422e55286476f19a2d2
-EBUILD kdegraphics-meta-18.08.3.ebuild 764 BLAKE2B d9808c480b4a60a8ddc5eb743dd46e7f7aa703287a170dd2733dff505cef4dae0b0f05e7fb564bdc2222c6fc0c714e7d3519975e11cf1ea604ffc563a84bdd17 SHA512 5c7f4db47e5f5362ff7ec67830c505a57f490b4a61201e99f2a01463758496d94ec9b99997c6409f4452825d0b6fcbd1007edbea06ce9e341dc60d4295910c49
+EBUILD kdegraphics-meta-18.08.3.ebuild 762 BLAKE2B 078ce9a6189a5a8ebcb17c56ce229b8610ccd60380cfc218c47e5578f6176da22a1aa44c3015d566f01d1ba302c6c7e89484cf47e4a5bc800286e6cf3ddd4a94 SHA512 8ddc889b383f43b45f0e8bc364f1333a4af56d477a657fe4567e905a56c5f21dcc3521842d5ae243480047fc8fde4c245b3a07c76d268c9c57f31824b38e2f31
+EBUILD kdegraphics-meta-18.12.0.ebuild 857 BLAKE2B e971e62a1bf7d864f275999ecc0ed09a6236b20f09c9324ba88c964394528f3f96511c7d3eb470056cbf4fc3e4762d8c5e4d0f6c17b6c74902813bc91d9720e2 SHA512 0a7b0706724d6c33705be15c346531b5da53d423828ae1d21976fdd976a8d0867479dc3c5326d1961b384569a344a8f1a4cb4f1522c2f4ee11556aedc5987de4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.3.ebuild
deleted file mode 100644
index a8e049568e98..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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-18.08.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.3.ebuild
index ed9983919284..8369640d50b2 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..c67c6f805c0f
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+HOMEPAGE="https://www.kde.org/applications/graphics/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="scanner"
+
+RDEPEND="
+	>=kde-apps/gwenview-${PV}:${SLOT}
+	>=kde-apps/kamera-${PV}:${SLOT}
+	>=kde-apps/kcolorchooser-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
+	>=kde-apps/kolourpaint-${PV}:${SLOT}
+	>=kde-apps/kruler-${PV}:${SLOT}
+	>=kde-apps/libkdcraw-${PV}:${SLOT}
+	>=kde-apps/libkexiv2-${PV}:${SLOT}
+	>=kde-apps/libkipi-${PV}:${SLOT}
+	>=kde-apps/okular-${PV}:${SLOT}
+	>=kde-apps/spectacle-${PV}:${SLOT}
+	>=kde-apps/svgpart-${PV}:${SLOT}
+	>=kde-apps/thumbnailers-${PV}:${SLOT}
+	scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 0cfce3b58718..2d77cef779c6 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-mobipocket-18.04.3.tar.xz 13476 BLAKE2B 33b49885314b1e531c690a3d9873272b5f73e8cc23fa23524da07a48917f6e08a32f8fb840270941419b7d8ebc36cef28004b8ffc9e034abbaed8d60df1da98f SHA512 e475c7425bd9be50e5e28409ab0661eec7f33945ebb0a1b5fe9ade06c5b14d02b74a7afd572145049d1412a22a5cda12686039bebeecb25ade4eaa54fa307cf2
 DIST kdegraphics-mobipocket-18.08.3.tar.xz 13476 BLAKE2B 06ad6a84cb2cdcc8b107c383fb72a16f1bbafd6bfde325d288475f6a1d3c58d8b5c6d055de80e253b79fdfb9a37ec0253dbcdac43d6d6ca0b6efad79be463a01 SHA512 d5410d431f5cad5e495db6410d3ab6c9c1cbce3b3971965a0fa3690709763b68d351d79060088e279bcc6eca933febbeb1450e16cfcc376b1b572024a36e58ab
-EBUILD kdegraphics-mobipocket-18.04.3.ebuild 422 BLAKE2B 6815ff8abcd82d201ccaebe992d7df276ac95c4c2474fb04478bf73092158c0b532157f85275842fd9b5400fd9f10bcbcc32e1c9b9fed2e37613dc453d31bde0 SHA512 b0653f84cf4b6e9a5b5c517268e728f84610939dcd17f5d6ed52f33140aea2e3030394b6584b4437cea46b27019e10f1792a6c35c6eec0641959fb5e4fa1d4c5
-EBUILD kdegraphics-mobipocket-18.08.3.ebuild 421 BLAKE2B 31df842e00d91385b4f3babbe5ffff0845ed6de628988c18fc0663ec22c6fb08f84331a9673716dd141572354c383cf0d1f4f74e8f27932e93799490747b98fa SHA512 5c4ff41f655b7a84db5e54aa0ea38cb5acbfd237696afa3ff71f5809fc5f2d03aaec0c2fe1daee26519c1247e387a82e0cf47b1e27d1bc3dc1dbc78769810a81
+DIST kdegraphics-mobipocket-18.12.0.tar.xz 13452 BLAKE2B 9861ee633078457fab83d21ccf4c970b388189b17e239aa030de191385284640ebd6acd57f78b86618049002e2a1a6b8e24b9fab26a211d666036ef0de217767 SHA512 6ff2afeeefa479fed9e958296a46efba92580dcd2040c73688cc41cd31549afc6b2afb91aad4ab978628ad837b1433e1dda5c75669189eb9843a2fdcd5fa7d9c
+EBUILD kdegraphics-mobipocket-18.08.3.ebuild 419 BLAKE2B daa24e0b098f55ad1777476e4cd45e373c65070001fb60fc294d248b344541fa4fd17da70c5f1fb8b4d4abd5af5d0e1e098efd11e8c70f0496163d21ec92da84 SHA512 49d9cc30993f041b0b8f145de9ae76d1392efa45a13337672f73571e6ff2a115bd9025ec198c9f4d5c2204c8483e3cd1fc6a2125f753bf8a10a30048896d019e
+EBUILD kdegraphics-mobipocket-18.12.0.ebuild 421 BLAKE2B 31df842e00d91385b4f3babbe5ffff0845ed6de628988c18fc0663ec22c6fb08f84331a9673716dd141572354c383cf0d1f4f74e8f27932e93799490747b98fa SHA512 5c4ff41f655b7a84db5e54aa0ea38cb5acbfd237696afa3ff71f5809fc5f2d03aaec0c2fe1daee26519c1247e387a82e0cf47b1e27d1bc3dc1dbc78769810a81
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.3.ebuild
index c8641b807ab3..201c9fc0138b 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.0.ebuild
index 5fb1d11f17ad..c8641b807ab3 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index cf672be6b5e1..8e2ed493a624 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdemultimedia-meta-18.04.3.ebuild 735 BLAKE2B 68ffe03a692837927bb3ad434eb1feddb4d68a0b7b6594777a9c423467995411a6d9f5bf6d5ab020cda3472743a49e07a64b39cc683c0fdf187cd1ccdc8d3fd2 SHA512 df3c03c90679791c85a5c5f05222f1081b4b6245eaea41f7047efc54f08be655fdf9e105295de36a6c5a2d8491422c29fb8708c61b888bbd3636aec5aa77bb5a
-EBUILD kdemultimedia-meta-18.08.3.ebuild 734 BLAKE2B 25b892104112016c2287ed6df15a5f246c83df2463d358aba64dab584e6a3de89dc4858bf59644e394bd6ef764beccfb844ffa5002fd47f0bc8d34393bbefade SHA512 54e8bb35cd467c5f849517c1aa4462547f3de92a8f561565db288351740b933f68790954f9644158d7e530d7b5047d5435bf3d64e5ecbed0f3a6b8db407ba4af
+EBUILD kdemultimedia-meta-18.08.3.ebuild 732 BLAKE2B 48224c0b24ac2e587de83033502e5612ae95586a5a2bb62ae7c625401edf1bfa8015431fa3ffd8e909db5b29652a324c381de64742106a5aad004e6bfb70a691 SHA512 11d7bc46b931be4ad3d30ec2d84b27952cf80ba0fe44a52c8913a68740fdf1c7be63d200a8d27104d11f1909e7d52e7bde4839a91a13b17cc4886d5b4b9cfe69
+EBUILD kdemultimedia-meta-18.12.0.ebuild 809 BLAKE2B 5d6cc03824822ff38bfe22624ace930ad949fb2d4a53f835e7e7896000a9be559f6485b7965e2b815b60ef44b1089b35e217242094c5263017edb00af5bd218f SHA512 bbc4e12b2cbc56c456be92f5bbb9bb17254418d9a6b15a0b9f4d46579329f5e0fa68653dda0efd7262e16b42d1863aeb6b9eb3626e3b57c41bbfc9e46997f4dc
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.3.ebuild
deleted file mode 100644
index 076382425ba5..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://www.kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
-KEYWORDS="amd64 x86"
-IUSE="+cdrom +ffmpeg gstreamer"
-
-RDEPEND="
-	$(add_kdeapps_dep dragon)
-	$(add_kdeapps_dep juk)
-	$(add_kdeapps_dep kdenlive)
-	$(add_kdeapps_dep kmix)
-	$(add_kdeapps_dep kwave)
-	$(add_kdeapps_dep libkcddb)
-	cdrom? (
-		$(add_kdeapps_dep audiocd-kio)
-		$(add_kdeapps_dep k3b)
-		$(add_kdeapps_dep libkcompactdisc)
-	)
-	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-	gstreamer? ( $(add_kdeapps_dep kamoso) )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.3.ebuild
index 5b7072afa0f4..1a0bc3625cb2 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.08.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/multimedia/
 	https://multimedia.kde.org/
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..7cec145c8094
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdrom +ffmpeg gstreamer"
+
+RDEPEND="
+	>=kde-apps/dragon-${PV}:${SLOT}
+	>=kde-apps/juk-${PV}:${SLOT}
+	>=kde-apps/kdenlive-${PV}:${SLOT}
+	>=kde-apps/kmix-${PV}:${SLOT}
+	>=kde-apps/kwave-${PV}:${SLOT}
+	>=kde-apps/libkcddb-${PV}:${SLOT}
+	cdrom? (
+		>=kde-apps/audiocd-kio-${PV}:${SLOT}
+		>=kde-apps/k3b-${PV}:${SLOT}
+		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
+	)
+	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
+	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 8ee8d14725fb..2fdb87b95bf3 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
-DIST kdenetwork-filesharing-18.04.3.tar.xz 324004 BLAKE2B 41470dca8d8a0e9eb092445a5d32c2ef655b9f64e14fcea46b96c848efdcb69471cd184edb321860ae52ad7e222ca81aa8218e5e05d81c523f22834d4910ca9a SHA512 f9672ac750a9b6ae05f0c3b9c3e340966bcacbf906c130ddabae6e7d62f5b67838e5183cc772b676c9a314b866c563d82e079c4e59cdd1339d550a1583a0df5e
 DIST kdenetwork-filesharing-18.08.3.tar.xz 313048 BLAKE2B 66be8fbb524ad9b6e650f33fdc8dbb41d2553d279219a7a7e9bcad2670620ea56c5b110c4189770dc753e40874b159db3e59419cc7b9d09f92bfcd020b306da2 SHA512 facf42254ccaadc6779683e6b8297bfbc7a4ff03647caeb0128e0f1a4dd68741d95358b32ae851b79155903d302e49c98e761bd442f9b63c2f2d878816f2fc37
-EBUILD kdenetwork-filesharing-18.04.3.ebuild 572 BLAKE2B 38ae6cdaeaafa1047dddc6b3c303098db6343279be551b0f72f51b2cc324afb789e6db3ce575572f7b1b793d1e432654dd44f1b9eb337064c4d569e7389459d8 SHA512 755e810f11580ce3c59b3ee8a215521ff5eb7d97bb9d69ca8f0d6a52ac9d73c7ed7c5f6d1e8f1c2ce30cb07cd8cff0f86f219b00075e58f420a1324220f5b3d2
-EBUILD kdenetwork-filesharing-18.08.3.ebuild 571 BLAKE2B 9f9d45ce29c2619704d55d72883bd176d7205f83cbcbc758b84833c99a9eef4de97a2b37b9d3c7c17058f2631ccf1839ec03a695d611899951f2b4e599a831f6 SHA512 7426da52239d81daf34a5f7f2adede95415b9ac345bff541b219ed7bd4d1962f79d062c6c39567bb33fbcd8f0785566085d773d67036bd21f0bc6b499f9aa240
+DIST kdenetwork-filesharing-18.12.0.tar.xz 312764 BLAKE2B dab115ea63a4f45f54d4e472b479680e41ac68412644a21508c697185cfead7224e281e73ac49b07dc8ebee41a22e0e2bd6d3047c9e480dafe66424413b4af67 SHA512 071a927a1dd640ca3a9da961cf000f1350f877775fd67a36bc54e5ff5b3847a764be31ca46240ccf6c5a4811e96e449b7b972278a7885af45c6bd33fac5e320c
+EBUILD kdenetwork-filesharing-18.08.3.ebuild 569 BLAKE2B 38520dcb4dc1caed0be3caf597ceb875279e196eb36a8bc9436cb690c7d7afe15ca17ae59e92183330692a43a3fe5e1b1d6a10871b761db41288673d64753e48 SHA512 5e8440007ae91bd22d11dbbd5c0da4cd9b66a6fe7b6cf914b6fb4df0d370b0ae54c02383871e84637d426b83c667ed8c75a082052e7029e16163f9308a04a318
+EBUILD kdenetwork-filesharing-18.12.0.ebuild 571 BLAKE2B 9f9d45ce29c2619704d55d72883bd176d7205f83cbcbc758b84833c99a9eef4de97a2b37b9d3c7c17058f2631ccf1839ec03a695d611899951f2b4e599a831f6 SHA512 7426da52239d81daf34a5f7f2adede95415b9ac345bff541b219ed7bd4d1962f79d062c6c39567bb33fbcd8f0785566085d773d67036bd21f0bc6b499f9aa240
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.3.ebuild
index d59d7bd40bf0..9bc1a2c2b438 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.0.ebuild
index 82b38a189d00..d59d7bd40bf0 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index e994bb608538..43e310023a01 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdenetwork-meta-18.04.3.ebuild 511 BLAKE2B 0627b330695a6747c664dd26304985af3675be0cece5e42c9780ec34ca4be767f2d1854eb25f75042b59e2f4ce8f4266e8800f534be3b80b0bd795252ad65b55 SHA512 5b5f2f98f9bc8fc2b47a6b18356c169e3ad631e3aace2f9014b4641664d362d16b3d338cc3c1b27dd58bb7ee256e6966dfa691c3102b7502ac048e107d3a8df9
-EBUILD kdenetwork-meta-18.08.3.ebuild 510 BLAKE2B 7a498a0a179b9b1f22540446b6bc3e4b684c726b773ccf42a520343bd69ab0de6e386b3ceb171e6256f15d51189991b3e148c125ddc77cc16b8549b78f23c148 SHA512 d351396aba161ee1814d16d2acde0238730a768004007d880b59474d94f9e53fc54bf1f1796faabd0e9cc8f99a3d1b14276797bb19c8a75598c79efdce74165a
-MISC metadata.xml 410 BLAKE2B 8d98bd833e50db75f604cdb99878a614b28ad320b4a377b75897b7bcb6d0b95f5b2fa102661fc26474533eeda09e7cd5f8fe2131d0162f85b87c45a8aee9649f SHA512 049780b067ed1159cac1db34a6408997d614c74445b74c01d0fb3bca4beb46185b8bed2e2280f590501b44177fe13a5bf3fa090c21cfb5455b4e7a3a44ef1436
+EBUILD kdenetwork-meta-18.08.3.ebuild 508 BLAKE2B 7d56875f96683b3ecb637f7eb5a1a1353186313dfc30f0c13f5726319ff2d1b9953a4e50e13af2b404c8e368b624ab5bf4035362b6a69af77f054ef014063072 SHA512 29de2da6d4fc33402be78f36dc822f9bb23315fd3dbac8108c81d8eb1602dc3ac32321552b945fe0bf7105565777723bb661c9bee13d3de41fa4c2c0c4f0e7e1
+EBUILD kdenetwork-meta-18.12.0.ebuild 664 BLAKE2B 77d53d9aca2425a150fcbfe286893054e472a22135ce5e3da8025f7608666b8911ff14318cc973b4595fbb3aff63536f8757435bd1b40ac1036cff4241a7bb73 SHA512 84dfb7863e38801ea222174a66d479f4c0035b6db58bf9d510a886abe134e63ea6fdb9071e2f6f170878c877699f47a84ac92bd8524257721bb6818af0b19dcf
+MISC metadata.xml 546 BLAKE2B c0eaa549235c2cf501ecfb5eb2b39bf466193e892715224ff8979528e49d2dd129873714302505f54ea200707eba0682a75a4232bbfe89b78244b5483d93a2dc SHA512 a423dbfbd45bd72c6d5aa9f196c9a4f1b4740400ac31112f358246e40f22ebaf76d3fc66136b4f477ebdfb59c967b45351841718621fc88f5576b71338136e6a
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild
deleted file mode 100644
index 482972d2d7bd..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="amd64 x86"
-IUSE="+telepathy"
-
-RDEPEND="
-	$(add_kdeapps_dep kdenetwork-filesharing)
-	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep krdc)
-	$(add_kdeapps_dep kopete)
-	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep zeroconf-ioslave)
-	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild
index 53d2827dcc7f..56f4e495e66c 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+telepathy"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..f8032c178faf
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="dropbox +telepathy"
+
+RDEPEND="
+	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
+	>=kde-apps/kget-${PV}:${SLOT}
+	>=kde-apps/krdc-${PV}:${SLOT}
+	>=kde-apps/kopete-${PV}:${SLOT}
+	>=kde-apps/krfb-${PV}:${SLOT}
+	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
+	telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index 0eb226e532aa..0225cc74ae93 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="dropbox">Enable support for Dropbox in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-dropbox</pkg></flag>
 		<flag name="telepathy">Enable support for Plasma Telepathy (instant messaging) integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 0f4f2a5235d2..31a470a93d58 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
-DIST kdenlive-18.04.3.tar.xz 9399136 BLAKE2B 0cb0a172ea301695e5e8f1e11aa25cfe8a6a597c61ef2913691fd834f6c9f021a3f63ede54c3a2d13753e06cd0932681246db84831d979a1355faa94418bf37f SHA512 c4f903a2de7a44b743a87068bd54379f12af1ba56f19aa7a5820db58514bd2c973cdfddc05f89232304ba06da9a8e4437138485eff0d611138e21f4f8af4ed77
 DIST kdenlive-18.08.3.tar.xz 9414236 BLAKE2B 214cb1f615c6d1a1eba47c68d79c74f9daa40388ef811313bf20b321bb469c2b5a6f1168e44001900509554b5220b6a1e00f7f19a8562f32cef2e8da3d799f0e SHA512 10ef69fdd971b3333d275da68c38ec16f30075bf50b4f0b3d02ff623814f1dea02a8c1df6ab6f5262579813f2b6309d101106ef561cd8bb42cf33c277bab1c7b
-EBUILD kdenlive-18.04.3-r1.ebuild 2126 BLAKE2B ac074cf0d3c79c1882784256cfe72e8762fb3f39c8a1dcd4b5c953ecdd1ba171ac44a406df7dc1959f4277da5f859a05262e1bd39e0969f1cb05d37a2c8a62a3 SHA512 e17e9a58e359e9d88b85f4f570c4ff13ac511fc36924b76b8607a649e6002c1243490f4d48b352cb4f5026dab5dc1e4c26d5968350146478dcdf2a221b26f41a
-EBUILD kdenlive-18.08.3.ebuild 2221 BLAKE2B 1e96d58367eaca30049393e892c2a49ecd2ac7d8fd801dd1cc612fd943242d05ba601b0fc6f9b7e850425d55cdd14d1de569ec784ce8c3d0a0ed421ecd502464 SHA512 e119d15f43708d2729cc4f6aff7351be6338b1c6a96bc71dcca1f4cfbc56f3a2c3c46b799f02d2dd28b93804fcc8f17cb299b72ee576f8fec934233c52a3a17e
+DIST kdenlive-18.12.0.tar.xz 10196100 BLAKE2B b0add0e04e375f59c3f08a86bf7af5a937a79c5df64b8fd72abae24d67252e6756cd2528cc96a970ab0f83205314f22977bb4a0806b1b430f40591f52e0af7da SHA512 e1eeac9dac15d45ac08239b82d54c51d8720b6c5da37b322560e33a8e50f50910dfdc6502649bbd31320227b7ca4d730a6b2e5838414cefd9610733aa20bfbd2
+EBUILD kdenlive-18.08.3.ebuild 2219 BLAKE2B 71b4705d476ccd9f3e095bacbc8ce432a460c82483adc4cbcfe2202e6494db2c737cd9de4412a44877b25d916c3dca6f49d028f6c550f3587e8743d8c589a7f6 SHA512 3d35a83d301c4847c79e808459666371e82604ccb3c0241b24dda8fa8669b9d2453013f42d2a3ce2d4c5680a41354af56102c64e511a3f4a56ccc8e52f18711d
+EBUILD kdenlive-18.12.0.ebuild 2221 BLAKE2B 1e96d58367eaca30049393e892c2a49ecd2ac7d8fd801dd1cc612fd943242d05ba601b0fc6f9b7e850425d55cdd14d1de569ec784ce8c3d0a0ed421ecd502464 SHA512 e119d15f43708d2729cc4f6aff7351be6338b1c6a96bc71dcca1f4cfbc56f3a2c3c46b799f02d2dd28b93804fcc8f17cb299b72ee576f8fec934233c52a3a17e
 MISC metadata.xml 631 BLAKE2B e31fe832d690c7c842a255697abcc15cf51546023a97ee121e918b2ec990e12555b3fcec1d585563c8bd75750cf84c66bcdab0d570d99c1ff85545753a698a00 SHA512 35e594ff05a23977e5f3944cff530c89404a4807db0f9a5f7454dca69de13b8e7df2cb18ec4a06292f4526fa4b27c0966d129a4c4b3f153de4eb3250ad3ceef9
diff --git a/kde-apps/kdenlive/kdenlive-18.08.3.ebuild b/kde-apps/kdenlive/kdenlive-18.08.3.ebuild
index 116743550f9e..c14e47aca154 100644
--- a/kde-apps/kdenlive/kdenlive-18.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-18.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Non-linear video editing suite by KDE"
 HOMEPAGE="https://www.kdenlive.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="freesound gles2 jogshuttle semantic-desktop share v4l"
 
 RDEPEND="
diff --git a/kde-apps/kdenlive/kdenlive-18.04.3-r1.ebuild b/kde-apps/kdenlive/kdenlive-18.12.0.ebuild
index 087a9eef2cb6..116743550f9e 100644
--- a/kde-apps/kdenlive/kdenlive-18.04.3-r1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,8 @@ 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="freesound gles2 jogshuttle semantic-desktop share v4l"
 
 RDEPEND="
 	$(add_frameworks_dep karchive)
@@ -45,11 +45,12 @@ RDEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	>=media-libs/mlt-6.6.0-r1[ffmpeg,kdenlive,melt,qt5,sdl,sdl2(+),xml]
+	>=media-libs/mlt-6.10.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
 	virtual/ffmpeg[encode,sdl,X]
 	virtual/opengl
 	freesound? ( $(add_qt_dep qtwebkit) )
 	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	share? ( $(add_frameworks_dep purpose) )
 	v4l? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}
@@ -62,6 +63,7 @@ src_configure() {
 		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
 		-DWITH_JogShuttle=$(usex jogshuttle)
 		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package share KF5Purpose)
 		$(cmake-utils_use_find_package v4l LibV4L2)
 	)
 
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index a77b08eefee0..1bb7eac0005c 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-addons-18.04.3.tar.xz 2509988 BLAKE2B e52e24cda18808e177b9192c1c69cb4c8c6b8815ab738b3b1e2127c61fa7cbf6007704a1a243824a0bb66e93336bcaa2590a6a83edca594029fb2087cbb5c20b SHA512 af1659a41a128cd6c822c8de089aa447131817c60636803bb809fe637780e312230633156347cadb11546b7b8bcbcfffd730d6176109dd80ee20e7dcc9a7707b
 DIST kdepim-addons-18.08.3.tar.xz 2134684 BLAKE2B cf311193dd1e100fd4c3c08926be0b8102795f7e7475b3610be4dc60e4071a5286bbfffcd7928edd5ae3f779c7266e9efe08664abea153bd95c8840c05240f92 SHA512 9d9ec5c0c51f14bc7936e40b8d67f67120e4d458d1b226dfcfc08b6aa28a30255300a83758c3af7b1e68e7f755fc198208402027303f4451c054dba4c7ef8f82
-EBUILD kdepim-addons-18.04.3.ebuild 2254 BLAKE2B feb95b32a64c8d8ac8e0f7664cff63fbbafabe83263fb9920dce532d3736c49b7db26506799b267ea74c1b8de94a3600768ebdccd62e0843cbd5c2df0f05e1de SHA512 8d0bb5991fefb409d17e1575cc9ab1aee3784693e15df062c77ab3d07c0df403d905db5eb30728353b48c0287eb5d4b33d7d70f64d7186d2e2a991b12225be17
-EBUILD kdepim-addons-18.08.3.ebuild 2312 BLAKE2B 8ea3fcfd89840bcc61ffd4014b9d25848e37e337f56ab87a89203ff580ebe4f8ef3371232124f603f3e1cbc376b80e798109265fcca84e413f9f32e52af8aeed SHA512 7c7b4a221a0ffa96ed8c0dee0341d35e2b8e80d8bf6a5810e389a46465fafe8076db9e2e0725b714ef4120073cc3c5c916d5a4f3c5349dc7fb98c2feffa2a753
-MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
+DIST kdepim-addons-18.12.0.tar.xz 2038112 BLAKE2B ceb133bdeeca82980fd2c92da0edeade5dcbef20ec632bc2208e2cba57bfd136891f833e8471372977fb3927c554eddaa608f2b71f47878f0da5048a8949c861 SHA512 b23e9abbd3916be36bb50fbbed4972b29712d9e26c46b65328538caf44e96dfe950c591f3a4854b048681e3c3d239cf5965c6e31394fd8c6a6a1e132b2d5b8e0
+EBUILD kdepim-addons-18.08.3.ebuild 2310 BLAKE2B 361eb1fb6cfb7c03da7533acef6c6ba527f401bb775e0c6dfb2ce0b292aba13a7fd8e6138204b7a8c435ad7e327627459dc47655db20e231e80ab704d65fa028 SHA512 401f3941a857f23bbab3d04ed1b908a2c7ce3025b15700dd06ff80a2f5d726f291bd8812202bb408d3e405a3c9168151394ba7d1ccd82ccd56b76916eb7a341b
+EBUILD kdepim-addons-18.12.0.ebuild 2406 BLAKE2B 4d64afd015ca6cb51c5ed8bc8d37d8f397737b1f63608b650946b980bcd4311bb7c84bd925a21668a652620f8043b86c80c0474ac16298c7d62ac9fc7a256c1a SHA512 96289ab1efd0423751d2cd4a491c0f1fb6ea58fd0e0173d08f581aafee4af3847895fac2a4a4f9d4f773fb67648f4131e5a27664ab5b62b9e51bc7085cd3c7ab
+MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild
index ec708ef8bb19..81e652c87688 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 IUSE="importwizard"
 
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.12.0.ebuild
index 47985780bc1c..9f2939e7bdf9 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-18.04.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,9 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="importwizard"
+IUSE="importwizard markdown"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
@@ -41,8 +41,10 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kitinerary)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
@@ -55,6 +57,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
+	markdown? ( app-text/discount )
 "
 DEPEND="${COMMON_DEPEND}
 	>=app-crypt/gpgme-1.7.1[cxx,qt5]
@@ -71,6 +74,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
 		$(cmake-utils_use_find_package importwizard KPimImportWizard)
+		$(cmake-utils_use_find_package markdown Discount)
 	)
 
 	kde5_src_configure
diff --git a/kde-apps/kdepim-addons/metadata.xml b/kde-apps/kdepim-addons/metadata.xml
index 5155011c8ccb..669894bdedf1 100644
--- a/kde-apps/kdepim-addons/metadata.xml
+++ b/kde-apps/kdepim-addons/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="importwizard">Enable additional import plugins for <pkg>kde-apps/akonadi-import-wizard</pkg></flag>
+		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 0e57a7886573..757730e8dfb8 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-apps-libs-18.04.3.tar.xz 73056 BLAKE2B abc67a5d354ffc4ff45b82d4bfb66f5b7b1327c95ed754768b9944c4f87987feca8c7478db1808251ef5939da5c3a3776f0ef6850b9a7f5e7cf873379b91ffb2 SHA512 1531c1f37540de4d0d8910a7f75eb85d5907495e2d65dfecb1dc83577e58f9587b2b3c37c451d4fe7b968c6f930f96e8cafa3c66fc6931c66e6aa5e41a4a8ab4
 DIST kdepim-apps-libs-18.08.3.tar.xz 82980 BLAKE2B 36c0295382e523b21fc97a8c05b98c68b3ce62306b2b6b7600c04ee07ddf55942b9efd4b349d6b23f889a3ab32ed7997ac9fa0c8e145bcc668ebe3e781c393c2 SHA512 479449746fafe3b67cac12cf1b464b658f4c3a3482dc9ac27138616190d2e62f75e3caf5030fee7613f28b548365e1aeb8158508cb0bd3d00e873d21ab0e0baa
-EBUILD kdepim-apps-libs-18.04.3.ebuild 920 BLAKE2B 7f5d44fbc2462713efaac8d6626c0b9a93443b6ab5fc61d2430ffad2bfae7d28df323eb83cd25db915e32df9de55c39e92c0e1003f4a2ffa537775afea24d6ad SHA512 4b0f06a6d396335e9f7d87b6e2d22a4356ae9d4095f4c9a41c865f2fdd50d0e7129b11100c3acaad4e552ee4caaab3fc38461c38bf3f7be2baf03713b3a45a32
-EBUILD kdepim-apps-libs-18.08.3.ebuild 919 BLAKE2B 2799cab2c9e2550c215c852de16c9fcce8fb19ba95b51c7ebfd56de7ef8e22f340296f50b4395061a31a6f1b79b5e8291a4b7a428c8aa6fa2daf462d28c160ba SHA512 6dc7d69decb84474ecee3531eca16347c922df84a038ac9a1a862ad94fe82b61cece6d89c591d512c4249e1d3e19043b68908b4dccaa95865889924670584756
+DIST kdepim-apps-libs-18.12.0.tar.xz 84724 BLAKE2B 2045fa9ff1d60bdbf14c3231577817584d74217c64c489c45df2b51b6b8ecc542a17fe6551bf34b7a08a03b5bf386259ff448119b1fb032b975cb1ead5cbd024 SHA512 5b73216504a7803c689d7593016824f380355e428551b06f26a83ef52d2b39e59dfd3faece2fc50c0a0be5d45b86dea752b8854ecb81c045967de1b9e31e1e54
+EBUILD kdepim-apps-libs-18.08.3.ebuild 917 BLAKE2B 46f4c5f8a89e075bee2ce830f4c1d06376f66e9b651a209009ab3f489c0f0c4fc4b7908cc27a0bace61a2c34ff78e83d269ed2fbd24c9a7dac732f6a0ba3572a SHA512 24c0b502abe4f57d45342570e0d745b8e663019c90c776f49a017278f96d78eab6706e049b017914999195cf02b2730d1429fcaa5ff963cd64b3cb251f1886a0
+EBUILD kdepim-apps-libs-18.12.0.ebuild 919 BLAKE2B 2799cab2c9e2550c215c852de16c9fcce8fb19ba95b51c7ebfd56de7ef8e22f340296f50b4395061a31a6f1b79b5e8291a4b7a428c8aa6fa2daf462d28c160ba SHA512 6dc7d69decb84474ecee3531eca16347c922df84a038ac9a1a862ad94fe82b61cece6d89c591d512c4249e1d3e19043b68908b4dccaa95865889924670584756
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.3.ebuild
index a59eafa15529..b87c58be8392 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.3.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Libraries for KDE PIM applications"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.0.ebuild
index 2c3d2c7bd5b1..a59eafa15529 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.3.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Libraries for KDE PIM applications"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 40d7686f5d14..2ba7e5d927b4 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,4 +1,3 @@
-EBUILD kdepim-meta-18.04.3-r1.ebuild 2019 BLAKE2B f677af1df6174c2d3a687b968178a75ba2116e182971121d2e3a5ca925a7c69bf301f4962714193ab5d11187c5a7dba633faa1df35aad9eb33822b1da530dcf2 SHA512 81b5bd76a47e271222e7ac3cce8502c4f5e90f3cad9d2f8315fdece2b5f1ad6c6831fa93c94043f64abff8f0b6079b1f0e0ca92874a4caeafc93864036ecba74
-EBUILD kdepim-meta-18.04.3.ebuild 2054 BLAKE2B 0859f98049ab023b4b7d9ff3c74c05b3823738572bf9f86444bb5a154894c98a31f4a787bf626bdf771c026922f6297d4b5a3c2f1efc0c093b50227b02b6e19d SHA512 7a810fef22bc3a2f0a1e98ec958676b2aa873b5409f597a95f660d1c31601f7ab6863bdea1513507ef7ba725ca3bc26e46d775198d0c1ecb393b1014f5b32cde
-EBUILD kdepim-meta-18.08.3.ebuild 2080 BLAKE2B 1093ab646dd62ac3a7ea2b9c6fe002cce3c3dc997bb336413e9ea8adf0b55834167e53c768ec76e56aa57dc1b9fb36e668c60a891e94cae5d9505cfe374c51b8 SHA512 462c32b638d811cf17a298eb1e69f4bb835780c00ed3a3f13ec304c824057b6546f93accdcd625bf5a02e47172dcce3e5ccb3dbd1757cedd8d87ced55c2814c2
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdepim-meta-18.08.3.ebuild 2078 BLAKE2B cb8a775aab8dbefa612ec5dfddf84f0d726b19ae516d5a44b683ae75fc4f4f0a135f4106bf7df008d75aefadaff4c4657110bb803472ce092c6cab8d27ebacf1 SHA512 ff5ad478ec5aaed7eda63dbc371ca524c390dbc98a432612b7d18f54b2978330854432631cf9fcc181c099156de01c3605604bd5505fd3164d2f0db0d8453b6a
+EBUILD kdepim-meta-18.12.0.ebuild 2662 BLAKE2B dd568e14d60bcf2c675e1f2f335d95595a7b072e872f6695bb81303d2787fb535ae6daa5012841a7e1c7f9410028cbd27b4c795c62918a6a0bf2d58fd39ef345 SHA512 d27890fcb62af9194d76d5ded0de48437414c86e00c6fde20ac72be4c8a4805f35b191070799fd1769920e4b0343c36afde9c9a7c904b2da0b189f867824c250
+MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
deleted file mode 100644
index 30981eb2a39c..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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 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)
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild
deleted file mode 100644
index 519cf03a9f07..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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 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-18.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild
index 34bc562e0bbe..f9ca1c115f44 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..cc9d9e6aa318
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bogofilter clamav spamassassin"
+
+RDEPEND="
+	>=kde-apps/akonadi-${PV}:${SLOT}
+	>=kde-apps/akonadiconsole-${PV}:${SLOT}
+	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
+	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
+	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+	>=kde-apps/akonadi-mime-${PV}:${SLOT}
+	>=kde-apps/akonadi-notes-${PV}:${SLOT}
+	>=kde-apps/akonadi-search-${PV}:${SLOT}
+	>=kde-apps/akregator-${PV}:${SLOT}
+	>=kde-apps/calendarjanitor-${PV}:${SLOT}
+	>=kde-apps/calendarsupport-${PV}:${SLOT}
+	>=kde-apps/eventviews-${PV}:${SLOT}
+	>=kde-apps/grantlee-editor-${PV}:${SLOT}
+	>=kde-apps/grantleetheme-${PV}:${SLOT}
+	>=kde-apps/incidenceeditor-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kalarm-${PV}:${SLOT}
+	>=kde-apps/kalarmcal-${PV}:${SLOT}
+	>=kde-apps/kcalcore-${PV}:${SLOT}
+	>=kde-apps/kcalutils-${PV}:${SLOT}
+	>=kde-apps/kcontacts-${PV}:${SLOT}
+	>=kde-apps/kdepim-addons-${PV}:${SLOT}
+	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
+	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
+	>=kde-apps/kimap-${PV}:${SLOT}
+	>=kde-apps/kitinerary-${PV}:${SLOT}
+	>=kde-apps/kldap-${PV}:${SLOT}
+	>=kde-apps/kleopatra-${PV}:${SLOT}
+	>=kde-apps/kmail-${PV}:${SLOT}
+	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+	>=kde-apps/kmailtransport-${PV}:${SLOT}
+	>=kde-apps/kmbox-${PV}:${SLOT}
+	>=kde-apps/kmime-${PV}:${SLOT}
+	>=kde-apps/knotes-${PV}:${SLOT}
+	>=kde-apps/konsolekalendar-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
+	>=kde-apps/kontactinterface-${PV}:${SLOT}
+	>=kde-apps/korganizer-${PV}:${SLOT}
+	>=kde-apps/kpimtextedit-${PV}:${SLOT}
+	>=kde-apps/kpkpass-${PV}:${SLOT}
+	>=kde-apps/ksmtp-${PV}:${SLOT}
+	>=kde-apps/libgravatar-${PV}:${SLOT}
+	>=kde-apps/libkdepim-${PV}:${SLOT}
+	>=kde-apps/libkgapi-${PV}:${SLOT}
+	>=kde-apps/libkleo-${PV}:${SLOT}
+	>=kde-apps/libksieve-${PV}:${SLOT}
+	>=kde-apps/libktnef-${PV}:${SLOT}
+	>=kde-apps/mailcommon-${PV}:${SLOT}
+	>=kde-apps/mailimporter-${PV}:${SLOT}
+	>=kde-apps/mbox-importer-${PV}:${SLOT}
+	>=kde-apps/messagelib-${PV}:${SLOT}
+	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
+	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+	>=kde-apps/pimcommon-${PV}:${SLOT}
+	!kde-apps/kdepim-meta:4
+"
+# Optional runtime dependencies: kde-apps/kmail
+RDEPEND="${RDEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )
+"
diff --git a/kde-apps/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index 2fdbf33d963d..42d0035b36bc 100644
--- a/kde-apps/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
@@ -5,4 +5,9 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="bogofilter">Install <pkg>mail-filter/bogofilter</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
+		<flag name="clamav">Install <pkg>app-antivirus/clamav</pkg> for virus detection support in <pkg>kde-apps/kmail</pkg></flag>
+		<flag name="spamassassin">Install <pkg>mail-filter/spamassassin</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 7fa0afcdcff3..ce2859ea37a2 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,6 @@
 AUX kdepim-runtime-18.08.3-gmail-resource-crash.patch 766 BLAKE2B 10d5a43d3c4a9322e8e7c864193880de226c70a1ebe25376ee133662cae0e8846d56d982c3b8255be55976cf03e1ee4c7323d99a47d189f4abb3c510227c1724 SHA512 4de43ca3b38a042b1f519616563cddefa522929f0e7ff9898d7cc5da3616bdf9aecbc981f50f7dffe47058580c7bb248ec864a27eb36ca88873005cb979c57fe
-DIST kdepim-runtime-18.04.3.tar.xz 1750516 BLAKE2B 09bbca0580ca2a835d61ab48a004fde691b70d04b03a9da3ccf52abfad16d341e6007ef890d0fda364f679650c6d07e78c2bddd5a4b0dcfb296f24bd0e2c046a SHA512 94770f46d9a100117adf05b03ad75aa3201ae4fc2a6b300bdc3ffc42003e1a54cf8b1275d28c78f32ac764f56e58909dfbc1448b3ab8a9625485d64e8366e68e
 DIST kdepim-runtime-18.08.3.tar.xz 1752272 BLAKE2B b3bdac2cdd6a741d1af60881b7e923485272edd8a0edb6c1dcc51cf961e0c25e005946467d7fa467d4ee266fd08bf2e7de5878a990ef88c19a614f9c4cc28a7f SHA512 b2520e1eab7f722eeaf8c34a554db86aa5ee7bbfdf11e31c471f06c67c50426327fae1319f747ae240d8919ee12259c34ecdee0ce0a83cbee5df5c3b481b76ec
-EBUILD kdepim-runtime-18.04.3.ebuild 2132 BLAKE2B b61017828ea6ef25170f71647111a56828e7a6fe147ed7bbe7a1ba118df8fdaa7c442ef4a2896460294d262959d2e80333ddbe7c6c0e112e086b9fef7a4c65ee SHA512 a7bdf693083cb9a845abd1d8125aad886bd625168d59f46b5df378cc682b51f9067fa19356b244052a592425aa31595b3e4197dcebaf2e5c369a1bc75ff4c519
-EBUILD kdepim-runtime-18.08.3-r1.ebuild 2311 BLAKE2B fd2661cec518e87761e6ff8ac9f5a868ef0308ba4a014bee1891084dd10001b8a1efe919d022bba354694080d4499962f1540b4659c5540ac819ab4696197258 SHA512 5a7fc28e1beab48d5d7aaa4845b2ef1b9d001d9ada50b4a19e237fd8eb9df041896761f427b67cc4aeb71cc5b6ef45785ab61d417145dbef9d6c61168a032c95
-MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
+DIST kdepim-runtime-18.12.0.tar.xz 1772412 BLAKE2B e8c1a943c614cd9abaebcafa2431aba3e3f2b17b5ad8f6e9479b491b67b8da4f57daff23a3d5af1322a9bdc6a045c4b9831db2e94eb24e872eb34625de5938f8 SHA512 f98992092bb2407342f10e695dff5c0514f670f69f664b39187df5d628eb9c9c3440eecce1e03f75c1e12fdf686c2bf1d5a92d78f331e2ff9eb4cf07321d525e
+EBUILD kdepim-runtime-18.08.3-r1.ebuild 2309 BLAKE2B 125c80cb8273e6d651c5872aeb0b1be57e3687802c93858d9511def314109f9823163d43dc9ac11ba29260dc931a79ae418e7f2c1d63efcd5a68c3ca1d098145 SHA512 bc78143b32b741f3f1e8bdd35d7e6293434e4e53ecf19d2af6df5c5b5f76079d6989e1e58a93138132e29e0a1fcc016599ce533e9ae32c259c8b6fd1b1a13431
+EBUILD kdepim-runtime-18.12.0.ebuild 2178 BLAKE2B 674271b87833fd791dd1b9d094072433cbf0382d7f0fa8a36fb79106078f797a8e22fa1d38f341d3f89a6500c959a4a210bbd52d0600050d5cfc68d518d38a11 SHA512 bf1bb7c3be83142496267038f7e9867c27e00dd4186cd17f8067520292f8c0209ec665767e073f56ad813b28cf334b3daae3cb7b06fcb99e1f4b87cc018d3d12
+MISC metadata.xml 431 BLAKE2B 55fb350365eb22d45202e33da2e0fc7e7f713e363760376a7fce354422d1b3723baf558cdf3301aac10f71e9df2541404995574e982493132a1298eda0b9c13f SHA512 1cdd40774926be019a6d332c2acb9ba00ba07fa794d42125ed0993c324058742287fd1961db5d59ea061a3653b79af5dfe7ae0774a036e53006b044cbc7df3c6
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild
index 87481aeb56db..26e7b043d577 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="speech"
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.0.ebuild
index 716436a76d3f..01617fb57e27 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,17 +10,18 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="speech"
+KEYWORDS="~amd64 ~x86"
+IUSE="+oauth"
 
 # TODO kolab
-CDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -54,29 +55,29 @@ CDEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtspeech)
 	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-libs/cyrus-sasl:2
 	dev-libs/libical:=
-	speech? ( $(add_qt_dep qtspeech) )
+	oauth? ( $(add_qt_dep qtnetworkauth) )
 "
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
 	dev-libs/libxslt
 	test? ( $(add_kdeapps_dep kimap 'test') )
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!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)
+		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
 	)
 
 	kde5_src_configure
diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index b337e66e249b..3959ad670767 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="oauth">Enable support OAuth authentication for EWS via <pkg>dev-qt/qtnetworkauth</pkg></flag>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 0a0ff1ad9d13..87656e841942 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-kioslaves-18.04.3.tar.xz 37460 BLAKE2B 32e1aa9ab46b0eb5697b630488a0bebe0f8ae41e4b52f22960bc60ec140151cd72ba79624bc9c7dd12da5aab5261cc9693818873e8778b9e903b6ce2569de318 SHA512 bce7c3638cc57bd5d0300050d13dad8a3c5508569eea6589023cd9c9fd744f2d24ad0ce52a8fdad59e876a7ab8c9c4856ce61b7d80514175ecf42a7533706038
 DIST kdesdk-kioslaves-18.08.3.tar.xz 37400 BLAKE2B bc934740af22dbab5d90adb4e35ab38c32b160dfd5b17f3282d578ebe04caa7a265a0913f1aafa4f34dba05f6a4b2cb0939fef3465c84000fcd7adb9b433912a SHA512 7ab41100fa1719f429313434229dcdd8d0ff28d66e6138da3fe58a699ae8ca1724790f3aaabbe8206935eb5641f3793bed34c8650a9bcf4a4378cd4dd6da73b4
-EBUILD kdesdk-kioslaves-18.04.3.ebuild 375 BLAKE2B 8df34029202846d40886767b498ad131fbfe88c9a002f50c7b7bee550aa2f9d527ccf52d4d3c4ff4772457ebcd6cdae914030cc4428e9740639da9cd2e8d3c94 SHA512 99cd80231159521eff93142152fe52833f8f36d0678f4ccaa9e85522a34dd77f1ae5b1070d527915ee34e99219d55eb61e811e4608dc40a27fe8c77177152488
-EBUILD kdesdk-kioslaves-18.08.3.ebuild 374 BLAKE2B c7560aa6350671cdc9935ce0cc240b5ccf37c807f915819f6ffc14a682f7dc648878153796613be13c34c45f6940fd1058b2c57cf931b5b42950a2c4bf420a3f SHA512 b35fb0567a57e687cbf2fa96b9ac1c03584d51454e12068c6bfccf7a414b09c5e076f3bbcc147c8007876f010789eca30509246ecf7c6a9418006daed761b501
+DIST kdesdk-kioslaves-18.12.0.tar.xz 37272 BLAKE2B 868f00c96bb8c86007e64aa5f9df1d74224db04a4bbc9af9c8286a23e8d97fcb77bc3fc17b96640da3db49601fa9f2b2eea391ae60e7a5f61eb1594bf5bdd592 SHA512 3076c34777c7b463490d5f56d771b16bd211eaea01c8b8d3828f625ef607f16494117756c62459c4ec32809c36d3a94f22b5f5734c50b9dbb140f30a0788e81c
+EBUILD kdesdk-kioslaves-18.08.3.ebuild 372 BLAKE2B 4d5a1ed99f22527345fed2dae29a39b4406e8348eafc552ff2e3ef1b2bde159e1fc499548b88a321bb445df383d6d61cedf2e14b7737464a3b09a6fb76790002 SHA512 2863343be9e4ad505f1633cf343f7d653761d1f289411f11fc2d4b1988bdd72ab227acbc81b23c0a7514d7defb2abb04a2eafa72d581e61f49999ca7fd13bfaa
+EBUILD kdesdk-kioslaves-18.12.0.ebuild 341 BLAKE2B 593b992ce595803d0258381b888897c530085db88432e32ea092a1cd53d7c142669492f2839ef0bb48d779f12136b83c190844c8e57386815636d0513264c115 SHA512 4f3e7758fd84efea4b621d52343337da6f7381edcc26af1a675165e3cd496b9de5bcd281e8818ec560120bd7491c6efa53d3a0d52858ecd5385873980ea5c1cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.3.ebuild
index 082adced5a34..6442442cc6b1 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.0.ebuild
index 2b720541e5a0..52fabcd3cb57 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,15 +6,13 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	$(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
-"
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 4a5e1be60639..4b24c090aa8b 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdesdk-meta-18.04.3.ebuild 787 BLAKE2B ef971af318c8bbf0bc0831ec896eff1c866e1dfe4366f0b3a046a13930f5ebb6d8bc7091ddaa93516044610ea47d3ba24bb826d485ce84254d1e525ae4868028 SHA512 69534d2fe222ff9a01b50c616d878643c4b8305332b7a78a5494006d2c2bba4d491ead1141627deb8923330ca951d786dfe6bddfe3c5de28d6ed3ae1fd27daf7
-EBUILD kdesdk-meta-18.08.3.ebuild 806 BLAKE2B b3134ed6d37b82a353f5d7a4ac35f9edfae0f61eda5cbcf50049d9c9977f03bebc1e873216a7695eee75187ef9c26ecaa564c5ad35a4c655860ec207a7cef42d SHA512 838927c369d50ae2d0a95079ac01aa0290b4f1ebcb2d699d42591b041af32047027152426ba5020be39a948e70441c3ea63b574f85501883f31f35cc542206c0
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdesdk-meta-18.08.3.ebuild 804 BLAKE2B de68e25ff1b99161687352d20d31732fcd0e1c6d9d823cb4e93caadd2395f3869e65ddd67d53330991a33446a36fafd545c032f08f9837ee223f7506720645ee SHA512 21c8ef1fe9043d0d678d64e9d34ed81f933417548b83e72226dbf8641bd6c3641843b9b9107040f4ba9863d66ec33afa11b2180744a80c59eebbd7e8bcd7be32
+EBUILD kdesdk-meta-18.12.0.ebuild 1141 BLAKE2B e33d3a65f2a55bd013711a8cf8c7d629b74aefa5a1f2197b9824fee8518c54a2900820fd86d9cebf02b74faf8d93b4d62baab7e53db17a6bef99c7fad8f838ff SHA512 69b69e4dbeebb0e12bb61c353a7534b8c7242fb25bb07d769fe21b47644d643e9615b551603bec8dc61edba086866123431c4cbe9518dea69eccc4887a5e3fd7
+MISC metadata.xml 831 BLAKE2B 3ff18fb8e3bd5dc045b904b841e1ed10639381802d746be424ec00dc40e3119fb6f3c066f4706aede87b1e659f4978c6b5a573ead33851983db01cde8d54d566 SHA512 138c632546c3860be6daafdf94c969d2c55e837bb2da18c112d5835511018399ff180ef3417727264899fddbfc3291845420df37c60853a6c9d6b9db5b758349
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild
deleted file mode 100644
index ac85038b84e3..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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 poxml)
-	$(add_kdeapps_dep umbrello)
-	cvs? ( $(add_kdeapps_dep cervisia) )
-"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild
index ce489a02766c..4f3f3652a3a6 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="cvs +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..b2166bb058e4
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bazaar cvs git mercurial subversion +webkit"
+
+RDEPEND="
+	>=kde-apps/kapptemplate-${PV}:${SLOT}
+	>=kde-apps/kcachegrind-${PV}:${SLOT}
+	>=kde-apps/kde-dev-scripts-${PV}:${SLOT}
+	>=kde-apps/kde-dev-utils-${PV}:${SLOT}
+	>=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
+	>=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
+	>=kde-apps/kompare-${PV}:${SLOT}
+	>=kde-apps/kross-interpreters-${PV}:${SLOT}
+	>=kde-apps/libkomparediff2-${PV}:${SLOT}
+	>=kde-apps/lokalize-${PV}:${SLOT}
+	>=kde-apps/poxml-${PV}:${SLOT}
+	bazaar? ( >=kde-apps/dolphin-plugins-bazaar-${PV}:${SLOT} )
+	cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
+	git? ( >=kde-apps/dolphin-plugins-git-${PV}:${SLOT} )
+	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:${SLOT} )
+	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
+	webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
index 2fdbf33d963d..381989d26259 100644
--- a/kde-apps/kdesdk-meta/metadata.xml
+++ b/kde-apps/kdesdk-meta/metadata.xml
@@ -5,4 +5,10 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="bazaar">Enable support for Bazaar VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-bazaar</pkg></flag>
+		<flag name="git">Enable support for Git VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-git</pkg></flag>
+		<flag name="mercurial">Enable support for Mercurial VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-mercurial</pkg></flag>
+		<flag name="subversion">Enable support for Apache Subversion VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-subversion</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index fc48d9bdacaf..5f3f397bad41 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-thumbnailers-18.04.3.tar.xz 17140 BLAKE2B 0d25308ec6db0722d971f888fd412677411d223998ba810830e6b20194c055d71f12bbfd48987c1eec677cc00fcdae40db944ec096902250eb087055195d895c SHA512 18e3518fc66fc9d23d49658cfa916ad9080547e0e57899ca66eb4f87874d9e957b0620965464a683912784d6966d8b950f17ea2ac80ec0024e7d7a2c98f509ec
 DIST kdesdk-thumbnailers-18.08.3.tar.xz 17336 BLAKE2B 7c4814cd3159b3ac8f97648e84880f57e77a3a90360031e73e2ce21520dce3014025f5a8295cf17d283097e9734b33f6f21b8153551fdac0162fb5f5fc3f0773 SHA512 22995f512f43bd09749d8a071928f262471eae5817ff62f50e3343b8d68ae963861d59f8b97e27ac851d699eb2b05e43618c4059e83f70f583b3931be7b75731
-EBUILD kdesdk-thumbnailers-18.04.3.ebuild 428 BLAKE2B b1487995dfe76b2153c1ce5a8cb91165f9c26b4d92026b662e07c99a792b98dfee71fb2a449cff6170efd6b28eafc35f10e1b66f4fdfe9217fc48c924a96a104 SHA512 0b08e749f42ced5d342bba47dc64a59f5627bd23313b1ddc0ed38f30c6e2804b5827234c6f9335a6f9ae6af61d9e94ea4da5f144719f62addbdaeca2958a3ab8
-EBUILD kdesdk-thumbnailers-18.08.3.ebuild 427 BLAKE2B 84a4e2dae97eba1ae13ca2dfdd31b5df1c81ce7efca03b9bad96eb45aa3c8d23aad8d27fe0e1f22b278347808d4eaf03eee09073192192fa604521cd454892e6 SHA512 d2860b1280e8a9e78cfa26adfb7f6483ef49547be8c6cf9b9e78a15ecbbb97ca01987c543800469b803588f798f937262bc837c76b2b319a59ea6968541a0c46
+DIST kdesdk-thumbnailers-18.12.0.tar.xz 17268 BLAKE2B 33b4ac1e6ddcfcf8b2de9381c53a6f704abd56322a59098d079cc3e71272d7b49fef30cdb1b7bd684699e2adb3ca4cd20c28c24796e169d6a17a15ac3134790e SHA512 f0d35bc67097d3596966de442682ad30ad9e04cb3d446d42f7e2bcf81fc1bf0e827a89bf5247a4373b45567620f6d3c6293e68f909c4a6d15100ad489ffcf8d2
+EBUILD kdesdk-thumbnailers-18.08.3.ebuild 425 BLAKE2B 77c823ae12793eccce1d9960a59993bc62a21fa83abb1c35184fc999a92930472098c500ec143b0bd95e345457716bb8fc9f7ef1bbb04b7d3e6c4204f4977a9d SHA512 738ecd698d64f37687533985a9f88d7abe6c783ab1e606eae2d65bed2bfab033b114c90e904c35f2b07f10975f97f9ffae2b5d0e5cb423e75b2d931c697c26ee
+EBUILD kdesdk-thumbnailers-18.12.0.ebuild 427 BLAKE2B 84a4e2dae97eba1ae13ca2dfdd31b5df1c81ce7efca03b9bad96eb45aa3c8d23aad8d27fe0e1f22b278347808d4eaf03eee09073192192fa604521cd454892e6 SHA512 d2860b1280e8a9e78cfa26adfb7f6483ef49547be8c6cf9b9e78a15ecbbb97ca01987c543800469b803588f798f937262bc837c76b2b319a59ea6968541a0c46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.3.ebuild
index b4204ac9dba7..40234f14e356 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.0.ebuild
index b20e20f0bbba..b4204ac9dba7 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index c914e733126a..f9fd86152a5e 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeutils-meta-18.04.3.ebuild 808 BLAKE2B db0af0cdceff2e6d3012637829d2cafbb9c931fde649b74d996deb9eb0bdb732a979782b41bec1009b360dde2f5dfb6d480588e347b9b3c920ebad43c09abbf8 SHA512 661a80f10cbc6b4cb249bd077640bcab21419278a11a0ea3f7eb46b6e0b114d0947d542d6d93c4300de31d20a3721b8e8d5e4601d8c43b19f17a9e711c5715ba
-EBUILD kdeutils-meta-18.08.3.ebuild 807 BLAKE2B 28d1bc2ecb6cb3c4dd2e05888b2f1ada9c85d416b85dd56e823c2d68a80d6fad2472586848a14165e32e1b0cf7a8e75919cca9209a94610248f9f8b2f1fd1947 SHA512 c0c8359da2dbae62d08a8cc9c3c84a0e29473521e6ecf0a404164686171ea0621402ac572902fde50e2c2fbd820cbcd11a80962f17ab0ecf93d8c52daa84dd30
-MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
+EBUILD kdeutils-meta-18.08.3.ebuild 805 BLAKE2B c31bb07b92ebbca7801c59dcdf286030a33a9b05d9ac5c68ba9e783c1fd72d1338ab247f043449c8f2bd0f917204964b15842e2fcf637a774af50383c84ae00c SHA512 6be922a9d5b1ebb444fcdb1169b6c4d312a75936a9d11838bf87f5000a786c4136156a53419380a20b944dba67a63fb6223da06cfcbf03f7e23df35f1a77841d
+EBUILD kdeutils-meta-18.12.0.ebuild 1133 BLAKE2B 77777e7a283d0724ec55a81c901306005061138221f7375e672b782ea84270a108a003849e35e4cb47a5958161a348ba8cd9d66926307af283989263fdc17261 SHA512 94cd83baab6ee7eb9169f045cb487a5b4f4bb78e638ecf8749e113340e107ebbb91763b8138982426b53f3a5802f0fd9820793188c3ff2dc8617624781fb2998
+MISC metadata.xml 752 BLAKE2B 44ef1551929d69e70d5af562ca212c8e2498ff26e27e38d718a2ae0a2499a002c382cdcef6b51a6273d2c372174509636a5c5bf705b2b60c31dc4e7368727a5f SHA512 35e4ed0057daf09428e123daefebbda024445d4fd324d813a95d1ec1f135b90bf7380ec3fa5553fb13e143194b9d61b82fae2bb16ed33757da6f8dceb1d4b27c
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild
deleted file mode 100644
index 71710fad16dc..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.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
-
-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 kbackup)
-	$(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-18.08.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild
index eee02d6e0745..b8382ba37654 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="cups floppy"
 
 RDEPEND="
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..ea86b513debe
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="7zip cups floppy lrz rar"
+
+RDEPEND="
+	>=kde-apps/ark-${PV}:${SLOT}
+	>=kde-apps/filelight-${PV}:${SLOT}
+	>=kde-apps/kate-${PV}:${SLOT}
+	>=kde-apps/kbackup-${PV}:${SLOT}
+	>=kde-apps/kcalc-${PV}:${SLOT}
+	>=kde-apps/kcharselect-${PV}:${SLOT}
+	>=kde-apps/kdebugsettings-${PV}:${SLOT}
+	>=kde-apps/kdf-${PV}:${SLOT}
+	>=kde-apps/kgpg-${PV}:${SLOT}
+	>=kde-apps/kimagemapeditor-${PV}:${SLOT}
+	>=kde-apps/kteatime-${PV}:${SLOT}
+	>=kde-apps/ktimer-${PV}:${SLOT}
+	>=kde-apps/kwalletmanager-${PV}:${SLOT}
+	>=kde-apps/sweeper-${PV}:${SLOT}
+	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
+	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
+"
+# Optional runtime deps: kde-apps/ark
+RDEPEND="${RDEPEND}
+	7zip? ( app-arch/p7zip )
+	lrz? ( app-arch/lrzip )
+	rar? (
+		|| (
+			app-arch/unar
+			app-arch/unrar
+		)
+		app-arch/rar
+	)
+"
diff --git a/kde-apps/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml
index 2061e1b7f6f8..702bd89bbd3e 100644
--- a/kde-apps/kdeutils-meta/metadata.xml
+++ b/kde-apps/kdeutils-meta/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="7zip">Install <pkg>app-arch/p7zip</pkg> for 7zip archive support in <pkg>kde-apps/ark</pkg></flag>
 		<flag name="floppy">Install <pkg>kde-apps/kfloppy</pkg> to format and create DOS or ext2fs filesystems in a floppy.</flag>
+		<flag name="lrz">Install <pkg>app-arch/lrzip</pkg> for LRZ archive support in <pkg>kde-apps/ark</pkg></flag>
+		<flag name="rar">Install <pkg>app-arch/unar</pkg> or <pkg>app-arch/unrar</pkg> for RAR archive support in <pkg>kde-apps/ark</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 38a23a3617a5..9e4bf433c902 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
-DIST kdf-18.04.3.tar.xz 531604 BLAKE2B 2fb097444f1bc5eb7e7f1a31e3fc33f68f96b4a37d095640719fe734a6cf7e768e66f609395b3aa3c4d1120506da268d60aa6e56fdd4d0ae6bbfa3b95d4d428a SHA512 60d79b85ea9432561dc2cbd9a5f1ccd986fe8bf6fa8d8d0d722ab3e1316013d4044731ed98756441bdf5e56f91bce46d5496bc53863e74c0b5e456b0412cb3fe
 DIST kdf-18.08.3.tar.xz 556520 BLAKE2B 126d472066ca2d8727b9332e961a07d3187609139b90eb9e659e02f8300c95d62eea0d6ef18e60965cfee84757fc9c3c161018620e0db2d414b9dacfb3bd0704 SHA512 254fce406169797cce36be40d6507a7a4e081073926d7861a091abceaa4aabc0b0a00ac47172a990830bbb7981efacda6244958d783733ed160b885482053b2e
-EBUILD kdf-18.04.3.ebuild 723 BLAKE2B 2cd42edaa2ee679b03d8557f41d0751eb21363e51383ba705ad10269628fcf602425cecc819004cc22e0635a3f1e0ff71c9807db6109afff199def42e8458be3 SHA512 c3d2ccc31530c8902ec386e9c7e0f91906cde6cce2b9702e44cbb5dd71c3a9b40b13eb679f11da1c90436f5eccb13a7bcde0ba5f14f869858e0979bcb8a38885
-EBUILD kdf-18.08.3.ebuild 723 BLAKE2B 75dc896d8b37e0bd56213accfb15ff4f4dc87ff5f5772ea472749fd5b24194eb46c45f09657caa0ff5ca71634205e1e7d70a31adb93c5b7f5f04fc779cd093c9 SHA512 75bfa39c7aed33a6251d2e641bb62413f10f64139256b4e42334cfa6224fcf65407d77adcb18636bd079ae944bb3312e3d8cecf7d609187ac6b7233cba1172cc
+DIST kdf-18.12.0.tar.xz 556404 BLAKE2B 2588b66d9cd92f8df30fe2c70669dfb0f8c3c3e7af9c08cf5d8c20a9c26454465abafe076ab693dc25963409fbfed62fd3c155ffefc12fa21200bc50b21d2bab SHA512 f8168f3a3e3eac154b8b4b54e334465689a3293ccd69fdbd4b339822b2255085c6ac4e07f38d0c68bfec5a9ab20b76195320b2a2d8e087b0521fde54fb733c48
+EBUILD kdf-18.08.3.ebuild 721 BLAKE2B 35eff2ef8203691339967d5dd4a522e64c870b36ef320cd2907618c4c6a9e889f1261b816f744d1c60fd5981746be65cfb8d0347978306551f91393a96884d63 SHA512 ce174668829c6ad6e60abc21bca72f61c6665d1e15a7be84f661f8754c389de6396541085d00215ef6a100aeab5d212cfd720220e38613063827c401b742c70c
+EBUILD kdf-18.12.0.ebuild 723 BLAKE2B 75dc896d8b37e0bd56213accfb15ff4f4dc87ff5f5772ea472749fd5b24194eb46c45f09657caa0ff5ca71634205e1e7d70a31adb93c5b7f5f04fc779cd093c9 SHA512 75bfa39c7aed33a6251d2e641bb62413f10f64139256b4e42334cfa6224fcf65407d77adcb18636bd079ae944bb3312e3d8cecf7d609187ac6b7233cba1172cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-18.08.3.ebuild b/kde-apps/kdf/kdf-18.08.3.ebuild
index 5d3a9930cdc4..94e92b273eee 100644
--- a/kde-apps/kdf/kdf-18.08.3.ebuild
+++ b/kde-apps/kdf/kdf-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE free disk space utility"
 HOMEPAGE="https://utils.kde.org/projects/kdf/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdf/kdf-18.04.3.ebuild b/kde-apps/kdf/kdf-18.12.0.ebuild
index f6d3e402d3bf..5d3a9930cdc4 100644
--- a/kde-apps/kdf/kdf-18.04.3.ebuild
+++ b/kde-apps/kdf/kdf-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS="amd64 x86"
+HOMEPAGE="https://utils.kde.org/projects/kdf/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index f8d5d78d091a..cd96832a3c2e 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
-DIST kdialog-18.04.3.tar.xz 96444 BLAKE2B be1a2603dbfe870245ab97f5fcb2c4e59529830a33be9d3fac38bf6e1c1f3c9fc0a6869210a055e89564ba5e8dff46c0ca2c464d6951ac94b4e1bd65bc3b74ce SHA512 a6dc04a0faa75642b919eafc78a67c36a976d98981bb624e39ee6f41e193ca8dd32867e56579caa7f28ae4ce40c32a3191ce357d139df83f13ba2efea74140e6
 DIST kdialog-18.08.3.tar.xz 96792 BLAKE2B b08aebea2f35b2421a6b2341c287aa3c25809e1f63d5c7e58a155b106f4ae18ae6eb467c27503d8c2a5675aebef7aa5084d7cafe34167140e1fdcc86acded419 SHA512 317edd5990bbb877ee26c1d20e8a8845955863dfe02d81280d53c2f0173e0d725cb5b3f6b1f6de28cc94759f81365639f6f6cffa742ea1d1ab7f82eeaea66505
-EBUILD kdialog-18.04.3.ebuild 835 BLAKE2B d1530d890374d6a94b326c053cb83f3bd834e9a1447aae26877096cc997bf4ff4dcca7fa80d2122b32e5a0006e73e8e02c2ae1821af62e7f89aad286e20b2bca SHA512 801f9facb90bcbb670e3c253e4e308b1c46f17435fdc5306170d3a54d744393e8552b9428e313310fdd85ca5b122c99c92b87ec83ad95adca7929b8b0f87a96d
-EBUILD kdialog-18.08.3.ebuild 834 BLAKE2B 4d9585b2be852204edcd5fe7e2a7f02ca7af6aabc06a042fb4ad8d04502d7554f60df304461b8f8299ee0f8ff1e7cea47e788dc32b8071a1120acda476983b6d SHA512 9890812767bb4b928f7f38c5ac1256d91d6d67085b680cecf4e2ea2116c84985f91e8b31604ba45279ece081d7a12a51165db156650b166ac996c00ece72a0b6
+DIST kdialog-18.12.0.tar.xz 97388 BLAKE2B 8302e1e61ea473551889a6bda8b4086f70363bbf0a8d2e1534959d5407306629a21971eded3ae2d4a13eb093970e1f734d2c9b61b76e4dfdf010ecf215ed3187 SHA512 23364a48e74d1bd8e57477aa1d9cd635a764aedf5d0e7ec045f786a83732fdb1ae391666ac5635dbce87861ac429401a5debb55ecefef2e84e82ee51df8ebdb2
+EBUILD kdialog-18.08.3.ebuild 832 BLAKE2B 09b6aa8351d72f2ccca35f9991f341c3528a35e87a7f20346511fd4e0c0f8ce5a1af723e5a1664cb1a3fdfe669760720e8769280cf761004c75c7bfba0038373 SHA512 b80f8236749a2d38dcb1b04599934ec397a38eb36a5e9ebd3984a05fa4be2158ef812ab0bc1cf27f33191eaf9b3b035f783ddf1fa2d473d509a3ac7eba281bac
+EBUILD kdialog-18.12.0.ebuild 834 BLAKE2B 4d9585b2be852204edcd5fe7e2a7f02ca7af6aabc06a042fb4ad8d04502d7554f60df304461b8f8299ee0f8ff1e7cea47e788dc32b8071a1120acda476983b6d SHA512 9890812767bb4b928f7f38c5ac1256d91d6d67085b680cecf4e2ea2116c84985f91e8b31604ba45279ece081d7a12a51165db156650b166ac996c00ece72a0b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-18.08.3.ebuild b/kde-apps/kdialog/kdialog-18.08.3.ebuild
index fb1dfdfb4775..7fb95d3102f7 100644
--- a/kde-apps/kdialog/kdialog-18.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdialog/kdialog-18.04.3.ebuild b/kde-apps/kdialog/kdialog-18.12.0.ebuild
index 98be1678a251..fb1dfdfb4775 100644
--- a/kde-apps/kdialog/kdialog-18.04.3.ebuild
+++ b/kde-apps/kdialog/kdialog-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 9e15fe885d30..cb85b0c465f4 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
-DIST kdiamond-18.04.3.tar.xz 4607668 BLAKE2B 5f0a344297310e7d376730c87750d1d29fbee6d56fa8e2aa3098d14424f66b4a99268ac5a375dbe89e66dc6bd48992eb5d6f373e96673fe51578e2e3b02847e3 SHA512 05798ded8fd034fe4f8829fa1a57ac60b579d8215318ad4707527536cc56d5a0a5634eb7b5634abfab9c070774278efe26ead9a1708f4958690d58c061a4e3bd
 DIST kdiamond-18.08.3.tar.xz 4718708 BLAKE2B 58061d3e55c0bd095ff70bbb085948b9dee3e4ac399c12030d03cac408cbe5eac16c0e2d2e5d6c1e78f78931f1c55d463fefc50fbf3232a9f32c77ff3f540c47 SHA512 87394059c0dcedf9a46f21bdfa537e5ac9c55b58b405e1d12fb737ddb051233c2ff8f9dd211dccbd369a4264cc05a2bdd02a77da90b52669a6eb451897a49ca5
-EBUILD kdiamond-18.04.3.ebuild 789 BLAKE2B d3c9f7a689285fa19ca4a69867de48ec75c3159cf478ea9f6a65fd6fb2f1c411422f6c34548cf3217a3ffdf1b66221f6ea1861527696bf8f0848cc68d15a7793 SHA512 2ac9033bedf4e831528a6998b77f6f02bcbc453648a9dfa2a4d564cc4c6d0bbc9ad108d171d79b722245daeeeb89395bd16860676d74d0561544e24e48cdc47b
-EBUILD kdiamond-18.08.3.ebuild 788 BLAKE2B fd9ef2ff3a51f66111f077c617906f8a2f11dda350a638704bab6054bf602b0376fe72de33060e33baff55036b90ddf0f86d4b5652a4f56a463ee303a27ddbc8 SHA512 b7c747d82b8bc8e1ccc8603b8197e6106f6a3a1ece136bc7ca62eed596ce1ef0628c6da42014a9dd22628c8dc0f970d27458e4d4f928604349a74e1516ac4566
+DIST kdiamond-18.12.0.tar.xz 4719436 BLAKE2B 58fe03501d36150355a9eb25b9a134e4511ed6f48f74a5d7cad2a21f5498029a4bc8199356e95207882cb5bcc03c0e0c94d06d116c643371234a2673e1aa7fa6 SHA512 0f4401e70432f0af1a354a4d211f132e43a3909158cb282c950abec664b4bfd030f6a26ab0d7cab3bd8f64b94092d55e9446041023353637d0fd70420eca617f
+EBUILD kdiamond-18.08.3.ebuild 786 BLAKE2B d2889332b8e5fceb8acdeb23d8451b4d5c91d35434cb1e096e7d02031ff278f7204e844cfb8960d1a8959c307430b35fc9505d142e8f130537cb6078364a3795 SHA512 81015e3bd02e46ca835e885b1e08581e8616f3277a79bbfbf5f471dc457700547b1195fa24439910cab4e9948e08407fd9bd792b3e993f2446c51d79f5800b49
+EBUILD kdiamond-18.12.0.ebuild 788 BLAKE2B fd9ef2ff3a51f66111f077c617906f8a2f11dda350a638704bab6054bf602b0376fe72de33060e33baff55036b90ddf0f86d4b5652a4f56a463ee303a27ddbc8 SHA512 b7c747d82b8bc8e1ccc8603b8197e6106f6a3a1ece136bc7ca62eed596ce1ef0628c6da42014a9dd22628c8dc0f970d27458e4d4f928604349a74e1516ac4566
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-18.08.3.ebuild b/kde-apps/kdiamond/kdiamond-18.08.3.ebuild
index a71a0d2bf9c5..950ad50e887d 100644
--- a/kde-apps/kdiamond/kdiamond-18.08.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kdiamond/
 	https://games.kde.org/game.php?game=kdiamond
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdiamond/kdiamond-18.04.3.ebuild b/kde-apps/kdiamond/kdiamond-18.12.0.ebuild
index 9c5edd274d08..a71a0d2bf9c5 100644
--- a/kde-apps/kdiamond/kdiamond-18.04.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kdiamond/
 	https://games.kde.org/game.php?game=kdiamond
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 093a0920b1f5..0a7c4aa4e9b9 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST keditbookmarks-18.04.3.tar.xz 183956 BLAKE2B 5baa0c62b32710ccc4047ffe40fddd587c8c2be86e19029410be7d5ea0b6510d929fac32a2e2764527650c2ed3a741ae7a2cf634568da58b7c42994ba3f2d42b SHA512 e9f6b54efbae782ee18ae428cc2c4a797cf95fd92a88c4a8aa610449d6b71864fd226d8e50cb4e3c81309e5048210ace13f55b4a592aa455379aa2f215a7eb55
 DIST keditbookmarks-18.08.3.tar.xz 183900 BLAKE2B 0edade2f84cd16237a8864612c915f17bf9d286bf05435f81d9cb10fb8967bd5d6d2b4ac966d3a05861487b1694cfe90736a6d84fd47218f6b8e33f6f5ec0eba SHA512 13fe3692ab128dc2af9457cecf64351e6e9c5dbdd0607552a8008b46e58434b8d0dbe9cc59b53036edf9c8e6ff43814cc617abefc078a975924919a9db33eef7
-EBUILD keditbookmarks-18.04.3.ebuild 1011 BLAKE2B c7e602a87e3a8c4b2d24670c70fac2603e67ea23dcb7face912e902d968f0fdd8f6fa35b364a20e8736cbe13918a2f3b82685cab68dd5c2a783d8c97ab9914a2 SHA512 62ab8d13685bef04dfaf60adcda07034f10212bfbafc11d27b2161d275e69ef00cc338d4f25eade629da6e7fc3564965e597111d8bdcab2c849675f1b2f14fa6
-EBUILD keditbookmarks-18.08.3.ebuild 1010 BLAKE2B ca450a44c6c2fad2b8164707e9b7fb40a00aa874faa6115093fcfd34ba808c51ad2a26e4dc93e370b8f773f434cc389a2cc7527d223877c8c2e22ff67a138e8b SHA512 04de323e1fa34b5f72a95b7b92b3f579abcc87f339e26cab9f596973d25c9df10d0ea348bced14f7e6afacf5a0a9da9e59bd4112f5db30af2c4f971b549c2d0e
+DIST keditbookmarks-18.12.0.tar.xz 184712 BLAKE2B 4aedfe6d2a00326d1e6ea1a7858dde6409686213950332445149aba0bb36ac47d8999592f2b5198fe5fa2ddca7dc9589e40e724b51ffb8558a8e28ae751f731b SHA512 b0d4cbb8d25c9bd13167fd6fbe995758b64e190de9c21f1e1ba0de6995ecdc8669be0d6e90429ec2e9d1ba85b19fcbb9e3b44653d616402c7371bdba1995319e
+EBUILD keditbookmarks-18.08.3.ebuild 1008 BLAKE2B 4dfbbbb756d2c212ead5e6b5475864778778878bd841349770db99cb290277ae99c65f6a6b5bd0713b608f91a0f2d0e378a3d91406d14959b132f56c3eea5123 SHA512 fa27f0ea85a4ecad71fc953d0db8e640f67507e6e5606af3eff3227498c054cce6a3b9bff485620f9e88a3420cbe0b826e39fe6c60d7dfc7d664ecb0577d7663
+EBUILD keditbookmarks-18.12.0.ebuild 977 BLAKE2B 760437d6da0215bed73822f849606d6540c77bafbecf426a88fdf366b20cdde38fc441968642e59f8569b891b0c67c8f73bc4e036db37a82dfa83010bfa8f718 SHA512 18f06a09d753b21cfa944f8eb385198a67cea4266d27599f7e5254a8a2113176850c219dceefbfae83c77230a32797041cdaa1215a15baf5ba096e916c2dcacb
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.08.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.08.3.ebuild
index d3dd288fa4ca..cd32084ec73f 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-18.08.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.08.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.04.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.12.0.ebuild
index 3d8ffd21aa07..da45600d2ad6 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-18.04.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,10 +9,10 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+man"
 
-DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -31,9 +31,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}
-	!<=kde-apps/konqueror-16.08.3:4
-"
+DEPEND="${RDEPEND}"
 
 src_prepare(){
 	kde5_src_prepare
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index b1d887d669e9..45835c8f589e 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
-DIST kfind-18.04.3.tar.xz 210064 BLAKE2B 1d158d79ebb985ce2ac0e0182c01495a0d94cd7c1964aed86330cf8a992a9a000305021b15509a5bf04fb1de67875aa89dfae12de52656df26106c4328d243b1 SHA512 04e055c67256ad3f25b60ce2aec12f11ab5201e92a5d091d9faed6ef395ac129108cf8108c3cb413ffe45104aa4a1f59fd3e89ad6b32f6f8b4107b52aafefb4b
 DIST kfind-18.08.3.tar.xz 210136 BLAKE2B 0ddbe718149dcafc1c2ca827ece20bafbeb5a13be4dfcf276179b53bc932deeff600b9e51a66f9ca908a70bb3b56b4b90ed40be38657b6ba26ae3b4f4f6fc5af SHA512 f0a8b1b7792ae3d72039ede7ec07c75269f141f168850b3a2b2d40b22ab1fba1c41a1c50a232f8431f2864e128c97a675910e6a51c6a7fb9cad942e057a349c9
-EBUILD kfind-18.04.3.ebuild 815 BLAKE2B f29da02864449f73f5813b4725ec8bfd45b44c9a53cc43158414fece8a32de6c676d5fd417a10b25b16d022a9f9635eddd1cef953084076c4a32bb71c3fa4b8f SHA512 cd0320f7875dcd3f0dcb3ebd90145954a3100bfb7de3247e74c18a8df63717696413bddaab1363214e29a43e477e3702543125b58bd98c3f3f455140be8990d7
-EBUILD kfind-18.08.3.ebuild 814 BLAKE2B d08ceceaf295046b34e7fb346ce64cb01d8025f9937322e651d0d4896ca43bbc1edea1110a49580f2a0d23fa4c7c5b5b1c629045c4435b19e1425a449e91c493 SHA512 896fcaaea9d2191b2c04d421a445b7f6b57a665597b2a4ca6163a46c8a6c1b1244f212657f2bcaa89683155880059f3e931ac37217f4d77d7e9453f4d93c0918
+DIST kfind-18.12.0.tar.xz 267448 BLAKE2B 50824f8f35a60eea59bed92331f6a130b8631be1eb97260d7c4bdeef94b008d8c723bf686b50a7290bde7adaf2bf2c3406462395b416d073d2f874e64271d430 SHA512 da53d96d5cbef57cd91199e6e4ecce9e56b41da2c81ac55fcce522c56064f54c66f040a1a78beb408c2a0de72a03457fcd781e94dafa3ae2a3e9277cbce0dde5
+EBUILD kfind-18.08.3.ebuild 812 BLAKE2B d91bb804ccd2e869403efc53f48bab85329c123a6c12f4d6d17bbf23103f080bfdc5eb1625a12752a2173e15af1a85d6c9f8a3ae9b9f9c9cae27a3427e559dfc SHA512 cfe236d467f12c153a2a311f7512e55bb9d0348b6efed0be6be06fa0a8986898e3f8c298cdfc4c563c704cc2411c754145cd3d3dca29160420e07011ea1af1d2
+EBUILD kfind-18.12.0.ebuild 814 BLAKE2B 05b3ad4eb4999621ee30c21204443877161cbe8f547627aad838c0659a5da5cb421c994f2a75ab3f10db18ee5c85d2ddcf787d487ffa77f94f01cfe2c5172029 SHA512 283fa13bef3f989099bb3f7c68e2cf40e79002892ec4e3f056046c0f6a3ab38b4a2fcf777e527be332c049c25ab1996fbaf205d289acf7bbe3b72fe72dd7e930
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-18.08.3.ebuild b/kde-apps/kfind/kfind-18.08.3.ebuild
index e6c4c240594c..b7944aad8e01 100644
--- a/kde-apps/kfind/kfind-18.08.3.ebuild
+++ b/kde-apps/kfind/kfind-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="File finder utility based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfind/kfind-18.04.3.ebuild b/kde-apps/kfind/kfind-18.12.0.ebuild
index c539e0f68080..e4bc91c6eedc 100644
--- a/kde-apps/kfind/kfind-18.04.3.ebuild
+++ b/kde-apps/kfind/kfind-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,24 +8,25 @@ inherit kde5
 
 DESCRIPTION="File finder utility based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	$(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 kfilemetadata)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 041458e5d8dd..a1e05229104b 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
-DIST kfloppy-18.04.3.tar.xz 199896 BLAKE2B b71413634da0e4a03d0236573bd973c55edbc10322aa57807c1148138d73f8a121bd481e0e2bb265f871aba9636a6a2b7bb9a249a8e0cde12fdd0c4869fc469b SHA512 4bdc3541bdf3e817840e81b11ab1878d71e96bc7eff2e3fe53d2877b0956588e0ec6cafc41b2661064a676e4e08c0de4c744d97146fee7ae0d3379f6850eb674
 DIST kfloppy-18.08.3.tar.xz 199692 BLAKE2B 0ec4b901f790eb83f7a11050d78eb8c734d01c7589733e724fe365b947e2fd4081e3812586cb019341f5bb787974546e94ddab6f99e9ff780b5b387c1f743b76 SHA512 19d006fa5497a896673138c002333b77cd08a7a46425d03e62484940ae8a16e233d5fbce44d2951f0afbcd9e32cdfb9887b760f87bd9d00d093cf8ec6ab697d3
-EBUILD kfloppy-18.04.3.ebuild 751 BLAKE2B 8b20fa977aa4e17b58157a3b469c54c047705a992ddc884f45b3b9954cc678562df906bb7eaafd14d0f3e129988bf586918b2886076adc93180e0f04b134a9c5 SHA512 a4215b6c1d1ef610c17327f070e8a1ef4823855a0cd817e88b9d2974ec9f0acd8b7aa6f83f7bd5b6fdaa1d4d5f9da1495cbfa076410898d192e6e5fa0297c1ab
-EBUILD kfloppy-18.08.3.ebuild 750 BLAKE2B 2aff8323dd982d24403b0b85c8fd57468522a7680c2eccf07646484eb76a80daaed341b03b78c2c403875a2c877dbd611a103ca54ac53f51e54b4ee181cb9739 SHA512 40964453d1b3df90a82fb694893aac569bc28536beee7aeaeb18794b5dd8594e273dbf341f3eea818815bdc48238836a4a292331c2d43d0a5fb8f7e3a17a305d
+DIST kfloppy-18.12.0.tar.xz 199260 BLAKE2B 123ffbf86b922cd57548101aa4fcb4e5d399c6784cb3fc346d5c6ebd68c65e0c701da8efbb1b137585abeae818ff1e96d93ce16b605f8144372e030927e9a11d SHA512 b22a66aec49132493162bbf30ba8a57cf64c7ea6d5e2694775d84d8154f07bef8cbd014c6092cdd1104ddaaa16f09905d806bc7087ba78203045293d8b12027f
+EBUILD kfloppy-18.08.3.ebuild 748 BLAKE2B 8747d79d609d68c9dbee3c857ca2ee4f542f6c5ed2523250ac07557e0a74bb89849130201ce1a34ffefb9fdabf9cd1945967ecaf12c978caed3d5b84ab2ffcd6 SHA512 6299e0482ae4b61b67cf190960f78dd3e99a92412bcc629e036524e4875166b4b28dc6c1be1c4fde3398b666ce485c31e04f3270b3bf552b53aa2e5073324552
+EBUILD kfloppy-18.12.0.ebuild 750 BLAKE2B 2aff8323dd982d24403b0b85c8fd57468522a7680c2eccf07646484eb76a80daaed341b03b78c2c403875a2c877dbd611a103ca54ac53f51e54b4ee181cb9739 SHA512 40964453d1b3df90a82fb694893aac569bc28536beee7aeaeb18794b5dd8594e273dbf341f3eea818815bdc48238836a4a292331c2d43d0a5fb8f7e3a17a305d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-18.08.3.ebuild b/kde-apps/kfloppy/kfloppy-18.08.3.ebuild
index b9b6a42b4b3b..6ebb243cb927 100644
--- a/kde-apps/kfloppy/kfloppy-18.08.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://utils.kde.org/projects/kfloppy/
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-18.04.3.ebuild b/kde-apps/kfloppy/kfloppy-18.12.0.ebuild
index 1b882c18fcfc..b9b6a42b4b3b 100644
--- a/kde-apps/kfloppy/kfloppy-18.04.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://utils.kde.org/projects/kfloppy/
 "
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 0170b95f07b1..89d12901e980 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
-DIST kfourinline-18.04.3.tar.xz 573708 BLAKE2B a6a147ba51b2c788e7dd0009f665909310c0ac9e9b296e6485e80c01cbadba98bc9d86a50057473b75ed54216ac1ec7755a53dd626336996973029ef60984284 SHA512 e7333413bb85ce817ea71dd5b12c3af5eb36147d48f2df9bd87fc83f8b975def60a4dfa17fee8836cd3388d5ac6de189f22cd2d35029764569df9773216f0129
 DIST kfourinline-18.08.3.tar.xz 635652 BLAKE2B 8b4a4bd3b81207dded9f6a5013816e264302dff763c17738f099f0ab4d9e6f04a59298f25a93d206f97cbbeb373253c5b1ae162119e24fa41988f03c1ee53179 SHA512 d7fb81034163fee2ab98b49286e64127468b405592efe18863084ead4cd5f6e8288b22df712daa57afab215c736a3f1be5f9a094e13a550bc01de583bf148030
-EBUILD kfourinline-18.04.3.ebuild 733 BLAKE2B d663c190f21719280e58c0fc51f1f5e28977c9f9ee7804980023dfb57407cd51c1ef548645413ef568197106226d75c88d45deae4e6210f947ad4d56df379be9 SHA512 b158cefe8e92b3561ad8e6cd19f490c6f1397769b6a1cbeccc216667548aa3c4fb38d7add1af2491eafb598ac7a63a562b97c9047879f7bc51ba1e541425113f
-EBUILD kfourinline-18.08.3.ebuild 732 BLAKE2B cd0fdcc68db533b72340b8d2909ed18b29796d134fc9caabd19d1a85db9dd78e27bf3a4f06557163b4e07956515c8de451fe2012f22b77839575398dec1a5f1a SHA512 02a8ebd6ec3e4beacb9cf8bde8c760f2f6d4a5871105117a9da7198cdc93e2c65c6075fdf7fe6533d8bb89b0429eef0e170c7a02af154b9ee3b85d98926f9369
+DIST kfourinline-18.12.0.tar.xz 636108 BLAKE2B 4833c0140f06aeee778856ba1b9eddc7ae56b1a34733639c293e983a423163fbb4106d4031127a989500980a47a5f77a38e4c9f28a8f9dfabb2b4e6fb1582410 SHA512 2e5152aeb47d600ebb707bf2a0e787ea60886cfdaf8dcf4e30a82e191515793903002500535db2bc3a943213b1d5a2faed28b349b3cb3ddc83dc683aed9fc655
+EBUILD kfourinline-18.08.3.ebuild 730 BLAKE2B 8adb83c3a63f3a2259aa5068478da5cac6abae8eb5878796b08390e5aa8ff0b70cdac0a4ef3fdc3bbeb8f1574f52fc498024308a655d7799e7fbee0530b15c22 SHA512 97c827c1b65a5898e68c23ab4421b0525ecc157be0b2eb211a9e06ada0281f99b41ea3d90fc9b37a5802f26250139f74ce35d058288aba6e7c7fff243bb08ffa
+EBUILD kfourinline-18.12.0.ebuild 732 BLAKE2B cd0fdcc68db533b72340b8d2909ed18b29796d134fc9caabd19d1a85db9dd78e27bf3a4f06557163b4e07956515c8de451fe2012f22b77839575398dec1a5f1a SHA512 02a8ebd6ec3e4beacb9cf8bde8c760f2f6d4a5871105117a9da7198cdc93e2c65c6075fdf7fe6533d8bb89b0429eef0e170c7a02af154b9ee3b85d98926f9369
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-18.08.3.ebuild b/kde-apps/kfourinline/kfourinline-18.08.3.ebuild
index ace085029e16..19266d40dd20 100644
--- a/kde-apps/kfourinline/kfourinline-18.08.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kfourinline/
 	https://games.kde.org/game.php?game=kfourinline
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-18.04.3.ebuild b/kde-apps/kfourinline/kfourinline-18.12.0.ebuild
index 203bd507893b..ace085029e16 100644
--- a/kde-apps/kfourinline/kfourinline-18.04.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kfourinline/
 	https://games.kde.org/game.php?game=kfourinline
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 4151d3e5c52c..14defad63c93 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
-DIST kgeography-18.04.3.tar.xz 10932484 BLAKE2B 1511abc7ade5f212faec31e1ea0afbd134edc9c0757727534a33a51bc29b21328c6bb0973010ac4f1302970e589e87d453cf3dd0c187660eb9919bd27ef1e2cb SHA512 c462a2e3a20fb12bb5583539fbe75d884a4b8f25f018bb3baa15d44054af1c6814d534bb873b66b418927a2009bc3915733828abce8e650c5f3ee752ca3d78d6
 DIST kgeography-18.08.3.tar.xz 10932424 BLAKE2B 2ee5d9ba43b45705a260c4ff8a40e367d76a0b7d6fb3ac279fe7140c1e8e079638c44d90467b967eaf81f4cd9af5ce96ea4e77e531ea39b7dcb9c4f093dd774b SHA512 ced01a2aa2c9f4245b9c62f33ada378f032c4f34977cc14e52a1767e9f19e241af980fb5318df3e064f21a71dc0e2318bf4c016f6f5a6ff512c3726f4c9aab9b
-EBUILD kgeography-18.04.3.ebuild 743 BLAKE2B eb402c1e0d48c0741540dc47f4490c42b072893c2a916f642714e63f89fd98767ae0e3ce37c88689ebaeb96881a0522f6fa1d5d7159ff0a3c8e6449886662452 SHA512 9b1bab3a408adc8835c0b25fe01358af0ccf897656cacb2be0e39257948eb9259d29477bc50da5e96038ea836e3ba0b49237080ae4331c6488e090a1499b0b55
-EBUILD kgeography-18.08.3.ebuild 742 BLAKE2B 7a3e6eee9c5b1ef7b677370c1020c43d8bf6ff18fe37339de81ba12cdeb3c2b83c74ebf7d29cc3ae4c6b9406f82948e7ca5d23b86ae48463eaf4b10b9f9145e6 SHA512 18f35102b6f65d82ceccd3fa18cb240d98ac86443a888e98767caf456644c167e7b515ddedf98745b575bf9784065bcf18d6bddc147596a2fbc2c1f987e6d835
+DIST kgeography-18.12.0.tar.xz 11078980 BLAKE2B 9c6b4306fc88522372d0fb823498bbcae5e04cb080001b47ce5bebc8afe1edb431bd756aa7b01747c2f13772cdfe5e1904471462c9ded43e1f8f9f4bbdb23cd7 SHA512 07106264fda9280eed5e8075d29261642c5c13ab2b43062c6df44b2e4c57a3f8801d9eefe80eef6376c25e296d8c44be741f5ff92a62fac6c5757e222aa1bdaa
+EBUILD kgeography-18.08.3.ebuild 740 BLAKE2B ad3feb91ba4b5921b414a3108385c367fa5d4f819e707a1e59b91733147ee4ce3399f71cffa4b0502d81f1b3025888c56cb855e0d48ad087ae96979b146376ff SHA512 3648bbe2593347c8ef44fcca528dfdcf4310bbade428eaf052dadd216528b87ff80f6c4187fbc3d00a89e7ad75017c2f9121531758cf58218b96d953e68c889b
+EBUILD kgeography-18.12.0.ebuild 742 BLAKE2B 7a3e6eee9c5b1ef7b677370c1020c43d8bf6ff18fe37339de81ba12cdeb3c2b83c74ebf7d29cc3ae4c6b9406f82948e7ca5d23b86ae48463eaf4b10b9f9145e6 SHA512 18f35102b6f65d82ceccd3fa18cb240d98ac86443a888e98767caf456644c167e7b515ddedf98745b575bf9784065bcf18d6bddc147596a2fbc2c1f987e6d835
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-18.08.3.ebuild b/kde-apps/kgeography/kgeography-18.08.3.ebuild
index 8e45af5416a5..246a888dbfd0 100644
--- a/kde-apps/kgeography/kgeography-18.08.3.ebuild
+++ b/kde-apps/kgeography/kgeography-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Geography learning tool"
 HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
 https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-18.04.3.ebuild b/kde-apps/kgeography/kgeography-18.12.0.ebuild
index 9ff150f5dad8..8e45af5416a5 100644
--- a/kde-apps/kgeography/kgeography-18.04.3.ebuild
+++ b/kde-apps/kgeography/kgeography-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Geography learning tool"
 HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
 https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 8be4b4661dbb..2b38fb3c3324 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
-DIST kget-18.04.3.tar.xz 5213500 BLAKE2B dc9ef5cd626744cfe2aa505887a6046c7da40f4864e3485945fec3cd36b0ffeac974ad1d55a8986f824ea7a512053e82bcab94e5d5af4e35e221cc78a971d320 SHA512 cefc16a3ecd919a6c288e3adf6b63fff55b8dcbb1517b70ebafebea1045044b28ca490bef91a50dcdcd96091523a0a0b79bb5f3c926f719138de29bb29f50489
 DIST kget-18.08.3.tar.xz 5212448 BLAKE2B ae2003273c1b1d291beb844173ce7d6b952007aee425136bbf5b9a333c432e1a65f894b750a0482dd7a08d749bd230f2817a246310429ea2967b9bfd12538701 SHA512 48c611522ca1637fa43537c75985dc685228c209ff2703ed5e7544b556710ca7f6f9aa7ccb8dfabc5fbf1089f6e53deb48863f11283f052e69600db272b2f7eb
-EBUILD kget-18.04.3.ebuild 1814 BLAKE2B b72ae45a75d125696f743c0d75e0c539fe6255ac7923c73399e43199179f862fcc6157bea09f8fd88399fb392920d8fc7a819d33eb698fb78a7a0f441accdb14 SHA512 4f986ab160023a00c64afae57b1fdc4a546a07533d9458fecb64f8b4bf08955c2b993afde37b18b8288ebdcd52c3c7c47200284a37fb337044c9f3114c4c0c85
-EBUILD kget-18.08.3.ebuild 1857 BLAKE2B bc00fb00683af1c7f5a563dd2c18d11182bbadb54b4ed16cd1ac120d5b968f8c1d328de72e6f6de3c421b3026798b10c0b9cd3f9338cfe27a556e91ac2305f6c SHA512 2958a77a82e676efdc6b468cb4ebc3569b55613c2ad51e2a9dd73470396017ac2b65c2e5142e8471fa37d57f5bc60d6b9b3f894df612ba55b46f2eb14ec6a53c
+DIST kget-18.12.0.tar.xz 5208624 BLAKE2B a3ab01b5a15b08d62516e0a913c2987a1acfd7daf0f88e317cf99ff7c470db083d5b8bdeb51d6865eaa051b897e05719bf28672f1273da2df29fea67cefd1515 SHA512 8e5728666ec5023013761b4e9d992fd8f2a93519d64416ca168b91b5487c01fd56c10c6b740600fa75c03c0dd75ff7489d806ccd6fe490413bebfe52ce985812
+EBUILD kget-18.08.3.ebuild 1855 BLAKE2B 4877d0f1b65bb12619bb7c64153ee93d442826289d344d401640d77867fc86a5bb2dcb7a95ce4a387b1101d0e0dbde6e4d3b4f7c621d080a78009820ebff81e2 SHA512 21ce60522dc6933fa7a501d0488a32a2b7170488cbe07b62a9d8f2724337e41c340456ef46d63711546df9d8cf6f13da41d3f9b8254bf8837ae59148dda6aa56
+EBUILD kget-18.12.0.ebuild 1810 BLAKE2B 13a546c36265fef30293958171853ddeee4dcb8b58e61d19f0b7d76fa0ee79ad430fcd3adf467037c402470919116279f17dc3cc6a00dea2cf425e810b311d78 SHA512 2138d6068a96869ee008092b069120f1ffbedaba070e43e0520830f4722541a55888e49668145e2c61589ca727760459e6a10cb09a3b52b6d3216f7a6e8009dc
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-18.08.3.ebuild b/kde-apps/kget/kget-18.08.3.ebuild
index 7044573af31b..ad36f5c1b785 100644
--- a/kde-apps/kget/kget-18.08.3.ebuild
+++ b/kde-apps/kget/kget-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Advanced download manager by KDE"
 HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kget/kget-18.04.3.ebuild b/kde-apps/kget/kget-18.12.0.ebuild
index 90b35f7e418c..d444477bbaaa 100644
--- a/kde-apps/kget/kget-18.04.3.ebuild
+++ b/kde-apps/kget/kget-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Advanced download manager by KDE"
 HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 COMMON_DEPEND="
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	bittorrent? ( net-libs/libktorrent:5 )
 	gpg? ( app-crypt/gpgme[qt5] )
-	kde? ( $(add_plasma_dep plasma-workspace) )
+	kde? ( $(add_plasma_dep libkworkspace) )
 	mms? ( media-libs/libmms )
 	sqlite? ( dev-db/sqlite:3 )
 "
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 074188b10290..3aab6f05c10c 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
-DIST kgoldrunner-18.04.3.tar.xz 4406988 BLAKE2B 9354a0f2abe37b4921b9bbd8c4a496a22a4c8700dcc7acc9927c3660161e1a2eb81dc637aed4ea88bc6ef6205573965069b7ac2a468a1907cb93a1cbca3f1272 SHA512 f920c917322e20fadedfd2b00a93294238f2ea11f7bfcd14110b3feb586958551febc80a729ba5319c77cde08b4e9a68c82df0cf02ee2937472c64c9dc08f482
 DIST kgoldrunner-18.08.3.tar.xz 4409296 BLAKE2B da5ab466cd779355f381a53d8dbe6643b8073c441698a18a782d6e1cb69a906c3ff7f96f878498cdfcdeccdeb77f24d81901e8f216e0dc4090aebd436a08d35e SHA512 42177d168a1f63847e711fbea9c59850e2f0914733550fe5eba8d66a014e7d3593a6565ad163bf8c67ad6fe95f0a5e0305d07717de5d484d13f78998f51d0d59
-EBUILD kgoldrunner-18.04.3.ebuild 863 BLAKE2B 8ad0721fbcae4c372e89fcc4c69c78a22c9fb603d2f2d8779ebb2ba043bb5e98967c24740228440d28f54ba77ddf66d3bb9a466c35f757f208c67109e89d8c5c SHA512 0194780fdc4fa17261a8db7853cb2149f09fd25d6a8a5ca28e97a19eade16e1e41628d93da452c442e351c5bd9d882ba4c18e0947a8e358e30707b30ee8c3dd1
-EBUILD kgoldrunner-18.08.3.ebuild 883 BLAKE2B e419512e3030d7ff611c5d2bd2fc31d3676ef2e328ece83bd2f3addf5e220b64d640abe674c966054c910dfac376010729d8b58d8146c93ee14605fd0f6e6995 SHA512 f2a86f48d135862150d3eac87336da58def9628dbe6fef7f16ffa3a5612adfb9dbc762f2674ca717c9aec2f298b714ca8a4a98f921b3d3193621f8acb51ce814
+DIST kgoldrunner-18.12.0.tar.xz 4409436 BLAKE2B f2e33980e01556b7a5994f7f0d40379f5ac00ee29512b083f1534862fa6f85f680e87840651be1d76d2786a5b393cf6d174ad07b3872ed611cc16f2b9bf1daff SHA512 0019265d86ddfb7e5b1495fdee3f2eb573f0277c46e1d0448f697adec73519a17a3f4f5d2188441a3d399abfd4f8c114d847bed5fc1deeddb712236037601717
+EBUILD kgoldrunner-18.08.3.ebuild 881 BLAKE2B 0f9997f0f47de8332de97ca2c07f2c5585f415e9ad2a725d3ce103a7a314527aef7db368943814e287f49b29dfc0b7709b2b023eab883308a89ceadc4d920757 SHA512 be28deb727dd3c056496afeb409ced54c12eb504d872c251f573d29ed22fd9298a89f9f2e2ee08807183267bbffafb60ac02baeced1fd6cd75a00a44e8bb6f20
+EBUILD kgoldrunner-18.12.0.ebuild 883 BLAKE2B e419512e3030d7ff611c5d2bd2fc31d3676ef2e328ece83bd2f3addf5e220b64d640abe674c966054c910dfac376010729d8b58d8146c93ee14605fd0f6e6995 SHA512 f2a86f48d135862150d3eac87336da58def9628dbe6fef7f16ffa3a5612adfb9dbc762f2674ca717c9aec2f298b714ca8a4a98f921b3d3193621f8acb51ce814
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.08.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.08.3.ebuild
index caee6127a924..46d7017fda79 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-18.08.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kgoldrunner/
 	https://games.kde.org/game.php?game=kgoldrunner
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.04.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.12.0.ebuild
index a730e1731345..caee6127a924 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-18.04.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kgoldrunner/
 	https://games.kde.org/game.php?game=kgoldrunner
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -33,4 +33,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kde4-l10n-17.07.80
+	$(add_qt_dep qtsvg)
 "
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 0b5b378316a5..270b298c770d 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
-DIST kgpg-18.04.3.tar.xz 2822520 BLAKE2B 8ee556bd1ece83cae3b53e8dd2769a3805b7634dc4db9fbe02a51021938c1ff294daeed6d494f40d40c82ff43ea5f2c3d679b2fbbd980b60ebf9daf83f60e50b SHA512 e799244dd28b26cd5738cdc03a07c563eef94a92304d4e045441f9c3104cd37addb240ed2ab1a42b576746b9c02e694111e4a4de8f01da61f95ea940ac69e74c
 DIST kgpg-18.08.3.tar.xz 2857468 BLAKE2B 9bd5f6808a9ee882b83b44544b01998f542f64fda0a318d8e17064cec173baf33a5311ed92372468049b5d2b42b8319f8a56ab597bf98df33587eef571192c7d SHA512 0726e9f3c4a5ae460123ad361e09e06b5eeb4fd4255645e65e65fcde608664becfb1a5c0499b39a0c32de83a531adb4eb14f9c770ac587fd2a5a95f3fe8a215a
-EBUILD kgpg-18.04.3.ebuild 1275 BLAKE2B 77b4aa15a4b469e0510d1a30bfd3cb7c5b618ba1085b35f6f1b00c23f03e79a868a32db2191443552eb7f3cb37c56358a0232cbc1eea9601528147d0cd7169ff SHA512 7ba158f0997cd7f36f9944928f3946f5526d0c9b356667e19a263d374e8f9eabc024b1c82eb591cae49c189dd4654339bf85a3c7cc2dd25d1858fcbe263930b7
-EBUILD kgpg-18.08.3.ebuild 1275 BLAKE2B e5e27b8e0e78fce5cce4275c004f04e83529cb08db57423721b320dee7106e7778c04a96228aca42173f0f68c3e1eebd5c5f7aa98df2633cfb95c15fd6f8cc60 SHA512 eeadb86f5c4c0f21c87646a75c1b3da88df68213ce4864f2210c8c6283802da5252c9e59975aeb1c565c169b674a8cc22ff94f880ee52d3fbe3c4f7d8595a8a4
+DIST kgpg-18.12.0.tar.xz 2855872 BLAKE2B fe12a0866bc66844320b98e6e3a9e6385e7c534a878b57552bc455fa7056bb47675a8698bf1412ec6fe7f273544af7ab19c514daf4e4ba1a209c3a658668e87e SHA512 b05c1e9d67f02550685b1b44c8cb911a5e1a73b62702c9df05e67c271f9cb7ae4953e4d42d40040ad1fb4ea516b5591f635618a296fa0054fa9716f66d7fe669
+EBUILD kgpg-18.08.3.ebuild 1273 BLAKE2B 252dd7f6e2173b7ad61df6ef990a94acd2b01c503ce3dd638b617cdec724b5bd53198cb16654579b22fe90268b97cf729e4a079377073fc7ce524e570a8fa105 SHA512 c1ea73a96503d94e83b8e47b9edd607ca4e5d8843751733da1ae6c462b4836178ca2e52bc5be9d714c427728c592ec1600ae886b8a62b548db557e6408b95aa1
+EBUILD kgpg-18.12.0.ebuild 1275 BLAKE2B e5e27b8e0e78fce5cce4275c004f04e83529cb08db57423721b320dee7106e7778c04a96228aca42173f0f68c3e1eebd5c5f7aa98df2633cfb95c15fd6f8cc60 SHA512 eeadb86f5c4c0f21c87646a75c1b3da88df68213ce4864f2210c8c6283802da5252c9e59975aeb1c565c169b674a8cc22ff94f880ee52d3fbe3c4f7d8595a8a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-18.08.3.ebuild b/kde-apps/kgpg/kgpg-18.08.3.ebuild
index d3d800f21a29..949652abd7cb 100644
--- a/kde-apps/kgpg/kgpg-18.08.3.ebuild
+++ b/kde-apps/kgpg/kgpg-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kgpg/kgpg-18.04.3.ebuild b/kde-apps/kgpg/kgpg-18.12.0.ebuild
index d32d13d7827d..d3d800f21a29 100644
--- a/kde-apps/kgpg/kgpg-18.04.3.ebuild
+++ b/kde-apps/kgpg/kgpg-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ 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"
+https://utils.kde.org/projects/kgpg/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index c8a2a25e131c..c4c045eced40 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
-DIST khangman-18.04.3.tar.xz 7271792 BLAKE2B 1681d7ed248be16ef903814c0d5c1a9c6bd83aaa2ebcd82e2c03b5a98e4f5148b880453c622c76db49d3240891d78e2e1c2512ac191af446e40e68d5db8742fa SHA512 6df84c260f72f925e272f1977bd8b6552ce23b27402e88ac7640cdd4e6a89ef79cae928b11c26c17775c70e424d1934dd7961f2a7f41bb894d9aebd5d950edca
 DIST khangman-18.08.3.tar.xz 7266880 BLAKE2B 642329b0e0773e17ed06785397d1565a861b36137faa33d716d354a6be58ac5e006018c503ea49902fd27dc511f7ff038a9f8151eea9ad21767542c62e42becb SHA512 276f2a532bc8b434fc2bfbd924a6dd58832f21106898af102243b6673090ab088cc9e1409dc50046bab7fbc552407738ae8e052a7b5282070e0cc8b8162f3b9a
-EBUILD khangman-18.04.3.ebuild 1039 BLAKE2B 562fb8187fc5281462879c78a3ea6840a9328cd242557b470d5b099acc8d692f43288068b6e55aefa02d62f75bee5cee1d6819d2b11a39ba706f86973650afeb SHA512 695ea6506d595c25d3cc7b8f3db3a3cbb6e6bf6c7a43938eb0f5d11fd862090efd374b0ccd9c1163527a18fefb38446f1df254bb1594f0950fd2721ae2a278a6
-EBUILD khangman-18.08.3.ebuild 1039 BLAKE2B 5aaaf1c68894c7e321be18a23578a78b826ab6e9aa91b4ca37237b6acb1d80484cb50c40366bb1661bbcf8f65dfe128cc473113fdd0955253e9deaf7b92d01e1 SHA512 5c2e88d88a03357708dd6e2767a80f99f248a19acd298f4655a0e7af937f7d6a5c2c4f3f4a5c17a25de594d63975b7db26b8f4b3814d195ca58153cb4dbb893f
+DIST khangman-18.12.0.tar.xz 7267432 BLAKE2B a01fcdb418e14fbdba29fe775bd293964110db6df3edc23caa6458c1ef5b6fc34d0267b1d513a4e1a22b50286e4ea2ba6e5cc2436cca1c58e3bb3d44d0fcc1eb SHA512 59905c937e50fdcb0bcc26d20624aefb6715891e5e0658aebcd8f4d8b7ccbda5ab0c1d88f9a8a0291740e1a72dfe285ed96a85840e19171318345cb2501cd054
+EBUILD khangman-18.08.3.ebuild 1037 BLAKE2B 757dc64e6f7d3b6247a9c240bdb3e66971ead31b1ea3732d4126f6bfd9ec80bdce39bdc2262535a300e66a6d07c4532d1641134d83b14decec31a9d2c87303b9 SHA512 e0124972ad1a64dcdd6abdf1a99fcfd98b3c2aadcbfddd3492962636e94b48872eea4e9dd7db9a0ed62c2ecd0756950b60c50ddf99ce3d4fce7b719ee8d05d3a
+EBUILD khangman-18.12.0.ebuild 1039 BLAKE2B 5aaaf1c68894c7e321be18a23578a78b826ab6e9aa91b4ca37237b6acb1d80484cb50c40366bb1661bbcf8f65dfe128cc473113fdd0955253e9deaf7b92d01e1 SHA512 5c2e88d88a03357708dd6e2767a80f99f248a19acd298f4655a0e7af937f7d6a5c2c4f3f4a5c17a25de594d63975b7db26b8f4b3814d195ca58153cb4dbb893f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-18.08.3.ebuild b/kde-apps/khangman/khangman-18.08.3.ebuild
index a780506caecd..c1439fa85566 100644
--- a/kde-apps/khangman/khangman-18.08.3.ebuild
+++ b/kde-apps/khangman/khangman-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Classical hangman game by KDE"
 HOMEPAGE="https://www.kde.org/applications/education/khangman
 https://edu.kde.org/khangman/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-18.04.3.ebuild b/kde-apps/khangman/khangman-18.12.0.ebuild
index 7497ea52c9c5..a780506caecd 100644
--- a/kde-apps/khangman/khangman-18.04.3.ebuild
+++ b/kde-apps/khangman/khangman-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit kde5
 
 DESCRIPTION="Classical hangman game by KDE"
 HOMEPAGE="https://www.kde.org/applications/education/khangman
-https://edu.kde.org/khangman"
-KEYWORDS="amd64 x86"
+https://edu.kde.org/khangman/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 267e72bfa164..5d753b810cae 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
-DIST khelpcenter-18.04.3.tar.xz 3831256 BLAKE2B fb770d49fa3c98270a41413160a2122caa68a4db796bf722827989973cad5b7779d0a2b008fe1e72dcdd96f6dad2585f5e16602b48799acb3b833aba29c0bdda SHA512 4727de8223af52a9c269d47e59b4de3f7f30a1d06b85cdc71300a6c83eb49ddcc2f32c33db8a9ea7d8d961da6d20550dcf49400df6431fa91c7ec5a2b676dd63
 DIST khelpcenter-18.08.3.tar.xz 3841588 BLAKE2B 998c9490d9bcd46c404104cfce4f06e27e50dda7c361b7cdf6ad5f2ae76c06852958e74434315201c321146fbb8c2be80bbc10d0798d7bbc03de201351d0d4c5 SHA512 4d117bf1c7615d1767bc00a5c8c3cc13f7a9a981414feb9e960ceaea264b1e8ef78fca610d19649089c3571dc9d8e70321e387c98a7186ce343817cf6b040bff
-EBUILD khelpcenter-18.04.3.ebuild 1074 BLAKE2B b8398202280e0f2022e1344b8dad8bd08d265751f6ee1cdae608b0629a636064b1191e2e9c66e034f5639c6b85d5bfbe4f5155c77679227bd3a045b0bad1f58b SHA512 95f51a67a22432bfc25d0885d511405d50573443211e73a4504f3e9c82a9f544493aec6598334371df026ac67f2d5458d5f6224b6d1779c0c4db5dcb9886b4ae
-EBUILD khelpcenter-18.08.3.ebuild 1073 BLAKE2B e77ae6312c8d6b3afa370f82152cc4d7116cee163354c7a4b42377a285f30a145e1a58871bdc6d01cfba11c0e0135df1ea6588dc4dfabbdb08a05bcc64df77e9 SHA512 5d730f094d42b59bbd0507cd6a57a49d1af2f9f61ccd7e8332fad52ba2166b50a6b7572926becb4a834296cee4e87441652f162bb1c46a2d3f6742b26c2401b5
+DIST khelpcenter-18.12.0.tar.xz 3843276 BLAKE2B 72d5ad163aab6eedab67c1befcf5aa4190edb4a30eda83da1c706ec2505566a2582a4a8d736d5c65336a2b62417fd323a081e54f5a0f9d9d0a008c41cb792dcc SHA512 e0a52ec249ea62cea102e1fda9addcc9861f1e9bd0f8a0ccb98e19aecc2ec6e9e502fb10181860b754d1a6862e6b92450aa56924401c6ba1b09d9e12ae0bedfb
+EBUILD khelpcenter-18.08.3.ebuild 1071 BLAKE2B c8e46c60313368fd2baab867da1319281e6f9e99a113d5fbc71b7c075ae45609729afeaf069cfed23b25aa2d95875dcc530dac84ad4db96d69bfdc7ab94a7ed3 SHA512 47184dbc90cde8a1937469a6fc35b41e62296991d6acad12516237518e402393aba2a184ef3bbefd42341bd9a97592970e521a4917122c6219ea3dfbb6fb355e
+EBUILD khelpcenter-18.12.0.ebuild 1073 BLAKE2B e77ae6312c8d6b3afa370f82152cc4d7116cee163354c7a4b42377a285f30a145e1a58871bdc6d01cfba11c0e0135df1ea6588dc4dfabbdb08a05bcc64df77e9 SHA512 5d730f094d42b59bbd0507cd6a57a49d1af2f9f61ccd7e8332fad52ba2166b50a6b7572926becb4a834296cee4e87441652f162bb1c46a2d3f6742b26c2401b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-18.08.3.ebuild b/kde-apps/khelpcenter/khelpcenter-18.08.3.ebuild
index de27ff250f73..3ec0cea9cfe5 100644
--- a/kde-apps/khelpcenter/khelpcenter-18.08.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-18.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-18.12.0.ebuild
index 2363bf5485ef..de27ff250f73 100644
--- a/kde-apps/khelpcenter/khelpcenter-18.04.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index ce0d33afa81d..f278983b5c61 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
-DIST kidentitymanagement-18.04.3.tar.xz 148148 BLAKE2B 17cf0a0e449c99cfce153f29f5dd5cb8db5769250f4a5cb70fc2c84e6d644fdd7f18721bc55256c357221e54460361f1e1ebf19890ac38f01392d56ced7a8663 SHA512 4e6ad309d18e2bb88a86a1b236bb29782aede0ca18cc5e4ac76926e17030ec6367d80fda50dab4c29fcf5a4475560e027edbb7cc9cdedf2c3d6f9dba7ff6697b
 DIST kidentitymanagement-18.08.3.tar.xz 148184 BLAKE2B bd1f04bd21b150728450213757966743d00d4bebffd91db129225de6a940bb0b9e06507c4f97ccb8091fa94b30aa14f071ee29c0ba60845613dd473a355071e5 SHA512 efb705349c396a1f426d0eefab02e86e5a33e4d1f76d36b1632e8c18de3e586eee2f4d01c6a527e2ed676964b73318780def591305357bfbd87716a5c70699b0
-EBUILD kidentitymanagement-18.04.3.ebuild 768 BLAKE2B c958331ed3a4f7db3328327f9f42f9e1d52b8b220062f74d787cef3a93a9019f1ea98e0c5f3205a0e9d7f053cced1bbc665d09e1ebbccf93169e45f995121914 SHA512 684a847d7e536f9c19785d0a1cb3bbd473ee3c75bc370b6a492bca0eb4b27769b310f87e3033fd73dad99f292dfd54a891f7145e2ed5af3be6899ca23f5f1b9f
-EBUILD kidentitymanagement-18.08.3.ebuild 767 BLAKE2B d0909c28d4601d42be15839f68120bebb0e797dc3c5b19bb943a4a529311787084b32531edea8568c10a5e5d70db9db9718a2682bafb7caa3573e054afc7bba2 SHA512 f2b6361919ac349a1a750e95044d7217aeec69f5ff66392a0df8c9704b96b6eee7e7daa2432bcc09813879ed2c3ffbfdcf000f59234be2d132a40035b2332767
+DIST kidentitymanagement-18.12.0.tar.xz 148540 BLAKE2B ae88304cd8ba39646154aca3fed7aba72ed592affc49b0065ceff910afe8ffc036361f8343d85e7efdae7cfd39691cf723ef4d2faafbc26995d16b38f74124e9 SHA512 0bc981fece6499eaa4ed8dbc7913c48a489a81e2746711964101462718cbfec863f80d012142f73850f85c313307472885d7ac1538836bdff33d75efb8630fe8
+EBUILD kidentitymanagement-18.08.3.ebuild 765 BLAKE2B d00b081081a47c838d6f1a0b78a96c4c41dd06baa841855bf3ce3e1ecd97b1cf7ce9b7b3065c22bf9837a9702d2ffe9611bb1db73e62b4042ce28651b1625b29 SHA512 27bfeb417e9d79e4097347a498aacf0c6b65d1e51639e8bef7470338db6ee7757316530645bc7c1a4dc968ae4d06ab2a7c943caf1e3d7c934078e2d6173f05d6
+EBUILD kidentitymanagement-18.12.0.ebuild 767 BLAKE2B d0909c28d4601d42be15839f68120bebb0e797dc3c5b19bb943a4a529311787084b32531edea8568c10a5e5d70db9db9718a2682bafb7caa3573e054afc7bba2 SHA512 f2b6361919ac349a1a750e95044d7217aeec69f5ff66392a0df8c9704b96b6eee7e7daa2432bcc09813879ed2c3ffbfdcf000f59234be2d132a40035b2332767
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.08.3.ebuild
index 3c17725c9d10..86a87e05b9fe 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-18.08.3.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for managing identitites"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.12.0.ebuild
index dc6f819f6569..3c17725c9d10 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.3.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for managing identitites"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index bcfc9f1f50f3..42fa6e9082ef 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
-DIST kig-18.04.3.tar.xz 3591984 BLAKE2B 6ac5285f4e9a0fe97a19886a44874f352e96688d0fd2c81bc9ea8119570939654b5eb26f1c874eaa05894d7518b5b199f42093939d20baad898af2d802f55665 SHA512 cb015a7d675cf0854c8f911fe0f9868c3a55c844af9f4337a0ebb67ce14f75146fe86a03248cdb0c7f361dba61d58276d0893fa06b355f26a85faf48423ce377
 DIST kig-18.08.3.tar.xz 3596736 BLAKE2B 68397898b47c9e0d2d7fb589612759fee7b330d76260517ac9cd2baf81f1326ae9ec52d68b5f9c7579eee817e639ec52adcb63240cc9b9aa3438d8bfbaefb1fe SHA512 c85a109e628bf129f859ff3577e1b57284a5424266769e807abcd65f3198c041a3ab11ef274fd4f45636d77be070141a496a5227e176f04b8e8a186a966049ff
-EBUILD kig-18.04.3.ebuild 1499 BLAKE2B 2b4a6e92492c904751cee9d89337a09e6eadcba375167a2c47e8e391b647a7cfda57b9fa9c03673fdc601f7fd636f486d9a752875cf18834d33079ab933ea3c2 SHA512 3f95555910729514ab7534c5017c33396bf1df644ce89961e339997874e859237ff3808846f5b963831f5023e7e86a1248ede3da3af4c9790e1812f94683f432
-EBUILD kig-18.08.3.ebuild 1499 BLAKE2B d1d57c75b2f2728d080c37eca45cef0d1c35ad22591558b244c223489adc84126a6be818bec9a2598041269f3b36bb1bff55dde495b016997e5ca36d3eabc246 SHA512 c2b82a7bcd2c5bf0152bffa108dc9397050913e46465fd05a13593f0d8362cb670ac0e5e2ac78893ba28862a802c699b11a99baa1d846aee35ed0c0d9193df0b
+DIST kig-18.12.0.tar.xz 3498592 BLAKE2B ae020ce5e1277ce36c43e9fd13810b37081d37ee220bab303cd2dcbc2e6fab9fe9a91c18595102c60c0132c5b398338d91f4e4dccbe31b2280a3f79e655ab08d SHA512 16905ab1da3f5b33df969467da5428183e29c22e2d35b9d0606ac4a170363f2f172ab45c1969100847852420ed786967c12cc3f36e29537fea2aeb9301d411c5
+EBUILD kig-18.08.3.ebuild 1497 BLAKE2B 36c9dc8e582df77c71cd83f7dc5abc78864d3cfa4e204dc9667693c358370ee03c1bf60495b65a54af14442782131c42fe0a06cf4718b4ec0e33c70976aedc4b SHA512 5f6afd60459a20090c2a5104448a18a2d959f935efb76c097e8cec8295c6c9f861ad15228a5f0803dfc936b35867569ef95534060341043c5345307eed79feb0
+EBUILD kig-18.12.0.ebuild 1499 BLAKE2B d1d57c75b2f2728d080c37eca45cef0d1c35ad22591558b244c223489adc84126a6be818bec9a2598041269f3b36bb1bff55dde495b016997e5ca36d3eabc246 SHA512 c2b82a7bcd2c5bf0152bffa108dc9397050913e46465fd05a13593f0d8362cb670ac0e5e2ac78893ba28862a802c699b11a99baa1d846aee35ed0c0d9193df0b
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-18.08.3.ebuild b/kde-apps/kig/kig-18.08.3.ebuild
index 4b0627e87696..918e9be09b38 100644
--- a/kde-apps/kig/kig-18.08.3.ebuild
+++ b/kde-apps/kig/kig-18.08.3.ebuild
@@ -10,7 +10,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"
+KEYWORDS="amd64 x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kig/kig-18.04.3.ebuild b/kde-apps/kig/kig-18.12.0.ebuild
index a7f051aef49b..4b0627e87696 100644
--- a/kde-apps/kig/kig-18.04.3.ebuild
+++ b/kde-apps/kig/kig-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig/"
+KEYWORDS="~amd64 ~x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 9cd5c1a0a0d1..f6280e1afcbc 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
-DIST kigo-18.04.3.tar.xz 5224404 BLAKE2B 32285e811a899cad93ab05ef08b00336d13d04fa1371cdf994ca9ddfbe1a87d2328b9544f5090afcb9d1a720637281b362d722496cf6388cc48a44573edc78d8 SHA512 3e42114294c633985ba527390bf24404086fd5fa0a03f714201af1a93c2e16a6b325b10eaa5459aa11d4f11fb69a88f3fa40c8bf3a0535ae44ad6ce408591c7a
 DIST kigo-18.08.3.tar.xz 5224376 BLAKE2B 5debe372a9d817380d700c1eeea7700010b97bf693fb6cd79aa5ff5c4d853ef7041a654feff675b8a826e023e32e037cd9e5be99dfba695c7c867a606f67eace SHA512 b8df9f0e9a0a3d193102889c0be0e07e93192aa9622d1909b6d2d47be5279b898cb6e7d7bbe4239270d774a9dabccff3bb5291426eb0228ddfe41b923ae42f93
-EBUILD kigo-18.04.3.ebuild 853 BLAKE2B 317ccf14cb550b706e68ddbcd4ae5f155bb53afcad1421b8455173e7847586a8f192929e41a186c73d5a2b01fe46ee2b273491847b10d36e4f186806850e4089 SHA512 da2004f56ef18d098ca8008a12a320229021fc1809b96f237c61a3b1a88311fabdb927c4c609aaea5a6911f47315caf96578f6995ab3555b8dbe78c70d6ad7f0
-EBUILD kigo-18.08.3.ebuild 852 BLAKE2B 40d74f8d077ef174e92532a58e62134bce739a23212505454e834e2b3d0043e3cedb1a2d48157984af16c5311d001a06a3d8f1af0b342a38f7f55d802ed12d1d SHA512 c6510f2fec8c92072dc9eeb1b1d0a669f4577025e59166b07851eeb84a815bb017283a0a6720e80468fe200edd5ddc69d4511e165424ccfe186560cdf3674d36
+DIST kigo-18.12.0.tar.xz 5223956 BLAKE2B ef1f1090ff09bb203f818bdfe8113a72a5d8a6af120fffffb8a3ca913b982d719db8fb0b46709b44a58713c953da9095fab4f28b179b268b309a9f36a29eae23 SHA512 1ea9ec7aad131c9c6178488c7deb93efceffb2f5bf7512747ee43f783e8ed875ea0bd06f7e933d00ef901e32ad2c36267186783660505fa7328bd7fbf4d50060
+EBUILD kigo-18.08.3.ebuild 850 BLAKE2B 316b3ad5297e525a8e7a30df1f7b9c63fbc883eeb91dc93b834b64f5040ad18e2484478c6da5f6eed7b201eb7f2cf81a502480b252ed518c42dcef274ebb06ca SHA512 1fed920d3f259cfe6bf4a3dd077b18f8e468de7e10ee2f3732e08423db0c13be4e65bc25132e8c1274fce15c2decb2ea6012505c1c00059e1b1ea3fefa9ae04a
+EBUILD kigo-18.12.0.ebuild 852 BLAKE2B 40d74f8d077ef174e92532a58e62134bce739a23212505454e834e2b3d0043e3cedb1a2d48157984af16c5311d001a06a3d8f1af0b342a38f7f55d802ed12d1d SHA512 c6510f2fec8c92072dc9eeb1b1d0a669f4577025e59166b07851eeb84a815bb017283a0a6720e80468fe200edd5ddc69d4511e165424ccfe186560cdf3674d36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-18.08.3.ebuild b/kde-apps/kigo/kigo-18.08.3.ebuild
index 09bfb89a580d..639c57350811 100644
--- a/kde-apps/kigo/kigo-18.08.3.ebuild
+++ b/kde-apps/kigo/kigo-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Go game by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kigo/kigo-18.04.3.ebuild b/kde-apps/kigo/kigo-18.12.0.ebuild
index 72b0c7c9e7f6..09bfb89a580d 100644
--- a/kde-apps/kigo/kigo-18.04.3.ebuild
+++ b/kde-apps/kigo/kigo-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Go game by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 38573e07eb0e..983097b09f71 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
-DIST killbots-18.04.3.tar.xz 1165284 BLAKE2B 5d8e7aff2fc2cf670693c1985217277d33d88bc7c9550dcc08fbc9503da218d4551c665da7cf4c914885155f6f1285aac7b9180b5fb677f27d7dad3739a1d705 SHA512 b14103edecedc5b3b8602c56b0291d4a2cb73805098f2380c48dd010b1363901a36adaea3b655d474cb379679932060696cd7dcb3a0cf5d91531778980f9fad3
 DIST killbots-18.08.3.tar.xz 1165152 BLAKE2B 6214132a5e021a1ba0cb401e6b2329fcffb27b4a1c8496849a27efa4357bd8026ae939ec0763dda580eae590e93b60f4cf18938d654db46f8654404c836d4a59 SHA512 6acbac422208b36dd2c780438923e599a5065862c4b810cc302c1c55a70321c4cc297b4266409fba388d9fd1f380478b8e6c6fa118a0e129450aad09250a40bb
-EBUILD killbots-18.04.3.ebuild 715 BLAKE2B e8df4101325f24ec3ee979166690ef2b70ba9c0fc409149f5cf9c4b5d02d3fc68c70c6d896956fe334c1d6870371b46a2de36455e157c82c95b4c7623cc9ab0b SHA512 70888187c4e26ea0e12baedfffb483cf0b2b15c372f8e4241344f2cdeed0448ea1b930867d7928060944fd03132fd29d3aaa1b50b8fefaf8a5dda55ced792e94
-EBUILD killbots-18.08.3.ebuild 714 BLAKE2B 7227670f6c0eb44c35e0eadc038834101eb91b00e622f0b811705fcf3407cf6b408484df8b32f99521e97eb33582f87672097fe2871d8daf1e59bed4b90d77fd SHA512 86c90b90b3b51a5ba4b3595a06e12cf560f2bd78aceca0876f85945aae8dbadc14279d17388fe3e8ecee990b2ac3579293aab3b6685aa6cae1d94d89d7859537
+DIST killbots-18.12.0.tar.xz 1165020 BLAKE2B 23e167b034ee4438b461d15984e0c8b9f697056f832835eaad3387fc44216cc903f8d5355ead04980d5f6bf94628eb04e2d079e6a009efe89b2f623e76d21cf3 SHA512 bec41d42e0263743c66b03792cf62432ffaf48595a2a812a3dad989c9afea15da85063321d82a2fc48942df5516e0486a2923e18af5932000d36b5162f724f31
+EBUILD killbots-18.08.3.ebuild 712 BLAKE2B ba9af94e48b7e5c73591d5a2c066a2383f1ecc029f82647ba4fb7224d790c91f87b3d96a033021f15481fbca87716e6b076c1df75952f620a3c612de7b416ae5 SHA512 f735d831414cef444e31bf8d8b470fecf1a0772207ba6d1370d5aebfc9313db689284e4d41be001ca8e2a9761b9b9de07de5fe340cfdcd9475f03b31cfdd7661
+EBUILD killbots-18.12.0.ebuild 714 BLAKE2B 7227670f6c0eb44c35e0eadc038834101eb91b00e622f0b811705fcf3407cf6b408484df8b32f99521e97eb33582f87672097fe2871d8daf1e59bed4b90d77fd SHA512 86c90b90b3b51a5ba4b3595a06e12cf560f2bd78aceca0876f85945aae8dbadc14279d17388fe3e8ecee990b2ac3579293aab3b6685aa6cae1d94d89d7859537
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-18.08.3.ebuild b/kde-apps/killbots/killbots-18.08.3.ebuild
index 8e9b868cd539..dcc0c630826e 100644
--- a/kde-apps/killbots/killbots-18.08.3.ebuild
+++ b/kde-apps/killbots/killbots-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Kill the bots or they kill you!"
 HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/killbots-18.04.3.ebuild b/kde-apps/killbots/killbots-18.12.0.ebuild
index 9f4d9eae4de0..8e9b868cd539 100644
--- a/kde-apps/killbots/killbots-18.04.3.ebuild
+++ b/kde-apps/killbots/killbots-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Kill the bots or they kill you!"
 HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 95aaae4903b6..b5c6a59d9ed3 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
-DIST kimagemapeditor-18.04.3.tar.xz 1056724 BLAKE2B 8391d25f9621b91e17fe7cc251a5f1b3a43b56102acc9b9b1e34dc709e589d7b43b111563bf5d864f33490f3f64e903c3d8e8673a41e33cfc7136e1c04d5b9cc SHA512 ac9e491a8557be0e28fcd2f01fe3a7621043ad343acaf6ab68524fe1cdc1733d55c8e63ab44145b7aaf8feb39d77cf9fdd68549e39f512965342418bde7be872
 DIST kimagemapeditor-18.08.3.tar.xz 1057028 BLAKE2B 342c9a10b0470b56f67d4aa83196971b9e38428c27005ceb3ab1c110e8fd78b8d362b2f6b833d95832f7e4e67376bcf409d15f45e5c0fe7d6fc93765e1f4cab6 SHA512 e7ac4accaae74c7367f41226953e76204ba70baae8735de1c822b0f13703e3d3dc5691e9bf5f3f598d4e2f5856f43f167451645149eacff932e4073e7e76db97
-EBUILD kimagemapeditor-18.04.3.ebuild 803 BLAKE2B 67094a945e9991e016c3b2be781596040669dfa639ed51e4325be9b413bbec359fb128f069a5e2230f78705f7fc23509545c1f04e66109f85adee60a63ec6b43 SHA512 4377f373dce195b367de3ad344da3c9600f1ab840378eb5c98530b0c3e31763e45dd70d5fad6936f2e4c3034d9a97a342d0147ead10a6267bef1eba87fe081b5
-EBUILD kimagemapeditor-18.08.3.ebuild 802 BLAKE2B 8007ca2f632f2720faedc2140c2dc431ccc1b1ccebebabe6ce8204ee27e062fca46a5d6010183d9a3ce4ddc3dee95ef5a8c7070cd010950288f5291e6601b81a SHA512 90733b8a8a08432151015b3337ae4d144d5a3d61928623ab74d4516596924681d2cf29716f37582d969eac7b37e9217e9fbfc4ad951e1034290d9573d5386dd3
+DIST kimagemapeditor-18.12.0.tar.xz 1070712 BLAKE2B 15a7257d874490525d1b18b4cbc45cd45c3e19ff5c6d5f8fc30378e76e8a7709b27152c06e1db506261d63d6a326cd9169b3244179f091961045c1fb726674cb SHA512 ca76c9f3f9287f962ddfcd315b3db31cb1738c7bcfee16db1bdf546f28b79252f87e1a863a9038319302a7dd7e54d5d39345dc8d0621b51740498dec82eb424e
+EBUILD kimagemapeditor-18.08.3.ebuild 800 BLAKE2B f6f2153228a810f96a56f97a5a990129505f19a0a5310e94043c4f6f0373675335bcd9c0452e407ed28def39091b306b2b0835490f229e6df1f1cbc63fef07fb SHA512 549ac98170cc08aeee5e0bbbae45d680666a20463269fc55377fe7620d8b8da2f28166140366f0ada9608de695c27b2c31534a199da8c7221d8b3c6f2de3a25a
+EBUILD kimagemapeditor-18.12.0.ebuild 802 BLAKE2B 8007ca2f632f2720faedc2140c2dc431ccc1b1ccebebabe6ce8204ee27e062fca46a5d6010183d9a3ce4ddc3dee95ef5a8c7070cd010950288f5291e6601b81a SHA512 90733b8a8a08432151015b3337ae4d144d5a3d61928623ab74d4516596924681d2cf29716f37582d969eac7b37e9217e9fbfc4ad951e1034290d9573d5386dd3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.08.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.08.3.ebuild
index 1b577dc05ee2..fff5364cd568 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-18.08.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Generator of HTML image maps"
 HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.12.0.ebuild
index 3aba32bc7ddb..1b577dc05ee2 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Generator of HTML image maps"
 HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 7b79408fde29..d1da37a11cbf 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
-DIST kimap-18.04.3.tar.xz 119332 BLAKE2B f235a3ffc973bdf3ca27eba494b279c4ae2cc9b5eec8bc2b8597667fdc3e2d2fc4f9c97a0437001a13c770f498480e0945f85aedd0f9c00b20aa4b027650dd02 SHA512 a17e4132a3c0d698eda715fa7ebcc5d7d4e16b9ad8aefab25bc3d91a64200504fdfcf034d42929f56c0b26ee90ad8b068e58b7bac1d2a3934ae5757de4c3b966
 DIST kimap-18.08.3.tar.xz 119920 BLAKE2B 92058a8789166fc0943c177f69e268f558485d04293de6d65bb411861a398487e3270370af86e243f9ce73ed25a603d15806ba42ad86f203ac56c02096821b26 SHA512 d18b0fa29fa7a6170e668831a860aa1d6a9fb3e0d1621a81009b7e1b87b88c2283164c1a4013dff32ccb8fc58fb0515f8f9f3a092d128f2281ade17928c5d649
-EBUILD kimap-18.04.3.ebuild 721 BLAKE2B 6cf62bd63ba1cfffc493e50b6ab7310ccfb8559e537315f17fac45891cfddcc67d3b831e4a8e8bacc686cde7898598c873ab70bbe080434e70426e2e4f31b3b5 SHA512 2ff2f8668fdc35bf1771a88c1be2816ecf5bc352d2c93b3d751037ba4f486552f223a1776ba0ecd93da94a2115edbf9ed2af6f5160b3cb35e31248dc0d25127c
-EBUILD kimap-18.08.3.ebuild 720 BLAKE2B ceacb56e392be478fdea694373ef742d85b29c563201eb006cef0b5a3bdc760b7be2a727efcc37b5389223ca9fa97d08fc5ea58d64d88ae663005d68d6831d34 SHA512 d16ab23f11467af9895fcd125b717fba0174771ccffbf4618968ded5ddc9e3c3a34a4986640255039db594b30dbeea71d5eb4ab3b4044e8d7c3112a06a141f79
+DIST kimap-18.12.0.tar.xz 119616 BLAKE2B 0fd6023dfa46d75f2c91a872d274198eaef2ee9b182a6d0214cd47667ccf631055cc4b92d5cfa86959e23cdea949c079292096cecf95eafaa9fddbe147dcb093 SHA512 ca1590e54477c87585af248cb166439fd3adfdaa31feb308717bd478c6c4abcae3fae5fd0cc0f2bc316baf3ff37895ed27892a428b7ffe6631f03467cbc5f374
+EBUILD kimap-18.08.3.ebuild 718 BLAKE2B e01cb7ebc971374bb8dfa3ee68007071f2485af5e54e7ffe9fa6bd360ea89c592d271f934c8c49ad0e010326decf22b90a99d2ce86def2a113cdf52b564f3e2d SHA512 05c3b1c45585a370c32230f851dee78b68c50f0c1e3065038a07adc722064242abda76a42cf0cc0a4ed9b32875c10eee965926b7815c0b7e6f0a8a1741e1ba6a
+EBUILD kimap-18.12.0.ebuild 720 BLAKE2B ceacb56e392be478fdea694373ef742d85b29c563201eb006cef0b5a3bdc760b7be2a727efcc37b5389223ca9fa97d08fc5ea58d64d88ae663005d68d6831d34 SHA512 d16ab23f11467af9895fcd125b717fba0174771ccffbf4618968ded5ddc9e3c3a34a4986640255039db594b30dbeea71d5eb4ab3b4044e8d7c3112a06a141f79
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-18.08.3.ebuild b/kde-apps/kimap/kimap-18.08.3.ebuild
index dfd5dd064f0c..bc4becaa3d8d 100644
--- a/kde-apps/kimap/kimap-18.08.3.ebuild
+++ b/kde-apps/kimap/kimap-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for interacting with IMAP servers"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # TODO: Convince upstream not to install stuff with tests
diff --git a/kde-apps/kimap/kimap-18.04.3.ebuild b/kde-apps/kimap/kimap-18.12.0.ebuild
index 32b8081ab45e..dfd5dd064f0c 100644
--- a/kde-apps/kimap/kimap-18.04.3.ebuild
+++ b/kde-apps/kimap/kimap-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for interacting with IMAP servers"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # TODO: Convince upstream not to install stuff with tests
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 76a833750e09..1d75cec14576 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,6 @@
-DIST kio-extras-18.04.3.tar.xz 549840 BLAKE2B 7bb03f01fff6930d5b7bc4cdd01e960239d55ede4feb4eeb131db75515763cf924b288811cd99a5d89a79059f2cd5241e872b990799c758431f13f1440eef424 SHA512 49ab5ad8d74831a9ef1636e46abc76d66d3ef7d9e8f1ce793eb8d5c37f9e7ee4205c9643339f5c46657d4f537572e3f8a180ebace8599a1dfcbf8d27470b2f0b
 DIST kio-extras-18.08.3-sftp-18.11.80.patch.tar.xz 31376 BLAKE2B d4b44ec4c76309737a417d6bc930c360a0078f743cca96b1b12f164916e0596e0d29bf5d379e1896ffbea94962f2eb61d2b02b8f21000d3bfd75efe0fd55faa2 SHA512 15b43c2b73189db72e7d5b84eee5727ead49482d3d454591d5338b5dee876c751fad16fa76f3697b8ec2070d2bc2f89eec05e6de1ee402272d65aafe4464990c
 DIST kio-extras-18.08.3.tar.xz 552044 BLAKE2B 22f6662a1c45ab80f217c9f2611f0ca33500897c31d8cb8d29949a00500301f1f72219baf17ab73011037e4e1c9cd85d5247692361dcf0ccbf5aed1d829ab922 SHA512 f79ab19abedd47baeffea4b1e99acc21611c9d435f0de14751594c97c373eaa493da07fd5d754b1f62f696e4f445b493861566845794d6d32e63e0354189d726
-EBUILD kio-extras-18.04.3-r1.ebuild 2145 BLAKE2B 58ab316ce51d381d6fc59ea679c7fae0012829ee0d366fd96c64e62070ef80e862f9b8ea9c7ba32c7bb29544cda4b52eabea4d10351da9a23d4bf078102c16d3 SHA512 baab5df6189a62c65a81ceba1191b7009774ba3d593f5631a972903b332a790b0d9980132422599d519cc61198b4334d0fb6c1bb473a6536e87c2187a35ef89c
-EBUILD kio-extras-18.08.3-r1.ebuild 2294 BLAKE2B fc671f97d2f70e6df1dfd2ec63d994579d96a2139101a7b3646a2b455dedeef4c767503b2110df0fe164cf38b73e640e96a940f03f9265fdf56abe69535be54e SHA512 db33bc06ac05373fcf8c623c927f4ca293199bd82232da4b3121e531ef558fac19d8f9a88bd3eaeff25b6b42d4d9ef9548412d5a6975c248ceb37904d96a2ab3
+DIST kio-extras-18.12.0.tar.xz 561848 BLAKE2B a667286be332214b6c99896329b3c159bb90459c87b817911daa5cdeecba00dccba57e34e97b6b13c1a635de99691a1e94044efe22dba7f990e6983d5f413681 SHA512 872c95894b703e2024bffeb41a33b09b1e5512e4b69418db08719811b6ee18a7e73ffe064753c80810a476651cd5e66e2af4c75516dc311e924623fd6b4fe87c
+EBUILD kio-extras-18.08.3-r1.ebuild 2292 BLAKE2B ffedf40ae1af2c3d104cb2b442071f3827e0fb208527e49926c82ea96892c241df2d36ccea6e974729c3fe7ae6da621121bd4621dc9449beb6dfa9095a452893 SHA512 9bd5f965497615da163d39d09a7ceb11ee14f2a0079ef54abd6999db2e4ccca8b6ab6ba690b8c4dfb78fdbeb09cd38f86cdd1ff7556de6b8d39d6d135620d675
+EBUILD kio-extras-18.12.0.ebuild 2104 BLAKE2B 916f75cd337c215555f0ae607948940697dc4aaa5e35f87e13d2a36b09072688474af7b4ace1dffb82762a5fa6abc1948296d3ebd6a79bef449136c49abb5689 SHA512 a546bc5d4283cd60c28def063908238497b6f60b8c72c9fad6581a5d1f8638b48e923fa4819eae3e26adfa5dbdb6bcf06d49cfca122858220e368d6b5c8e21a0
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild
index 063449796af3..1e3939ee2d83 100644
--- a/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
 HOMEPAGE="https://cgit.kde.org/kio-extras.git"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-sftp-18.11.80.patch.tar.xz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="activities +man mtp openexr phonon samba +sftp taglib"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kio-extras/kio-extras-18.04.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-18.12.0.ebuild
index 0e1458d7b985..823d7137fa77 100644
--- a/kde-apps/kio-extras/kio-extras-18.04.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-18.12.0.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="activities +man mtp openexr phonon samba +sftp taglib"
 
 COMMON_DEPEND="
@@ -42,8 +42,8 @@ COMMON_DEPEND="
 		$(add_qt_dep qtsql)
 	)
 	man? ( $(add_frameworks_dep khtml) )
-	mtp? ( media-libs/libmtp:= )
-	openexr? ( media-libs/openexr )
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	openexr? ( media-libs/openexr:= )
 	phonon? ( media-libs/phonon[qt5(+)] )
 	samba? ( net-fs/samba[client] )
 	sftp? ( net-libs/libssh:=[sftp] )
@@ -62,14 +62,13 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=ON
 		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package man Gperf)
 		$(cmake-utils_use_find_package mtp Mtp)
 		$(cmake-utils_use_find_package openexr OpenEXR)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
 		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_find_package sftp libssh)
 		$(cmake-utils_use_find_package taglib Taglib)
 	)
 
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index bd12af8d0e2d..a5be5c91027c 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
-DIST kiriki-18.04.3.tar.xz 327092 BLAKE2B f5b2af57eb2a81550f1957e14681c2336ac640783bdc1ab0a1a82193a0b8ae109d43155a596a7ebcf189523c4a7fec52aa5b82916449ba74952d1e2361c40265 SHA512 2d00d7d04768dea1000f5d96d69e069087085f5450cbd60425f686ae7dc177cef67575b45a107ef203c2a7b04e7aa2f9168b683d7c624c04ca8e85465d8b750b
 DIST kiriki-18.08.3.tar.xz 371704 BLAKE2B 42cd40edfb7b05ffa06437eb87d4be7f011769cd8b645b5b175f91c3c94ecbe52374ee650492d960c861eddf6ef98117da7c3ed83015e1cc9ea51093e2f47762 SHA512 df09b4603ac4023fdb245488d82937c896545aa6201ff17d297b42e679ebdf2009f42984f5e63961252cda60e4ec53965b92eb7a383315e016fa622ce9b93ff0
-EBUILD kiriki-18.04.3.ebuild 780 BLAKE2B 3ccd5c6a3d359aaea020421a3a9fb70cd37bdbd012fee6e8de431c47b96881e118a826c4b4f481890e705690177116c1cd97265994b56455bc0a42362dd703c9 SHA512 54c9b931af8bc19c85b70736a8d459b8df1d798db8732f7f55fd26e26e8ec30e31e8f4d83dbc02b48a05a635ba9af00f95a9b6be6174392457491f6aa1a7ac46
-EBUILD kiriki-18.08.3.ebuild 779 BLAKE2B 70358dec893e2e2509f4d9385e9c2d8073c2e84e37bd96d622cd97c36f41e58a969110c2174748a5afce7f3a02e0f70f5f148a83f5af0fa8bac578d506db4132 SHA512 5e292d722ab3ffcdf450507a7841376b41f1175ab956fbec3ab0a1209a3dfe8cc6e4e1131938e72f051437f90986bcc6c00363a13cec3ffd70082467167232e5
+DIST kiriki-18.12.0.tar.xz 371732 BLAKE2B 8e03c2f9b1f6a8fa282caca4d6d71d520d97b64a4cdde8bf7a90b7682482f19b208f90ca3d22317d4e73f1b893f8efc45c10560c07b24b630ebf161cd4909deb SHA512 6e90999b0f1641e49ef8e1bf42e6881df4ce84c458abe2e2f71aa753e6cadfd8d93dbf36e7619e58e4c1a5d5f4eb09e09a637571d30c8d28a6e8dac24a2bcf04
+EBUILD kiriki-18.08.3.ebuild 777 BLAKE2B 42d74ffdc78bf23be26538e96b42588f5a49cb2dd7d7501e22de058636c32e4804edb778095fd8e54c9b4e4b4941d744f685d65d5313b9d6a4cf3a9285f33b09 SHA512 60f001cf741c30d09540c34c0303ba9612f9976f2ff9498e7bb9955c8edd4501fe722dc8746af27968f15bf536b29877c2eb996b32dc5be131ec1f038958f6d9
+EBUILD kiriki-18.12.0.ebuild 779 BLAKE2B 70358dec893e2e2509f4d9385e9c2d8073c2e84e37bd96d622cd97c36f41e58a969110c2174748a5afce7f3a02e0f70f5f148a83f5af0fa8bac578d506db4132 SHA512 5e292d722ab3ffcdf450507a7841376b41f1175ab956fbec3ab0a1209a3dfe8cc6e4e1131938e72f051437f90986bcc6c00363a13cec3ffd70082467167232e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-18.08.3.ebuild b/kde-apps/kiriki/kiriki-18.08.3.ebuild
index d73a6c103d8a..babd6b2c1d02 100644
--- a/kde-apps/kiriki/kiriki-18.08.3.ebuild
+++ b/kde-apps/kiriki/kiriki-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kiriki/
 	https://games.kde.org/game.php?game=kiriki
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiriki/kiriki-18.04.3.ebuild b/kde-apps/kiriki/kiriki-18.12.0.ebuild
index 83ed17393f75..d73a6c103d8a 100644
--- a/kde-apps/kiriki/kiriki-18.04.3.ebuild
+++ b/kde-apps/kiriki/kiriki-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kiriki/
 	https://games.kde.org/game.php?game=kiriki
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 1ddd91bade6c..f40d5812d7ff 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
-DIST kiten-18.04.3.tar.xz 11554812 BLAKE2B 00f1d12ee3e39e83cae4fdc66ca78c99e7db389ae0aa91eb5f43a85a1ca3db3471e2f1f6b911fa94a0f58cf4ff021536c43508e68d2adc76d9663b201a64fa4d SHA512 b377ce0b7f3644c23301d6c3cd3a947e311a8b62e786ab9c1e66a3c2b0675eaee5d90db2023fe15e6c612cdf82d616e9afc13b90a69f3199c442249dbea63541
 DIST kiten-18.08.3.tar.xz 11553800 BLAKE2B f2316582df2efc813f9c0d208bf33fc836951265632dd1ce8ebee96ed23c81de5bc29c7bf8fa881dfdf9187357de0b73168619d5321513f74062169803278560 SHA512 2f81b613563a4071c04c91e789ac50c0d64780005280ff7358cf9057535be5203caf74dc7b6d6cf6d312fdbb23641ac65cad4d750ed63bd6e521bc4c87453b28
-EBUILD kiten-18.04.3.ebuild 811 BLAKE2B 4e2610272301095da9b26ef32278393ac8db2affd5bf3b79baac0e335d5907a721a8c74717a02b52b232cabf41f206f54ebd155ae41abcbf4bd5650cc9dd04ce SHA512 c77cf3e29c5437897a144100518da7012531ee7cc3d5cd628481be988b446feab3f193ebc877aa96e7a2263acc1ddc1ef089e1e0286aadd30972f374faf5ca22
-EBUILD kiten-18.08.3.ebuild 922 BLAKE2B 0dfd5469b0ec4f20534dd3885e5d9b44e76c293b71c70603bede34f1e8af4afc002c618322e494da6bd9de2f4a000dba022724e09eb5f3a017e56ec0f43bfcd6 SHA512 2c38952ea3d2b408823b1ae3764ddc7406ee8c3057ffe44123332d59c9898575171fa8777f1be535fbba1dd5d770af1bc48a1e1a7be6448fa59be8dad1c9f4c7
+DIST kiten-18.12.0.tar.xz 11554352 BLAKE2B 4f695790ddcf96aa603e02db49e0818d7dcf851a14b63b610fd59cd7fa0b5cb1e9405b98fe38b037f7ec041a397359dfc92f474a844655770013e7c7d25871b4 SHA512 30f93c54116e93837458abedd4effcf114fab3b5295c4d15a8755c39aec19357e4a2f998cfbda8c3d70bb3bc8c564f91c8ad112db9638d2af6d102c178939d24
+EBUILD kiten-18.08.3.ebuild 920 BLAKE2B 553cb7c7122885367b823817798c0e8bfefa09e7378f2bceedf20cd2901c92935757cc75f4c75fed155c41245b47413f08c63b1107bf8d52085e960476cca865 SHA512 8883d03febd54979e6e55006dbb098747ccb801dd5692585ba23813e016d184d05ea1b531d629e103e5d4940bc7b14cea05ce5118fa7516502b2be4567f9005d
+EBUILD kiten-18.12.0.ebuild 960 BLAKE2B 192c5bb34593370079964bc69c6e272c24a2aebabb92e1758b2524cf03ca88593d0a426a455d460fc84baa784e05f5f0304ffa561aa11a9bf69d050af300296a SHA512 55e4de493ebdf049bfbba64eeebaf97e4d09804895d710ea1efce22cf1276bcffdfb325a6ba4b4d641481acc490760300be8ed80f96b193da77f7b7a79c1832b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-18.08.3.ebuild b/kde-apps/kiten/kiten-18.08.3.ebuild
index 07a0d261f224..c681f2428cfd 100644
--- a/kde-apps/kiten/kiten-18.08.3.ebuild
+++ b/kde-apps/kiten/kiten-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-18.04.3.ebuild b/kde-apps/kiten/kiten-18.12.0.ebuild
index f975da1e9011..9f9cc9608195 100644
--- a/kde-apps/kiten/kiten-18.04.3.ebuild
+++ b/kde-apps/kiten/kiten-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -21,6 +21,7 @@ DEPEND="
 	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
@@ -28,4 +29,11 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-fonts/kanjistrokeorders
+"
+
+src_prepare() {
+	kde5_src_prepare
+	cmake_comment_add_subdirectory data/font
+}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 7c0795536a0e..2769c6407a51 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,3 +1,5 @@
 DIST kitinerary-18.08.3.tar.xz 622380 BLAKE2B 55213b5897abd8a8cbe763116cfddb3a498e8cbe1edc4a50fe073da193d97fe6a872c3dc5843e3b15e0d23cba5aa57be4118c2ec554a1b2f43c2bb3b8b121bc1 SHA512 d2fec91f292a143f96096a6642764599198a6055c44f63b3706bbb6428bab919c507ab6a4a2211faf6e57480ed8d6e6ff3643b612d295ff32d415a79509d25fa
-EBUILD kitinerary-18.08.3.ebuild 826 BLAKE2B c5b477ef8c79a6421e16bcc8d7d32dc0ddf503a0859efd9fc217086fad173c122533722e7764511cf32ddd93a3a56d0d72eebe1af28aaf3ce4d80fcc34b0208a SHA512 7de54eb18db30e6e7a890b005151dcc2f3ba9ff59599f99557f658eab0a216e52509c434484217f1848855368b7ad8b92d8a88292610e2def82fc10695128e9c
+DIST kitinerary-18.12.0.tar.xz 651688 BLAKE2B c78fb3105237386463745f78d447e77d8eecc1be6cfc7150a49144afc0aced29c7fcc6cc4c11c1e35ebf66178fed6d93ab2d522f37ef059f8b5bacb90c043db9 SHA512 3a39949dc600daaa4f71ae1fb92dc3e2d2fa04058184e23fc42d2002529b521c54dc27ba51222df0569dbd0616dd687781441af989534faf6a1e74feaa4026dd
+EBUILD kitinerary-18.08.3.ebuild 824 BLAKE2B 1477b3096da1f8fdbf85cdf369ed4fc6ef2ba3ba7f616e62d0a951ca8fe95dc16927c3ada407442a7c41b02c73ca87a3f248f6158eec3cafb830b11139c3a13b SHA512 90121f44de95a067acea09b8308074da55417fc6e9a791d32b49c4189662f834fee3e0431ef5272ced65e324968575b0ed07a45f2b61721e23c80ee2da60af63
+EBUILD kitinerary-18.12.0.ebuild 826 BLAKE2B c5b477ef8c79a6421e16bcc8d7d32dc0ddf503a0859efd9fc217086fad173c122533722e7764511cf32ddd93a3a56d0d72eebe1af28aaf3ce4d80fcc34b0208a SHA512 7de54eb18db30e6e7a890b005151dcc2f3ba9ff59599f99557f658eab0a216e52509c434484217f1848855368b7ad8b92d8a88292610e2def82fc10695128e9c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kitinerary/kitinerary-18.08.3.ebuild b/kde-apps/kitinerary/kitinerary-18.08.3.ebuild
index 69bc9fa6fd90..d76e3c54a6e7 100644
--- a/kde-apps/kitinerary/kitinerary-18.08.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-18.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Data Model and Extraction System for Travel Reservation information
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pdf"
 
 DEPEND="
diff --git a/kde-apps/kitinerary/kitinerary-18.12.0.ebuild b/kde-apps/kitinerary/kitinerary-18.12.0.ebuild
new file mode 100644
index 000000000000..69bc9fa6fd90
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-18.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	sys-libs/zlib
+	pdf? ( app-text/poppler:=[qt5] )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index eaf5838177d8..d5354ecc9923 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
-DIST kjumpingcube-18.04.3.tar.xz 293940 BLAKE2B fb7610e9f3352954e1df4eeeff2ddd80fc4aac454f19bd1f7406c4131a34126990de633d79bac1569e1e96d1743d8f55efd35a857f63d877600b6333c6b0c5de SHA512 c10548aa970fec60f9306ee351f5129c4892dfd74746d782ef72696d41a6362fd92f6bbcc49abf816b455f1e6d8992b4f66cf9ddf19c6109596ea053dd04d8bf
 DIST kjumpingcube-18.08.3.tar.xz 286716 BLAKE2B 1fbcd34e2ee789dcde61013e8e802a6e38a3bf60eb2621de5aace6fa3297c1893925cadf1e53188782943cddbe8c1f51a0722669fc7836e2fe42f85fb9dbe0fb SHA512 9e8b6ae890b1f1ffa29908bb0ed563f736d6499e81bbcb7b0deccc325697731084ffd2b382e5325df341613a2833fdfafc5cb1b6183c603c0c3e126a8b9bdd9b
-EBUILD kjumpingcube-18.04.3.ebuild 767 BLAKE2B 68f9ca993109e2efda935509a8b4f5f93f6a283a43048b6d5d27fe0deee39961fd5a3210eaa307c0a51fa07a00d5976f4de8d016584aa586f85f1d48a2848803 SHA512 d0940a208cdbf9ab81d93511e2616ccefe4acabe2163b33d6835c732a45a0952f3122081ef6e32686e368384d71d3a3accee538cff583695035b9e12f2607b4b
-EBUILD kjumpingcube-18.08.3.ebuild 766 BLAKE2B dff0c6d38aa73d603697274fb772860c9e0c3fc40e767d86261c43da3b0344fe43b9c608ea8e4cda9ec24ae49625ec601531e5bea4099443a45bd233d072e2cd SHA512 a07efa663119305eacd51edb5843b7c714a3223ffd337ddd0eafa48cf6ff86f00ba93a1bda5a787dc8e43a91cf81772bf866fb0bb203e4f7318ece74734c6d8f
+DIST kjumpingcube-18.12.0.tar.xz 286412 BLAKE2B cdf61237cb02d8fcc0e5b872b045375b279eddbe977186a12cc666fd015effb92744cb421052d9ce21cce375119e8b73e14f2975707f2bd866e1a3a3fcf7411f SHA512 db17f79ea58bffc61924187a30e79e8a382bead1f827abf84b51611526e8a5a0e730c42406568cef6ce137fd576419269680d519a2a30bcdee0455f8a0fdecc5
+EBUILD kjumpingcube-18.08.3.ebuild 764 BLAKE2B c0000069b8439b4500ac09f9c5df2b368231b6f1a13ac5acd5fa13840129159954d732bfb3f216c41b4d53a8f63851069f5cb1dc584b1482e11001a71c42531e SHA512 832ae7f730421c13b3372431e9f81389919c1b14e828ee8feb53a20414204dd817ad97d8a6fe90f4b6b9aed21cfdb2864111b37f94b9f0db7ea1c8be277ea478
+EBUILD kjumpingcube-18.12.0.ebuild 766 BLAKE2B dff0c6d38aa73d603697274fb772860c9e0c3fc40e767d86261c43da3b0344fe43b9c608ea8e4cda9ec24ae49625ec601531e5bea4099443a45bd233d072e2cd SHA512 a07efa663119305eacd51edb5843b7c714a3223ffd337ddd0eafa48cf6ff86f00ba93a1bda5a787dc8e43a91cf81772bf866fb0bb203e4f7318ece74734c6d8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.08.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.08.3.ebuild
index f51ea825dff9..9063c2131b99 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-18.08.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kjumpingcube/
 	https://games.kde.org/game.php?game=kjumpingcube
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.04.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.12.0.ebuild
index 14930e6a1626..f51ea825dff9 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-18.04.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kjumpingcube/
 	https://games.kde.org/game.php?game=kjumpingcube
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 6030b8526e89..90fa47d1c214 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
-DIST kldap-18.04.3.tar.xz 154232 BLAKE2B 782e2a727d7fb14c9d844e227f52f700bf13a19d6ded85ec14bf7c6ac6bad9209e14e53743704dbce8d79d09ec9a6b43b4686abf9c1397f06c7f0ece0dbb0dd2 SHA512 7159d5dd37641ef68c37d00e03b47febdcb2967460b51dce318344426077ced9d17095b8449ec82b8f8cd736ddf12f5c71f0737cab9a21811c576f14d63ac9df
 DIST kldap-18.08.3.tar.xz 156456 BLAKE2B b1e176d2c6af79e77e14672721998f25b76a718e756601491c3084a94b92d94bfc961493e7fa3c624377768723fedea7f2628d696628e5356274deed5b68e0a7 SHA512 e2b20c58786f5dc20cec34e470dfe13efecebe12bd6b8324a6ebfdca48cfe1e5da23b3bc5802f643688a9bfd5a972f410f1f0c21db0d577a58e636e75759dee5
-EBUILD kldap-18.04.3.ebuild 760 BLAKE2B f1950ca416e0f20b9dd05e0b3b94a683b3012219e2da5f06d395b1060d26c05ad3df42f9f96432f6f4c6d1de295c16e4bc53c0ccabf8e9c9989ff3bed90e0cb3 SHA512 97040219bf3b380924624e7e7f34b13597ad2d664a0c784ee5ee18367dabd79d4d6f95a3630812fbf0684943da9f99990bd67a454be9190f1e2655315859237c
-EBUILD kldap-18.08.3.ebuild 751 BLAKE2B 88797a562ee954a866519acb4639425d26f48cefdbff5cb09be3511f45a38e734fe53f371940ad1bb906d45db35fb4b62a5542df0d65723d439c492b43ca5042 SHA512 f33e270298548cc113a4d2627ec76e0b9bb2dc31d399428cd8c2fd99d6021b42a7691b811efb652671d949e911db0c4b51262026491764987e6ac232e8419c3d
+DIST kldap-18.12.0.tar.xz 155596 BLAKE2B 7c79b825e1e4cae0abde3ec386d8c620f8ae1c231ded0f9587f3f1d29e4a431f710c5013ea8289054ca6a6ba556ba10b9cb91e744f75cc50b0219ebc050d347d SHA512 f52680e3b018367955b850a5c0711bbee414ceb98cfb537268812fad13cb0768fa378179e2e306f46b7ae1a6293c54e1d3f51b94d84e91864a76ad2a26e61d77
+EBUILD kldap-18.08.3.ebuild 749 BLAKE2B 5fe52f16e9ab8393b50463ea93edd98a0f9082367859b8ed198ae04c60838b2f2c382bbe870ec53d8b8c6bf4b1684230e1083a7976b07404bfc1cf47fb35c4c7 SHA512 efb14c69f18c605697f46c18cbf3ddd99b8d5f2732f780ba45380ec3001fb7e88d62d8cf2c3face3c21d1d80a639f3818437e8152859e8da17abdf70137e27dd
+EBUILD kldap-18.12.0.ebuild 751 BLAKE2B 88797a562ee954a866519acb4639425d26f48cefdbff5cb09be3511f45a38e734fe53f371940ad1bb906d45db35fb4b62a5542df0d65723d439c492b43ca5042 SHA512 f33e270298548cc113a4d2627ec76e0b9bb2dc31d399428cd8c2fd99d6021b42a7691b811efb652671d949e911db0c4b51262026491764987e6ac232e8419c3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-18.08.3.ebuild b/kde-apps/kldap/kldap-18.08.3.ebuild
index 713405e6e0fb..077ad2ea3d3b 100644
--- a/kde-apps/kldap/kldap-18.08.3.ebuild
+++ b/kde-apps/kldap/kldap-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/kldap-18.04.3.ebuild b/kde-apps/kldap/kldap-18.12.0.ebuild
index c1cbca392b51..713405e6e0fb 100644
--- a/kde-apps/kldap/kldap-18.04.3.ebuild
+++ b/kde-apps/kldap/kldap-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	kde5_src_prepare
 
-	if ! use_if_iuse handbook ; then
+	if ! use handbook ; then
 		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
 			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
 	fi
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index fbbd0989c410..8fe860dae4c0 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
-DIST kleopatra-18.04.3.tar.xz 1902264 BLAKE2B 1571128442689e709ffae97092643195150a870bb90ceb0d18f7f8c6fbd1ad9c1f8e4f3b1424ba13d4181085bb18bf6a3ea8bc02a585858d1a0cac2b3e3fc618 SHA512 6f74ad1d5da2c1e2c22b42212010768af2dbcf108b337dbca9f21e2cb2a88e4899fec692667cc1515a46dbe8e942eef5cb86551a3f605b9d048345fc31277061
 DIST kleopatra-18.08.3.tar.xz 1930244 BLAKE2B 5d01d9c8079b151858287947122af427af33f71574d80979d7709b2d01b1e521bbeb6eaa03df631206fbd27869a92edbc75e378e14b7007c2865f49313eae2c6 SHA512 3740481570653f718eb469f1cdfbfa69e7b41104b26403c3902667894d17321f6119b3dbf1487d59c7fbfd6707cd6dcca562aeba6036cdb41a9b29530bfa5a6b
-EBUILD kleopatra-18.04.3.ebuild 1323 BLAKE2B 1aa3bd4a95a6dd7eccbc6ac669c78250343d3c7b99369b443aca92a489019aaebec2408a693b7269350a1b230c6caf399f328b0b7d966cad70d87ffd35aea06d SHA512 b247b69325a3119fa09d7d9e1bcefb121aaa09933578fad290b3ba8c17ccdecc0de7b40a99fbe13f0640c0506670dbe9076e6439f83380824fd7a2ef8f9c3cff
-EBUILD kleopatra-18.08.3.ebuild 1322 BLAKE2B 4f87603e5ec2e85bade2a46623abde5bd329b7cc14aecb9f47eabb96cb07a3d5117125614ba635b72b00b7dcf8d1b3232dc3049f7cc03ac0c187975d6541a128 SHA512 20d75761255d4f06b189cb5528f9b1e7042c30205a3ea42f50371bfa23c6bcfcab8fb9490bd4552c631ad36c9815b29934a60263c8b9c955ec28980b0c15fdab
+DIST kleopatra-18.12.0.tar.xz 1928836 BLAKE2B 6f02d8f568696a79ecbf02eee0df1fb65d9c7a8e3b44a31658ef50ecd500e2205abf3d2beea94ee733a618919a8c28b8904cc102363b7ec1587d2bd331112d4f SHA512 a941af0824dc4dc973bfbd40b0069b14e201328a974a01f62cea52a11cbeb2787468170073e431c22ec009e59f99d9c3399b62f9c0d1c89a86ffd72c8ffd2081
+EBUILD kleopatra-18.08.3.ebuild 1320 BLAKE2B 38c6748123787b80a224cac4c1c09ccb0264f203de89aee250e28244b86595416821077a17e2a0cbb6eabfae1af9da09bd6350bdb2b7e7f799359bc9e912527f SHA512 0b795992dc22393cba94c13263b20a9ecdb6572d45ba492d8c4856f42f908aaa65dbfa0f6ea38b5c8d62fc272be2ab0355db0d513ccbbbe251911e5674d97cc6
+EBUILD kleopatra-18.12.0.ebuild 1322 BLAKE2B 4f87603e5ec2e85bade2a46623abde5bd329b7cc14aecb9f47eabb96cb07a3d5117125614ba635b72b00b7dcf8d1b3232dc3049f7cc03ac0c187975d6541a128 SHA512 20d75761255d4f06b189cb5528f9b1e7042c30205a3ea42f50371bfa23c6bcfcab8fb9490bd4552c631ad36c9815b29934a60263c8b9c955ec28980b0c15fdab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-18.08.3.ebuild b/kde-apps/kleopatra/kleopatra-18.08.3.ebuild
index 9d861e8fd9f2..7d0701037546 100644
--- a/kde-apps/kleopatra/kleopatra-18.08.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/kleopatra/kleopatra-18.04.3.ebuild b/kde-apps/kleopatra/kleopatra-18.12.0.ebuild
index 88558a7d9f2f..9d861e8fd9f2 100644
--- a/kde-apps/kleopatra/kleopatra-18.04.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 96cc4b560665..fea833c7a75a 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
-DIST klettres-18.04.3.tar.xz 21713228 BLAKE2B 09f915c3ae3074544a2cf0e8c67c8b85be63a0aa73abab25df1f02d288fe9b780dd8569896c5848a22c45a19505b9111660396766454a56a7f3a9093abf45c48 SHA512 c579a1421694a1681d68716695210ad88bf0510647a4d0957ffdd4f86ce137ffb0693bb7a0fa7ef5d0a15845ce8ed85a909fb1711597b6dc8302ae43e0435b0a
 DIST klettres-18.08.3.tar.xz 21713040 BLAKE2B f61fb63b6c7aff7d9292463ee184b9fe8a41b4795df707c69809adc547ddd13b337459a0a410c71bfffcf6727f45b6f395f45d9a0fdd8fd32a50bf5949e157ad SHA512 19cf9701136dd707752db35287b8883c31016da7c6658b4fcf5c357e1d0006b692370f317a0a186aaeba695093127add7cc652078c4c7affcc86d7dd04366c34
-EBUILD klettres-18.04.3.ebuild 771 BLAKE2B 2def2ad609ebfb87f7352dde75c0b6cf0b5b1939897ed4dbc8badbab50fb711aa106cfb7269a87861c40a56d1af2a41770ffe5b44df5eabff6d3682fc40a8b0f SHA512 ac4b1f7434ff79717f691a88825da9160b47c2e7a173a766b12dc9d8f1c2f95ffa275ea6c3231467d39c4112618d2ddcd268f9b948b0887ad991b6c37098b5df
-EBUILD klettres-18.08.3.ebuild 771 BLAKE2B 0a54d08375ec57e95ec759ef6fe49ac88b4e477b8d7a838aac0cc56f30c631098a331c04eda409d7fd2b5cfec072882c2ed33eb902e6922a2237421ffcb465fc SHA512 2c7d9fbe881b52eab59badf1ac16dab8a6c4841e81c767fa04724ea1988fd25461181c84749c25e280b1098ed3c444b803fe5accfc8ae21f4ebf5fdfe21fb4c6
+DIST klettres-18.12.0.tar.xz 21713292 BLAKE2B bfd4175208f63b5e93fa95c877835987df89247b4d3bd6102dbe0f0455b922d52cd4ce22488a6e635477833de57c092aa0c512c880eccc2d12a6b283aece3b86 SHA512 a2cc818567d5ead45c4dbf7602460b1a37dca4b993827274ed3e5f1efac39a87c8f28112a947f33cacbccabe432cb2425a4d4f7b98d4642709ca75c20e48077e
+EBUILD klettres-18.08.3.ebuild 769 BLAKE2B 8693af038eafce78e2248ed0414ee1ab136da7bf247f7a8e47a6dc505ca4a75af84d5fe77671a3f109e5fb89a95a909bb1c9bdbe906399f4e7e0006371e0f95b SHA512 8edb221c9500436126e143df1f2d7ebcd0731ef0908963a40a119b4b5d73f57fad954c899de8b03ad33b6847d51ebf375f091e5596ca0a933ec8ab42c5e893a6
+EBUILD klettres-18.12.0.ebuild 771 BLAKE2B 0a54d08375ec57e95ec759ef6fe49ac88b4e477b8d7a838aac0cc56f30c631098a331c04eda409d7fd2b5cfec072882c2ed33eb902e6922a2237421ffcb465fc SHA512 2c7d9fbe881b52eab59badf1ac16dab8a6c4841e81c767fa04724ea1988fd25461181c84749c25e280b1098ed3c444b803fe5accfc8ae21f4ebf5fdfe21fb4c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-18.08.3.ebuild b/kde-apps/klettres/klettres-18.08.3.ebuild
index 2c3f476d2da7..812c149ff91e 100644
--- a/kde-apps/klettres/klettres-18.08.3.ebuild
+++ b/kde-apps/klettres/klettres-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Alphabet learning application"
 HOMEPAGE="https://www.kde.org/applications/education/klettres
 https://edu.kde.org/klettres/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-18.04.3.ebuild b/kde-apps/klettres/klettres-18.12.0.ebuild
index 9e60e5f3183f..2c3f476d2da7 100644
--- a/kde-apps/klettres/klettres-18.04.3.ebuild
+++ b/kde-apps/klettres/klettres-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit kde5
 
 DESCRIPTION="Alphabet learning application"
 HOMEPAGE="https://www.kde.org/applications/education/klettres
-https://edu.kde.org/klettres"
-KEYWORDS="amd64 x86"
+https://edu.kde.org/klettres/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index bd1d1b479b97..b648e96c3e41 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
-DIST klickety-18.04.3.tar.xz 1411288 BLAKE2B 318985d5c6c2766ecab4a8118043dd4f9ee4ced035a08c03ce9527f5b0a68db0f6447f950f0482a144d9d171ebe733d90963e13c9ba9cd49591999b6cef99797 SHA512 d7cfefc611ad711c2e2990995e1faf208dcc61f685ed792934ffa001c83958c319c3245a652135f2e460b8d7d160b8ccb357b4fc5283d68978d1449fca6fc8df
 DIST klickety-18.08.3.tar.xz 1388908 BLAKE2B d9bba2ba7e6617215dc6fe50f59a1420d7cde83be5bbecb6308461369c5100f6043c6bc34fad0b1180f472f5bdd02da644a8aa51218a961c26a158d5ecb73680 SHA512 64b93852829bc45c4235a05b2efad619bedfd5bd1aaf7f380e8381c6e23e01881fecc92cff4a67bbe16d1f4d2c3db0c221e10072428f1b757d74191a8123dd18
-EBUILD klickety-18.04.3.ebuild 777 BLAKE2B 9d0562efe8ed345c19c2038b1d8790c73c08531624a981acafec198470974f6adfd41c079f52dad4ed05e94f9496caf314d7b5d310f2eaafc6500c5d30a1ab6b SHA512 2f5dc2324fc5538e5a58416f58af57edc34ddcf6d3608c24b22d97b1c099c93652f8c89b403302846c30c2edf6f2df047dd286c7dc34d9b1514b920667fae3b8
-EBUILD klickety-18.08.3.ebuild 776 BLAKE2B 9ce7789ca063686f181623d9b4ca02cb7f0403d5077de787532512b8d126c70d943328ad277378db587f5e2dd8718db46ae22014eb23ace342714ec01e64a083 SHA512 5843787dccabaaabe9d06a9f39cee59ba3e5fb4201ac8b84f9a26f3758f1358008b3aced78fa73eb04fa5bff0801962f4cf1cff3717b540b9fd3678d165c2a25
+DIST klickety-18.12.0.tar.xz 1388768 BLAKE2B 6ee3b604ccce41da23081d900a5ef7ed12f8898a0f51c6b392fda29e032f5a8b19409126eb1cb94a970de2336604b33c288922cb8001e0bbcd95c74190c471f1 SHA512 01d85ab5697e884d20bb82e13d13465f2a69134f4ceebacdfc5880c13e6ed57bf9a9e95bec4061fb8016648ca58c23e21ade337adc17127db1da5d72395c31a6
+EBUILD klickety-18.08.3.ebuild 774 BLAKE2B 7fadbd74991905e96a8f929abb860fcef18d07276f03f45292c27f2a81edbf42b01ca859c87c53189a617de995f7b773347ddf117b6784ca05414f49c32e5e32 SHA512 3b5dfeb6dc79298a585951598374e5211ad79af501a00e1e47b985328432ecce3708a13afba24ae3dbecd5d58d05ae62a2dd580d8cd2c9f6c97c9acc002d9da6
+EBUILD klickety-18.12.0.ebuild 776 BLAKE2B 9ce7789ca063686f181623d9b4ca02cb7f0403d5077de787532512b8d126c70d943328ad277378db587f5e2dd8718db46ae22014eb23ace342714ec01e64a083 SHA512 5843787dccabaaabe9d06a9f39cee59ba3e5fb4201ac8b84f9a26f3758f1358008b3aced78fa73eb04fa5bff0801962f4cf1cff3717b540b9fd3678d165c2a25
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-18.08.3.ebuild b/kde-apps/klickety/klickety-18.08.3.ebuild
index f5618bd99460..cff6826171d0 100644
--- a/kde-apps/klickety/klickety-18.08.3.ebuild
+++ b/kde-apps/klickety/klickety-18.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-18.04.3.ebuild b/kde-apps/klickety/klickety-18.12.0.ebuild
index 964480355198..f5618bd99460 100644
--- a/kde-apps/klickety/klickety-18.04.3.ebuild
+++ b/kde-apps/klickety/klickety-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 0591378f0049..672b322a7afd 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
-DIST klines-18.04.3.tar.xz 1670864 BLAKE2B 88e1a21189d76eb7658b2c89d64a8a6b062ff8efdac07c681e78108110b21f0f7c47f0cf6708a7072e22ab28717175b8830b523d6d8b076c62074d24f9774b25 SHA512 15885ee5afaf863e2cc95aeb8d7877741b12cd2d7e16fa0ddd2fc88b50231e4fee0e29e246017e6507e0e59fbf70616a4251d60ba235539870b6c50f141699a0
 DIST klines-18.08.3.tar.xz 1781644 BLAKE2B 535a661aa1573a0bc47b80e3d6cf0cdc789beb444c917713e4804f979a486c6336988ea12bc77ccf5e96e110ba09708e02cd3d75445d0f0bd05f28ccf3ec3451 SHA512 089ed0c4f8ffa0381879dcb57ed658ba627e7678de83dcf6dc98111afbddbf743938947ba5d830fb1f8348e3de17f06cfe0888ecc901e4d66b87ff71543a4d2f
-EBUILD klines-18.04.3.ebuild 786 BLAKE2B 77bc18df1dc422f77976c3c9d1a0c6d5a9dfe3a3261c18766a1e68ca755c5db1831848b74c6b927e3f1bd7b005ba1998bf2ee1f4025a82f9e4d5659fc8091741 SHA512 87a9781483b04be005d26690868278dced7c776a105b274d38381781f46e25a64c23fc640b3d8cb899282d03518330394cf5cb0d69c1c5226a247a7145f9e216
-EBUILD klines-18.08.3.ebuild 785 BLAKE2B 50895440a879607b151bb2dda0a60b5aa6ad452fc0b75d6135d33061e79c6e89e37ca66598fbac08e42211a6ea648e3b1c259d43c2b0c6f5ebcd15d02bc28509 SHA512 306e81266a59b9e628b5207204db7842620ff6e4dc1d657215865e4f5d9b440dd4a0608427df3b9138edc89fa8da7b15f8f50a6027514ff8a6c1ee33a5c0b27f
+DIST klines-18.12.0.tar.xz 1781452 BLAKE2B 8d9efd961980cc492f183abaf145d9c344feb499c307d6be9b10c2e957397928ed36c9301787fdb44d4e238e2dad538cedfe26634d45fc00c9140eab3d07bd6e SHA512 4456848b5a73104463d805fa52e2922a319438bc007c21bac825ee5c3b11e9f9ba23d472bdaae2f1de772def9ded6fc7dc0c633f2a165fec15a8c4f4952bf2c6
+EBUILD klines-18.08.3.ebuild 783 BLAKE2B 2766e26a86f63f9e2fd3915ad02c535bc6ca383889d83076a2985febf52fe2e3175bdc6ed92dd84f01040ddfe5728d7888873d4580dabfa1954c2d350ed64019 SHA512 70e97ef78af491aacda434429db8957f1d59c47b90fbc84f9bb3601e100c9ff060f853c527d09b527f6aa49660c4d5b904e84c0a50b9866c8b00268cb5334483
+EBUILD klines-18.12.0.ebuild 785 BLAKE2B 50895440a879607b151bb2dda0a60b5aa6ad452fc0b75d6135d33061e79c6e89e37ca66598fbac08e42211a6ea648e3b1c259d43c2b0c6f5ebcd15d02bc28509 SHA512 306e81266a59b9e628b5207204db7842620ff6e4dc1d657215865e4f5d9b440dd4a0608427df3b9138edc89fa8da7b15f8f50a6027514ff8a6c1ee33a5c0b27f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-18.08.3.ebuild b/kde-apps/klines/klines-18.08.3.ebuild
index b4a2dc21ef9f..d040d1872287 100644
--- a/kde-apps/klines/klines-18.08.3.ebuild
+++ b/kde-apps/klines/klines-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/klines/
 	https://games.kde.org/game.php?game=klines
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/klines-18.04.3.ebuild b/kde-apps/klines/klines-18.12.0.ebuild
index 00b2e3a600ad..b4a2dc21ef9f 100644
--- a/kde-apps/klines/klines-18.04.3.ebuild
+++ b/kde-apps/klines/klines-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/klines/
 	https://games.kde.org/game.php?game=klines
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 906d79894722..c5f4cdca04c1 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
-DIST kmag-18.04.3.tar.xz 589340 BLAKE2B f195d8e3c7e4178aa123ee198a673dd4881826ec6c8c9fd488bdac60dc39d4fa2bf0adc1eb42028803e8cf5dcc498f68ddb7c99ecf0d0129669ba2138c4846af SHA512 f3a9890906143824f36e2bd5ea191ddf68aedd7afeabff50c884f00d160c9ad670e96b5563afb1d5b2c9c2ec7842a49c0ee62781ea9337086f40875607b4e09e
 DIST kmag-18.08.3.tar.xz 628376 BLAKE2B 1556bdbc11a5c491e049065d096747a17e32d6d3cb3631a5cf509270910e7ba036e8933f02797993c39f6ec02472888677bd55e81b1d10af48fa5efc6d824a39 SHA512 220f933b0b83924bf6589b1b488cd18653e7531bad9f0d97c149c79e5bb4e2c1d441bce111c0f0304bb7c6ae33554bd666577a5a2e0a191f1e072cfe118b5146
-EBUILD kmag-18.04.3.ebuild 857 BLAKE2B e51060f466ca3fb7845575a3fb80fbe46933deb5e19141eb4a4c2024c82a9dbd3b3fb5101e831ee907fef31b49d9c5e1bdcbd8050cb6e10e33af603eb70664cd SHA512 741d51b88c16628b1eedeca0641ab3ca71f8e3c8bb6ddf36cdaec2d35eabd435f60ccd47d021caa5dab16146c9a7d3f3d7cbc6286785a012402ad13d61d491b8
-EBUILD kmag-18.08.3.ebuild 856 BLAKE2B c58b8e55b61cd40134aee34d7d7de57e12ee7ad1a1ea003b2398d38bbdf8e4f52a9b707badb48ab6451d2cb046602022b8312333ba817c3db55765777f3b7c4a SHA512 e84ed108b1949c8f3a544916940f26858d50afa1e75de66b47926aab7f7ace32242e6cc31e9086bfcbdd859038b10319a455c26df69ee14defc51ae803800215
+DIST kmag-18.12.0.tar.xz 628812 BLAKE2B ed27401b2598cae5726751eb3aa3ae3120c200bdfd38122e205a15f4de1ff2e5b02e0d9e02ad13674946dee9fc0ad7b3d923b01160196602f7e7a711ab9eb3b0 SHA512 124c074835729461309e6acfbdda1affc4fc3cd69c951ba0b5e3c897da30fed84099012a2571b34dfab3436a4bf872b362eeaebe6fd7c21815c8d36c92768e89
+EBUILD kmag-18.08.3.ebuild 854 BLAKE2B acd5ecbada5b9ef0c5a590e663426568225e1a00256d732968ca8477bf5d58fcbc741aec09d67bc33506cdb602b5760783785460b9199c6471a66f4946756a1c SHA512 1e8f89cde3656e71df824993157bd50eca7cf1739acf2b4ac9ca07639756d54e4b3797e8a789e58a99fd267a981087cd8caedbab1ae29a5cccdfdd577b2fbebd
+EBUILD kmag-18.12.0.ebuild 856 BLAKE2B c58b8e55b61cd40134aee34d7d7de57e12ee7ad1a1ea003b2398d38bbdf8e4f52a9b707badb48ab6451d2cb046602022b8312333ba817c3db55765777f3b7c4a SHA512 e84ed108b1949c8f3a544916940f26858d50afa1e75de66b47926aab7f7ace32242e6cc31e9086bfcbdd859038b10319a455c26df69ee14defc51ae803800215
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-18.08.3.ebuild b/kde-apps/kmag/kmag-18.08.3.ebuild
index 73fd726f7036..581fdaee7873 100644
--- a/kde-apps/kmag/kmag-18.08.3.ebuild
+++ b/kde-apps/kmag/kmag-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-18.04.3.ebuild b/kde-apps/kmag/kmag-18.12.0.ebuild
index f65edd9033fa..73fd726f7036 100644
--- a/kde-apps/kmag/kmag-18.04.3.ebuild
+++ b/kde-apps/kmag/kmag-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index ed2c40e7f2df..411dcbfb43f9 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST kmahjongg-18.04.3.tar.xz 4086376 BLAKE2B 2dc6c87c90eb6448ae26526c52fee81012457d56188e77fffe542bca3a2908627f538c37d84c2b2744c2105d2c09b13b938a9860a6f94d58dc00cdca77155ff7 SHA512 ce986e043a1620fc982ad0b6406214a53d4c3d912a36c5468fc9c4c986565fbca83e1f2d42179295fa7ba694ca1190fdd7c740d035c05fe378161c268ff8c0dd
 DIST kmahjongg-18.08.3.tar.xz 4064204 BLAKE2B dda79066121e4d31133e718deb46068b827bd8886d5b452b2e4d19af2264ffef4f4e30ca774cf21520be12ad0792a235eefd858083d68bf8c2a0afe5ad26b26c SHA512 ceabdbdaa89040cb5bae0512ee592c1f55da23b8a7c085f79e312a4919e4bca9c9c984b0c141af75924e0b9bc812dfc13e6feede70d2549c1d45b08a4c0d24c7
-EBUILD kmahjongg-18.04.3.ebuild 919 BLAKE2B 6f6c7d03718a1c1884cd05e759c43cbe6931bef488ef1086032d5e503c9ff63636b0d6e54fa3e38fad15552060bbd50827b9a5a7dcede35c4888046d1d478c4d SHA512 f0f8629356ae75045ea083099e0deec449046034a97a28119708565fae484aa88e1d41b53d519de7d21186dd2a4e730c0b3e93bbbab1f88e584bb36d2e62da31
-EBUILD kmahjongg-18.08.3.ebuild 918 BLAKE2B 8e1845f6c5c652e996dae86e3ca50b173e091a02e33699bca7c6b46d607735ab469299f7abfba2961ff6bf255b73b2fa3c4ae42a7db9e194397f8642e6bf44ef SHA512 fa4abc9992b171836559e87e1d567a09e7ca554c2fb930601b86a5a0f2c18b11daf4aaf8841b1560eec9f17133d4ee4ea3fc0bfa04629da0d7d55bbcc28798cc
+DIST kmahjongg-18.12.0.tar.xz 4063912 BLAKE2B 1ea5f2c08784518199a207b653c42143b2d1ba5aa6ce4747d047efd360fdbd0f0fa20602d7348b4aa7e2c71c0903700fabcaf3530b1b3c864fe3f5dcce350237 SHA512 54e60992476fcc4edf8612ccbc7de7f6d9ebbb7b6872f66d22d1172f896b1ddf4d017fedb18ebf72327a3a49ae90b3bdd3498e9b13d4b20d2ce6f4601950a32e
+EBUILD kmahjongg-18.08.3.ebuild 916 BLAKE2B c79c877fd11a95e9b9980487bf335f0a61270e72628b4aaf3dc00364a17537cdca84955a4c2ec553c859def6b8f3995494099285644304f3f36826c25f2d525c SHA512 4ee8021aacc775fb62113e968d85233dae1a15d71375b03819e67379aa1c35038761b3b0524cca896df1e975a0e098d184bd92e0151d776fdc18e539e7c180e7
+EBUILD kmahjongg-18.12.0.ebuild 918 BLAKE2B 8e1845f6c5c652e996dae86e3ca50b173e091a02e33699bca7c6b46d607735ab469299f7abfba2961ff6bf255b73b2fa3c4ae42a7db9e194397f8642e6bf44ef SHA512 fa4abc9992b171836559e87e1d567a09e7ca554c2fb930601b86a5a0f2c18b11daf4aaf8841b1560eec9f17133d4ee4ea3fc0bfa04629da0d7d55bbcc28798cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-18.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-18.08.3.ebuild
index d8d0479a3626..582cbf98057f 100644
--- a/kde-apps/kmahjongg/kmahjongg-18.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kmahjongg/
 	https://games.kde.org/game.php?game=kmahjongg
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-18.04.3.ebuild b/kde-apps/kmahjongg/kmahjongg-18.12.0.ebuild
index b6d62c354d25..d8d0479a3626 100644
--- a/kde-apps/kmahjongg/kmahjongg-18.04.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kmahjongg/
 	https://games.kde.org/game.php?game=kmahjongg
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 35881a214743..f81bdf11c49b 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-account-wizard-18.04.3.tar.xz 154896 BLAKE2B a35c47a78da31a280d3f2bb668cd777b1c30d0633ebcbd846381b4927c2a5433dc9bf7b3a5b36402d89b8ceafbbc1888b5dc7ffec11b6325f9713881aec76a70 SHA512 93e05feb39d8e31635ec7bb367ed8bda5fd5ac6ef2912763a080884e4a6dd03183f90e3768f80d97dd03cb25e3f98a2db567efc8b516b8597d52070b4e404745
 DIST kmail-account-wizard-18.08.3.tar.xz 156088 BLAKE2B 166fd701d409d07295a3423d126732029e5905ad5267695e0caa2025da1ffb0232f8cfc871134dcb80a8f48e256208f38011d3576e742ef45bd740a252aee594 SHA512 87200c12fd0bf5c24eca6609f97406553ba8dc60273705fd24474cb31e42dc4dbeccd4ddf43ae37cabc2e06e776f908fdc969c4f625b764ae69f827d0b5c477b
-EBUILD kmail-account-wizard-18.04.3.ebuild 1443 BLAKE2B 6007a7862e8aef132649f83be8b139a1202b3c8ecf62b32e63fbce7e8be706ee36e358a03fcbd555cced21d43a5d9ecb57e18eba0c7ea0c0d7d6a885e72bfc6f SHA512 4cdba7be5e9e59617a5f37ec4282e66dca61a13570acaffdc39738ecd5eab0b60ddd1d77e3ee1708832df59985e6d9a15e890ebfe1d02eae53e1e4911354eaa5
-EBUILD kmail-account-wizard-18.08.3.ebuild 1442 BLAKE2B bddabc879c6998b82a9605b15b9c99e5b235b38eb287637a1ba96a7a9624efd3017c9afe2f14519b709b4816040497319644112e3833f40250db0d48c5eb32ef SHA512 4991f1c267c1525aa946d822a47a0bb23adbe7dff5204987c72b11bf80195b184339df0969d500a717fe814858b52ab57452c72dc582d97fbfca5aa911cf9613
+DIST kmail-account-wizard-18.12.0.tar.xz 155964 BLAKE2B 845d656f600fd96f41fb5ce7d9d5f01f0ef959be0c6fa25ac3e9cb4201d43b33b11edd7a5736f42b7afaf10cb3da456c0ddd11fed57779d81055db8bfa76d1d4 SHA512 123be532fd47f1f912949eb7165db73d9613d9101f3a6c7f970e082c2ca5c3c2b20831428599f5804a07a17c2d52b7adc41b41485545ca4a17039c9f320b8752
+EBUILD kmail-account-wizard-18.08.3.ebuild 1440 BLAKE2B f1261fbebfbf63f4bb48b3b57cdcd50dfa3e396aaa8aa3b51cf4f57977fa5c54e2c836ff07dd0f6960e1b3114dfaf6426bf779eafadd49f3582a1fc23cd0e6ee SHA512 9ca3bd0650e977e8f6165f257731ed51cf07f4bf3ad672286b0bc85816c137da01fb62f472bef29077d880b14def9cca136744bb4edec7da1f601bfd34cc9fe0
+EBUILD kmail-account-wizard-18.12.0.ebuild 1442 BLAKE2B bddabc879c6998b82a9605b15b9c99e5b235b38eb287637a1ba96a7a9624efd3017c9afe2f14519b709b4816040497319644112e3833f40250db0d48c5eb32ef SHA512 4991f1c267c1525aa946d822a47a0bb23adbe7dff5204987c72b11bf80195b184339df0969d500a717fe814858b52ab57452c72dc582d97fbfca5aa911cf9613
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.3.ebuild
index 08cc9666e24d..6a39e9fd3a22 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.0.ebuild
index aac8da52342e..08cc9666e24d 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index f809697f9035..0672d0a4fd9c 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,8 +1,5 @@
-AUX kmail-18.04.3-no-sync-after-save.patch 2855 BLAKE2B 596c70f83acc4ec9a4468b4de3c27f67b79c900a8c1de292dafd055ca784f5b8d5a02da16ef2779ef0c15a5990d61c7dcea06e7a15884efc815800a1e75deb0e SHA512 7f0e6ddc04ab25a927a1bbca3190a5ba1ae3f31c2183f9052bbc003a5a6a26acd8b16326f23216a6576ff6c85f9fb2ed76f095238a2076eb1f8e6ce86e58f5c5
-AUX kmail-18.04.3-setAutoSaveSettings.patch 1768 BLAKE2B 55517b2e889cea2bbe6729c176f4f32275fd92026bd6c2d55bda68a711b861915ae71a591a541d7fcb90decfea5d1d54ec09d40d6054e6905d3f39043467af2d SHA512 ca4d7636c4913b4a4534cb8975663181968c10c3e93a3ffc78f51a48f3b9a4ed5d007f87473570238e2321b21a6ebbdfa3a29f753d8789ba0f637cffb29b2887
-DIST kmail-18.04.3.tar.xz 4757552 BLAKE2B 281c4e131518dd6efb9172d5db83e6945570943f7942ace28a9d5542130ea9636191894a72043410c641b9d3d8731efdf5b72d0e25ee5058948e6f1bfdd2f3f8 SHA512 216f57078ea32ba4d9cae70e7c2aaa28957c677e9c0eef9f4ed32fd405f63e02881f87b6a44530d9ca65839535c775de4913aad83bec8e253ff6fd01a45f61b1
 DIST kmail-18.08.3.tar.xz 4778216 BLAKE2B 18cc1402fe56e53b99ae3b4b152cb88b4831a9a851f359dac39b23c249790107a80ae6937a78b62c5b561e6a7ca89bbac1b58075993465e56fdb3dd67b35bbfb SHA512 1ce516f18d01f8a4bb2cfcee8adf6fcd32d8ee2fd2a9005935c57fbf2cbc9ef35dda98815202822f606cf7a7131e86fc6eef875975da4e00bf421bed5a989c6e
-EBUILD kmail-18.04.3-r1.ebuild 3276 BLAKE2B 25eb03f9eafa05d731a2ccaf2d7e15862db7b4ba97b27c7528c7cd975b48450a39cceaf3554cbba6b084860c78275bf8bb3d22f6b37ede3be0e86a61da5511d2 SHA512 e96071bf6f344e952e42fd4b7e1b9f5ac3d1bb4a97648f294cf070f6a29428861ce5938999fec46ebefdc3cd9fccf9821e55271dda2c59858aa6d63447221e40
-EBUILD kmail-18.04.3.ebuild 3170 BLAKE2B 0959bb4a869f93c30655327319568fa4ba6017e1d83522012f5a463b89e1a31742bda341a40f02f093f118bef807b41276d607bd90404c27b8de0f4378343fe0 SHA512 d32da391c2f2b3a78e82d1405fcecd5967262a26dcd7adfbb7ccc9d9dc10ba5dbdca7a50322a28dc866f69a8bc697b77182a2b84cca87ca6ab69004557181b69
-EBUILD kmail-18.08.3.ebuild 3172 BLAKE2B 1adfcc5906b6209567caf6f9d440de033c9901b0dc810e874f2e159422845321e1279523c892db94a04d6d9580ccabb404d91996ab75e78763b5161b5bf81c7e SHA512 d367827f076b74198c3b4c44f9036e3084e23128f0aa248c23ae20a828a4ba7d41aef7489c89300a0a4d6e27789ceeaf990dc51a53219f7f7e56a79252c0e840
+DIST kmail-18.12.0.tar.xz 4723296 BLAKE2B 1ee5e9ebc868022a56f33c7a22d6df26db1bce86c49785170a86f5b8ad48a9e089e444945ad8442ef24b22fd6021b59cbe85ef9e4716c57e19643f46c8eafa88 SHA512 4d0af86686315c1ed01984aef6b8044fcb7545b70cc4769a4fcbea737b22eb61346dc4593b6d4af9f0a8c1856725f9480e53789ddc3046acfef589ac5a03de0f
+EBUILD kmail-18.08.3.ebuild 3170 BLAKE2B 0959bb4a869f93c30655327319568fa4ba6017e1d83522012f5a463b89e1a31742bda341a40f02f093f118bef807b41276d607bd90404c27b8de0f4378343fe0 SHA512 d32da391c2f2b3a78e82d1405fcecd5967262a26dcd7adfbb7ccc9d9dc10ba5dbdca7a50322a28dc866f69a8bc697b77182a2b84cca87ca6ab69004557181b69
+EBUILD kmail-18.12.0.ebuild 3172 BLAKE2B 1adfcc5906b6209567caf6f9d440de033c9901b0dc810e874f2e159422845321e1279523c892db94a04d6d9580ccabb404d91996ab75e78763b5161b5bf81c7e SHA512 d367827f076b74198c3b4c44f9036e3084e23128f0aa248c23ae20a828a4ba7d41aef7489c89300a0a4d6e27789ceeaf990dc51a53219f7f7e56a79252c0e840
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
deleted file mode 100644
index c770dac239b4..000000000000
--- a/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From fcd21f9712143afb956dca2f67fb930fffc074fd Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 31 Jul 2018 11:59:24 +0200
-Subject: KMail: don't sync after save, don't reload after last sync
-
-Summary:
-* save() takes care of sync() already, if anything changed.
-* When quitting there's no reason to reload the configuration.
-
-Test Plan: None yet
-
-Reviewers: mlaurent
-
-Reviewed By: mlaurent
-
-Subscribers: kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D14509
----
- src/kmkernel.cpp | 26 +++++++++++++++-----------
- src/kmkernel.h   |  1 +
- 2 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
-index aafb9ee..7af593d 100644
---- a/src/kmkernel.cpp
-+++ b/src/kmkernel.cpp
-@@ -231,7 +231,7 @@ KMKernel::~KMKernel()
-     mMailService = nullptr;
- 
-     stopAgentInstance();
--    slotSyncConfig();
-+    saveConfig();
- 
-     delete mAutoCorrection;
-     delete mMailCommonSettings;
-@@ -1172,16 +1172,7 @@ void KMKernel::slotRequestConfigSync()
- 
- void KMKernel::slotSyncConfig()
- {
--    PimCommon::PimCommonSettings::self()->save();
--    MessageCore::MessageCoreSettings::self()->save();
--    MessageViewer::MessageViewerSettings::self()->save();
--    MessageComposer::MessageComposerSettings::self()->save();
--    TemplateParser::TemplateParserSettings::self()->save();
--    MessageList::MessageListSettings::self()->save();
--    mMailCommonSettings->save();
--    Gravatar::GravatarSettings::self()->save();
--    KMailSettings::self()->save();
--    KMKernel::config()->sync();
-+    saveConfig();
-     //Laurent investigate why we need to reload them.
-     PimCommon::PimCommonSettings::self()->load();
-     MessageCore::MessageCoreSettings::self()->load();
-@@ -1195,6 +1186,19 @@ void KMKernel::slotSyncConfig()
-     KMKernel::config()->reparseConfiguration();
- }
- 
-+void KMKernel::saveConfig()
-+{
-+    PimCommon::PimCommonSettings::self()->save();
-+    MessageCore::MessageCoreSettings::self()->save();
-+    MessageViewer::MessageViewerSettings::self()->save();
-+    MessageComposer::MessageComposerSettings::self()->save();
-+    TemplateParser::TemplateParserSettings::self()->save();
-+    MessageList::MessageListSettings::self()->save();
-+    mMailCommonSettings->save();
-+    Gravatar::GravatarSettings::self()->save();
-+    KMailSettings::self()->save();
-+}
-+
- void KMKernel::updateConfig()
- {
-     slotConfigChanged();
-diff --git a/src/kmkernel.h b/src/kmkernel.h
-index e7fc071..f5da22d 100644
---- a/src/kmkernel.h
-+++ b/src/kmkernel.h
-@@ -487,6 +487,7 @@ private:
-     void resourceGoOnLine();
-     void openReader(bool onlyCheck);
-     QSharedPointer<MailCommon::FolderSettings> currentFolderCollection();
-+    void saveConfig();
- 
-     KMail::UndoStack *the_undoStack = nullptr;
-     MessageComposer::AkonadiSender *the_msgSender = nullptr;
--- 
-cgit v0.11.2
diff --git a/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
deleted file mode 100644
index a7377b61f190..000000000000
--- a/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 814f0db2a1ae5b15bf91909ce80a5d6792f9aeed Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 29 Jul 2018 13:05:38 +0200
-Subject: Port to setAutoSaveSettings so that saving happens before hiding.
-
-Summary:
-See d35a882895 in kxmlgui for more complete explanation.
-
-BUG: 396339
-CCBUG: 395988
-
-Test Plan: kmail ; Alt+F4 ; kmail -> now the statusbar and toolbar are visible again
-
-Reviewers: ngraham, elvisangelaccio, broulik, cfeck, mlaurent
-
-Reviewed By: mlaurent
-
-Subscribers: kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D14454
----
- src/kmmainwin.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
-index ce3b042..f3550ba 100644
---- a/src/kmmainwin.cpp
-+++ b/src/kmmainwin.cpp
-@@ -76,7 +76,7 @@ KMMainWin::KMMainWin(QWidget *)
-     createGUI(QStringLiteral("kmmainwin.rc"));
- 
-     //must be after createGUI, otherwise e.g toolbar settings are not loaded
--    applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
-+    setAutoSaveSettings(KMKernel::self()->config()->group("Main Window"));
- 
-     connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg,
-             this, &KMMainWin::displayStatusMessage);
-@@ -94,10 +94,6 @@ KMMainWin::~KMMainWin()
-     // Avoids a crash if there are any Akonadi jobs running, which may
-     // attempt to display a status message when they are killed.
-     disconnect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, this, nullptr);
--
--    KConfigGroup grp(KMKernel::self()->config()->group("Main Window"));
--    saveMainWindowSettings(grp);
--    KMKernel::self()->config()->sync();
- }
- 
- KMMainWidget *KMMainWin::mainKMWidget() const
--- 
-cgit v0.11.2
diff --git a/kde-apps/kmail/kmail-18.04.3-r1.ebuild b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
deleted file mode 100644
index 80a2769dd4ac..000000000000
--- a/kde-apps/kmail/kmail-18.04.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kmail-account-wizard)
-"
-
-RESTRICT+=" test" # bug 616878
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-sync-after-save.patch"
-	"${FILESDIR}/${P}-setAutoSaveSettings.patch"
-)
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	elog "KMail supports the following runtime dependencies:"
-	elog "  Virus detection:"
-	elog "    $(pkg_is_installed app-antivirus/clamav)"
-	elog "  Spam filtering:"
-	elog "    $(pkg_is_installed mail-filter/bogofilter)"
-	elog "    $(pkg_is_installed mail-filter/spamassassin)"
-	elog "  Fancy e-mail headers and various useful plugins:"
-	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-	elog "  Crypto config and certificate details GUI:"
-	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-}
diff --git a/kde-apps/kmail/kmail-18.08.3.ebuild b/kde-apps/kmail/kmail-18.08.3.ebuild
index 56e4cd96e314..7edc02c76e08 100644
--- a/kde-apps/kmail/kmail-18.08.3.ebuild
+++ b/kde-apps/kmail/kmail-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmail/kmail-18.04.3.ebuild b/kde-apps/kmail/kmail-18.12.0.ebuild
index 7edc02c76e08..56e4cd96e314 100644
--- a/kde-apps/kmail/kmail-18.04.3.ebuild
+++ b/kde-apps/kmail/kmail-18.12.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 38d67f63c9a6..e4f824eacbe5 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
-DIST kmailtransport-18.04.3.tar.xz 165156 BLAKE2B b303d8435e5df867b9c911f1c580f4a994b45fab9ac763fa58c6072629811f22d978faa10c8c1e6c7eca788187e27368a166210babe0b282084b424076e0acf8 SHA512 c371016a6d660b12feac9d1d705116537797206ff6b01d2fa488247929241f9b179a541dfb1d0da4d0b14e050f4e586b055a8228bc3339ac403f8e72c683626e
 DIST kmailtransport-18.08.3.tar.xz 165984 BLAKE2B 3f728c77f3340a5d4a0cf05bf4a62f54ba15fdd797162b1eab6b3db8b4ccfe008fa95bca27d8f71eb8c9b7b67db870844b09b3b2e9525d71e333df83483322d0 SHA512 aa091ee09efae4fef47ee64de503ec3ab9dbecd212a112d97727956d4ad51955a61754f37df864326e1bf5b91d527b3e954033f6d3a6106c189a7cd8c7dc3148
-EBUILD kmailtransport-18.04.3.ebuild 920 BLAKE2B 9b8a7edebb1b54d882fa1857103cf10e0422959f25c720958a16d636a14f181977876d85a30f0fd3de7ae763c21f7d3232d849b4da9bbfa202affd7a74698957 SHA512 3c5681b817d17ce9731b49d6da1194015dc4ac05d383dfc9c7c59fb7f1b36f1dd90c101e1c507a9efa6b6d67085390dc4cf9c3fa0021ed1e61fd239dca280f6c
-EBUILD kmailtransport-18.08.3.ebuild 948 BLAKE2B 03802cef2e30c2326d5872f70e2d86b95c866c9d5c555a1f52010bf3aab31f4f27d5ab1e9e1fcd145a2f7230da6be15509dfcdf64bcd690f9b5e6defc821b508 SHA512 7f131a127a7e527f1824c7c9255e3392f5c5750692bc3ccd1a1a9281660bb6c962e2a950a5a4f3afbae908a3866e5c03e4cd7707a4ab97562b7fd27422ba5d03
+DIST kmailtransport-18.12.0.tar.xz 165880 BLAKE2B 44390678627e55d66df70a90fa2349c2691aed1386870657547aead2ab4b70d4c04aa98835bf113ca0730ff05b1cd07498739411a3add60b2e068444e51d4096 SHA512 7f86e84b38262fd14164f5b340ab9957efa696be72613892d666426c4ed7b1e90ce71f1e19a04ce965958ce33b93d26f84983394b99cb31668b21b4bfaf2384d
+EBUILD kmailtransport-18.08.3.ebuild 946 BLAKE2B 6e03412ed630264161002fbf57603cfd46018f1cf7669fb1af4ee308291a28a79abe6789bffb86a4108efe86af0f1c86c51ecb7aae523142d0ad60661b218699 SHA512 27a0cd212515ca3ae6382a121afe1e8e4d433d7f4f7b2e2fe2c53becd4030627cacbc9a4566d7cbc3ae00646b58e6e0b2db28453d810732333f2cede9f498cfb
+EBUILD kmailtransport-18.12.0.ebuild 948 BLAKE2B 03802cef2e30c2326d5872f70e2d86b95c866c9d5c555a1f52010bf3aab31f4f27d5ab1e9e1fcd145a2f7230da6be15509dfcdf64bcd690f9b5e6defc821b508 SHA512 7f131a127a7e527f1824c7c9255e3392f5c5750692bc3ccd1a1a9281660bb6c962e2a950a5a4f3afbae908a3866e5c03e4cd7707a4ab97562b7fd27422ba5d03
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-18.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-18.08.3.ebuild
index 650675c741af..1fefae8ac33e 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.08.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Mail transport service"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmailtransport/kmailtransport-18.04.3.ebuild b/kde-apps/kmailtransport/kmailtransport-18.12.0.ebuild
index 9d24bd3ea8c4..650675c741af 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.04.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Mail transport service"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -25,6 +25,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep ksmtp)
+	$(add_kdeapps_dep libkgapi)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index dc4c94f69546..d1c6c83b51a7 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
-DIST kmbox-18.04.3.tar.xz 24552 BLAKE2B 26ef3f094ba959fa96a186332306d824367c66ebf2163a2f2f00398f57115540ced120c6a8087c73fba27e3e8f500f2573f9e42cf0aef597a3430c19c5198046 SHA512 72c82f74723f661d486e3c502e028072fd9c7556d73a364384898187e124e596b0eb0f62f4edbd8dc2aafc3ae2fb397545b4c1d04016d30a6232dfac9b16f99f
 DIST kmbox-18.08.3.tar.xz 24572 BLAKE2B af25951c7d29ff19dca05626423844472640a82996e5683d7f214485b916b27bef75b1cb0dababd2f8b2c15c0439225189731aeb0bf7d9dee45ae4bcf712f079 SHA512 ad72ca418931c7f52ba3cd377db12843258ac949f12c7f074596c5114d3bb92c61a0edb4210b3cad39f4e45c4590af48ecd856783fb222bd5780edb96a6c8b79
-EBUILD kmbox-18.04.3.ebuild 309 BLAKE2B 455819bdc1f3f68251a13c8449aeb6be5e2b7e54dc73f78a852b6ec3e8c2b2a893adc1ab9f2dcccc016a1e80bfc46b6c1d936d35784ac7da7d2398dc4b623c02 SHA512 20f579addae7175ce34af42be9092340339b17b36562ba819228658a50b5d72f1187c6cb7267e0d7d513237ebe84f152e902807bc1b0392ffa0fe59675db634b
-EBUILD kmbox-18.08.3.ebuild 308 BLAKE2B ecc00fe9f0c5682e2302c53cb2e84651e6629a572dbc504ea4068f1794de7547a4cdfe294d96b37ee779d02377993445d286873a9b4dca2b7c2e7067baefca4c SHA512 91cb758945c3c55b43ab9d96fd43c2a620157937afd9f511096cd3e9ec316068e5271e34fce2d130914ec88c8ffe1329d62c71c34ab91c71de1e344789c4581f
+DIST kmbox-18.12.0.tar.xz 24660 BLAKE2B d025f9c28f1dfb4f54b5afd0eb22ab746375bcf6571ab1e07596fba1f15baea75882e9035ae58c29391dfd3057b549d1e16f982af28409b7f2c95474c1498ca5 SHA512 facaf2679fe2e0cc7ce92fa5bc6e7f09037f294ede82c75adf67069f0deab6ac515784ccc61525c66ee96a02bb2e65244b2ccd7b3f7ca07f3ece53c97864214c
+EBUILD kmbox-18.08.3.ebuild 306 BLAKE2B 5b47c0a3a44fee24815cd7c5cb38f11d5f67118ab31aea88c1d9ebead35b3b38d11bbfe00e1b2de969023c16798a68ff8400c4815a7de2de22fe96358bb6ca79 SHA512 8dec59a82306080510cf0f99d4382b718bf903bd152db7939dd287ab438099f0e2d28657bd6ddf0a7d06d3bb1ee9ca82b58809fa92e9422ce7d53d9356140572
+EBUILD kmbox-18.12.0.ebuild 308 BLAKE2B ecc00fe9f0c5682e2302c53cb2e84651e6629a572dbc504ea4068f1794de7547a4cdfe294d96b37ee779d02377993445d286873a9b4dca2b7c2e7067baefca4c SHA512 91cb758945c3c55b43ab9d96fd43c2a620157937afd9f511096cd3e9ec316068e5271e34fce2d130914ec88c8ffe1329d62c71c34ab91c71de1e344789c4581f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-18.08.3.ebuild b/kde-apps/kmbox/kmbox-18.08.3.ebuild
index e397b6a2bc69..a9c2aa84955b 100644
--- a/kde-apps/kmbox/kmbox-18.08.3.ebuild
+++ b/kde-apps/kmbox/kmbox-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for accessing MBox format mail storages"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="$(add_kdeapps_dep kmime)"
diff --git a/kde-apps/kmbox/kmbox-18.04.3.ebuild b/kde-apps/kmbox/kmbox-18.12.0.ebuild
index 3e28fef4ac42..e397b6a2bc69 100644
--- a/kde-apps/kmbox/kmbox-18.04.3.ebuild
+++ b/kde-apps/kmbox/kmbox-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for accessing MBox format mail storages"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="$(add_kdeapps_dep kmime)"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 3952b3780aad..a3a399e7a615 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
-DIST kmime-18.04.3.tar.xz 146276 BLAKE2B 41d9ec8feeafac110008de3816b4fe4e921368668ef7fc4813ee76b270106dae2d30dec79ddefcf144b4533574ee7d07e3ec25da0a8a8db1f3a6f19b80970df8 SHA512 274a0835fe429b6d442f287bbfc5953639bb4cae3c24f29bdb11092aa85ccb60d5b555161d778077460014fa5e5362f617bbefd630700696c2160d6013c220cc
 DIST kmime-18.08.3.tar.xz 146980 BLAKE2B e858337a16f844875f1214d144abf8a623415e6f1d70418df5ff453f78ff67c54a81b3844effbef41da5fa55e1ce584ed548c3cc7e4af47cbae5e793f8391abe SHA512 1dc8113b0853b29eeeb7c30a69c30f4778f8e176d49a3e05cb0229b9575394ab9d3461cd5dffee7aac2e3ec738b5023c859ab94209a788c40efe28685f079ebd
-EBUILD kmime-18.04.3.ebuild 379 BLAKE2B 216ed6d21e1450630791516fc558d407840f4839a29251580707da273b38ee58e7a5ca0f7277e1d76df18be46e4f48582691e7d29b8a08d7fcf66d3fc4cdbab8 SHA512 9a3fd01d1dad25cbb1614bf1beec04bd3f6b2afdd93c9eb78b24992eb0920d2a5dd10259441adc92efd41c3b46307578e7fc8e8bfb78b8bff917abb8c4bcd709
-EBUILD kmime-18.08.3.ebuild 378 BLAKE2B 5468677043f7d82d9c4f78066528e863e71661a0bfaf4c12ad455ac660e6b65febe6f35cb3e69e16e2f6998c9b15e669c891f8e11061d654a8d78d00836db2f6 SHA512 e530ca31acaa9de5326ef7a40349e53c5a2fc21e60161f9a9e1229dfa5d9f98a7812e8daccf68cbf3dbde7ae610d5c7f693101696c400e21239f726a4b197606
+DIST kmime-18.12.0.tar.xz 146912 BLAKE2B c578218c75b686db0cf83c6a53a3b0bf8b067c3c6df3ea40da7bb0b7ee367029e1621c276440e566709adb8e034b2a97541da23ea929fb6d1323ebc288de5e2b SHA512 6299c7b695c2b41ae1f35fe49d55494b2de3bd462ca15a68e3a81fd13497713472edf5bc1637c20ef290db6d29151529f09843422d6d8eb275bbf47e1228c01a
+EBUILD kmime-18.08.3.ebuild 376 BLAKE2B 94b3f933814cc481ab56cdf08b350d10dd50ddbebd18caf6fcce5856d21e4f3963180b63be6f3af85f639e9f349796a79baf0e0f711df91e85d8dac6223aa302 SHA512 0711927e13b5c599decd486e66a33a84c2d54efbd223674ea164ffb5ef49d6d87e9d5ad3a7d257802ddc358820ab0d0fd548399ee1e3d2cb9d49d7830f3209a7
+EBUILD kmime-18.12.0.ebuild 378 BLAKE2B 5468677043f7d82d9c4f78066528e863e71661a0bfaf4c12ad455ac660e6b65febe6f35cb3e69e16e2f6998c9b15e669c891f8e11061d654a8d78d00836db2f6 SHA512 e530ca31acaa9de5326ef7a40349e53c5a2fc21e60161f9a9e1229dfa5d9f98a7812e8daccf68cbf3dbde7ae610d5c7f693101696c400e21239f726a4b197606
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-18.08.3.ebuild b/kde-apps/kmime/kmime-18.08.3.ebuild
index 9ac5848c7cb7..c61f0148a577 100644
--- a/kde-apps/kmime/kmime-18.08.3.ebuild
+++ b/kde-apps/kmime/kmime-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmime/kmime-18.04.3.ebuild b/kde-apps/kmime/kmime-18.12.0.ebuild
index 3a8402553cd4..9ac5848c7cb7 100644
--- a/kde-apps/kmime/kmime-18.04.3.ebuild
+++ b/kde-apps/kmime/kmime-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 066b5a1b1428..45ae3ce831b5 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
-DIST kmines-18.04.3.tar.xz 882592 BLAKE2B d8f942a971d4c0944f22f871b7a0861e3ae8329ae51d5745488d9e9715801ec5daa5efa3cc5722cbaa06cdc88585393571ebe29aaf6bd3831043c88e91cc49a8 SHA512 580730e896b70cb7923c34f223026f74c9451096d7cae53ef775c100957e774687e6e9902dee90c49b05f96d25480cc858269e0af462f7873516d9d91ea29374
 DIST kmines-18.08.3.tar.xz 901348 BLAKE2B 90f20295c7128da496cd0489f7ae5f21ad6bf01df262a9c314d95ec170fdfa3e24748b5464aece8ab2e032c9b37ef44b9d22a2c7d68e612efa01ce36db9ab28d SHA512 24e4d00ce9bb595d598fa9c473167b005c0a7fb6ff7e84858aaf29fa018ca295d1e5172064ac1f42efb10b6d7ddf018577e1f331895bf5d4c2805950995805c2
-EBUILD kmines-18.04.3.ebuild 773 BLAKE2B 10d7004524f7f641407361453077250c3069ce28f6dcf2281ed5bfb66bb155c8eb0bffcc4c857914acb960c3c13056dc7fd5c949cde406ffd6468ff6f81473ce SHA512 6fdd7890ce470b3596249de91c0194453fba15b32c7f1bd3fd4dea40ee375e636b80a3f718308daea3d99f1ff6d4b505114423deda6d8037cc04c18ee39aa642
-EBUILD kmines-18.08.3.ebuild 772 BLAKE2B 67542fe80e324d819ba087d8fbb3e545db683a6cb5752cef487c3e6ee0a243072128575939f881886e2dc3ea9ad975952e66fd8b8f9e87b2cd402eab545b046e SHA512 2f7a0e09286336c60b55bd3beb46673682ad8f68059d1510352f0236f6212204bc9378c6cc4aee7a24f44c7c79f1ebdae9089e4b853c4d8cbff0d27ba3cd835b
+DIST kmines-18.12.0.tar.xz 901096 BLAKE2B bd23763790caaa4e903cbe98fd4771a422261cce83e6b714e2638612cda8a15d9c01e6f372c7f195c7f4ae923c3cd05f95aaf59e7dddee2dc83c784d65f1cf51 SHA512 61aab02df4bd6a3ba261bdc0df13ae1977dd319164329466c64abd6e2c21650fd798aee4e722016637692939196e8a532bbb9cf4f7f050d32e0854aa0fe88401
+EBUILD kmines-18.08.3.ebuild 770 BLAKE2B 29ed8a44dadfb15e79314087f73f8bfce2d4b5281ed081ed99155fec2b4102b70b8058f17806818e490c981877a75ab3e401eb03b542022d1d70b0d5655dedef SHA512 4290cbeef0760deb5f547076c903a25003cdb8fce45d38acf6ebe14dcec1530bc3f433b1380b78bbb99c1f3483ce1cb3383b7ba7540fbec7b4ad1800c014895d
+EBUILD kmines-18.12.0.ebuild 772 BLAKE2B 67542fe80e324d819ba087d8fbb3e545db683a6cb5752cef487c3e6ee0a243072128575939f881886e2dc3ea9ad975952e66fd8b8f9e87b2cd402eab545b046e SHA512 2f7a0e09286336c60b55bd3beb46673682ad8f68059d1510352f0236f6212204bc9378c6cc4aee7a24f44c7c79f1ebdae9089e4b853c4d8cbff0d27ba3cd835b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-18.08.3.ebuild b/kde-apps/kmines/kmines-18.08.3.ebuild
index 2651ed5425e8..17fa4259a179 100644
--- a/kde-apps/kmines/kmines-18.08.3.ebuild
+++ b/kde-apps/kmines/kmines-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kmines/
 	https://games.kde.org/game.php?game=kmines
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/kmines-18.04.3.ebuild b/kde-apps/kmines/kmines-18.12.0.ebuild
index cb01f30961d2..2651ed5425e8 100644
--- a/kde-apps/kmines/kmines-18.04.3.ebuild
+++ b/kde-apps/kmines/kmines-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kmines/
 	https://games.kde.org/game.php?game=kmines
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 439ea813c049..412a385ef883 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
-DIST kmix-18.04.3.tar.xz 1284556 BLAKE2B 7c09365ef0629c55ae8bd88335e2fa2eeba7fd934f18dbae96025b992e94e51083b8293f6ab9dcab2efef099bb4f81a367319d5050253b628409ee5979545594 SHA512 768b787a939e10e045f7af4d8d6a47d216da17dd73c0d8d3d73a93855998bc3f345bc38d6b9298d63e8149523a6d9280ff89467edc01b2c085be8b138b29dad6
 DIST kmix-18.08.3.tar.xz 1073328 BLAKE2B 8da9f30c1f9fc9b7c8c342f48039123613907a8b5ac7120135a68477b1405eea942368877becdf9674a7ece096e21cf00e4b2cebe5d000a7ea2169c947b38a06 SHA512 6cbc2bb5ceefd4a834a59662da67b51dac4ae4ae046af72ae7a87532c5e6fd26f401473713ebef6e81aca1d247870cd06c7b4c8f8b0880966ed3ba6f4f567994
-EBUILD kmix-18.04.3.ebuild 1257 BLAKE2B b6e380cfc5ad9dacfad944abdf8938eedeef0b2fb645ed3b8e9326991468a08d674327cb5bb883084867c13023e20b33ccb98b3b1aee513f005bf3ceaf0fd980 SHA512 a5f8527e8a10eab94ff93b1694a8656c460ae1b6c5bb91f4f6741a2a140bf6e0c98720b2041c69ec9a85ea86b82366075443bdc3c82c6676c418df42b28dddf0
-EBUILD kmix-18.08.3.ebuild 1256 BLAKE2B 84f8b7c3ebfa2720c3167e042af7a22a12a1fbf6920203c2f2ae01d9804d76a1ade3d4f13ac6ea90e0c67ebdee719f8e072a319c70905ddb7e3c7423f951bffa SHA512 70e4a9356a542573f999bef43686646bace4c1f442be3b326864ed95401508df4bec0a171397da0bcd30919502cedf325c4cb162a471f339539362422dcf6506
+DIST kmix-18.12.0.tar.xz 1075664 BLAKE2B a23ebc2b7b1486207f1fd40b10a83251070759b03539ec92ed78b70b4ba6d5f7206357392ac3df5a4eb1184440373f8d4fca9edfe62ad5cef56792f157c01ff2 SHA512 793dfd2533c7dc76d4d4ff0d68b57cad6e82e3ed6f3ccb8375b72730b689a54b1ceb23189845afd71ec26ebf0fd485f1c9e63b89203a4be32283387606203b91
+EBUILD kmix-18.08.3.ebuild 1254 BLAKE2B fd34e24743c360edfb600b1cd2d4446a17f0520e2cf52f7eacbf919b083ca6c347d90501e577d3eb6bd3cbbf50052a8c1832efdb7018b0a460e6e99fca2132fe SHA512 e8775cd623d9f7e032c5486046e71473eb2725c2be144647320d5ec160d08e0a3d137520165f786f548cea292cbe19f6aff9d38f7c2fc620513c95875b970fba
+EBUILD kmix-18.12.0.ebuild 1256 BLAKE2B 84f8b7c3ebfa2720c3167e042af7a22a12a1fbf6920203c2f2ae01d9804d76a1ade3d4f13ac6ea90e0c67ebdee719f8e072a319c70905ddb7e3c7423f951bffa SHA512 70e4a9356a542573f999bef43686646bace4c1f442be3b326864ed95401508df4bec0a171397da0bcd30919502cedf325c4cb162a471f339539362422dcf6506
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-18.08.3.ebuild b/kde-apps/kmix/kmix-18.08.3.ebuild
index 9945973078c4..515c1295caad 100644
--- a/kde-apps/kmix/kmix-18.08.3.ebuild
+++ b/kde-apps/kmix/kmix-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plasma mixer gui"
 HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-18.04.3.ebuild b/kde-apps/kmix/kmix-18.12.0.ebuild
index ffffc8a80760..9945973078c4 100644
--- a/kde-apps/kmix/kmix-18.04.3.ebuild
+++ b/kde-apps/kmix/kmix-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Plasma mixer gui"
 HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 596ded4926e6..db31f7c3d157 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
-DIST kmousetool-18.04.3.tar.xz 112816 BLAKE2B fe69bf4c4b5060732e2ec04b4ced3bedcf042a1779285602cdf8c92da6c1c9f21616d91c803fa750006d9eb74b3cad9709dd7a6daf9181c2f7315bfc344e7842 SHA512 46821eaecc616288892226d5f7c9a2eea97b8e2e822d2c98871ad028dd0b9b71404f2b74a6032299266623239d7a57e8ed09dbfeb6b8b54f50e8c747e98564b2
 DIST kmousetool-18.08.3.tar.xz 113032 BLAKE2B 48a83c8caa9f54da18ca61cc1abed52b7779ccffffbd48b5523f612057ef9f226e12cb675c36fe6edc42a0d6a2557c932caf63fb9df98f03fe6c65b75c9eb95b SHA512 7caf340cc7570eda6b563d8fc498a386a33dcac54bd998c040ebec60e108c87a83a2b114841540bffe094ab247d4561ec78c6ca82b44fa203120bf0c5cefe7b2
-EBUILD kmousetool-18.04.3.ebuild 819 BLAKE2B 6a2ea6ff7754da477d8ad6811a29fc343cda6f2db8d170c6bbbcf9e84f93a65b475f6b4a069d4e048bd658b1cd6445f5203f07b489253d5fc93280053d22006e SHA512 2dd8c2c3ec5e7851267027ab2c9b3f07e2748ccccd92e839abcd5bc9a776cd8171ba129ef3feeed9347aea1ab5b1953288d752f967c16b472234ad3d21992906
-EBUILD kmousetool-18.08.3.ebuild 818 BLAKE2B 3fa65c8de4332e55fd4a9175e4c54986a1fa7931c59be856469d26ac38e917733862bde4053447a439f80e698fc2a33d5fbf939ae69f2cf7a41928ede6593d60 SHA512 f4d5b273059e679f215f7a9ee69d9f1daeda650dac5558feff317bfcfb9d9fa362c0b4ac0bf034e9a3a10159d15d019e8bcff584f0c5bcc57e9620d85d742975
+DIST kmousetool-18.12.0.tar.xz 112708 BLAKE2B 5b29e15f78b6cc844b297f03adc6d265b72142aad0ee0cae7a1c7097d0d14476151174c47d311f5c50a37e32c2b884f5e1a73c01fd6d612cba0013a4121795e5 SHA512 0ba16a4926254477112cdccabc7c0f92b349079f3dde21e99ca0dc0cbea7fbf6dd9ac09aa1f120ae916dd95c591823fe90461a9921ad7793893af14bd62e484d
+EBUILD kmousetool-18.08.3.ebuild 816 BLAKE2B 8f4fcfea75a23317952b5e88bb82ea4f222a90ce339dfc9e0659931445c5a66f0fe52e5088e05754b164353e64a42bad6f0eb6222354b1d0feb64c43da7f282d SHA512 4ecd777325d8991a9e23791b4f126a994d8dd945ed58db55d8e9c8382c2830258e99c0d2b1248632669bc1e12c42d5f8f7e3f31968540453f2bd57c39b096c7e
+EBUILD kmousetool-18.12.0.ebuild 818 BLAKE2B 3fa65c8de4332e55fd4a9175e4c54986a1fa7931c59be856469d26ac38e917733862bde4053447a439f80e698fc2a33d5fbf939ae69f2cf7a41928ede6593d60 SHA512 f4d5b273059e679f215f7a9ee69d9f1daeda650dac5558feff317bfcfb9d9fa362c0b4ac0bf034e9a3a10159d15d019e8bcff584f0c5bcc57e9620d85d742975
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-18.08.3.ebuild b/kde-apps/kmousetool/kmousetool-18.08.3.ebuild
index 11cdc28ef286..90f7043666e5 100644
--- a/kde-apps/kmousetool/kmousetool-18.08.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE program that clicks the mouse for you"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-18.04.3.ebuild b/kde-apps/kmousetool/kmousetool-18.12.0.ebuild
index e73bd5f9364f..11cdc28ef286 100644
--- a/kde-apps/kmousetool/kmousetool-18.04.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE program that clicks the mouse for you"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 10d6bddac5a5..f3c6528689c0 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
-DIST kmouth-18.04.3.tar.xz 1766968 BLAKE2B f8145cb2f744228d684355d10ee05edc67030f558c62434dfaa38b82dd916fdddf4d68bdf67caf5b51b4dacf4088c2659ee617aea39dda9a5b2519f3189e407a SHA512 f181bdaed15040feded37576aa8539e42acf61bf06a1406ffc7fe6890ba355f45ecb96b8657629105606c555f1d7b798814987c1060e83855de1a9fc34708cbc
 DIST kmouth-18.08.3.tar.xz 1767044 BLAKE2B 9705fb378c4e61f0d0d787becf9fc05264c6bc21e316c4a3701cfd3407daa5133f3483c72dcf334350b7de23b7e34448331def034c95fffb8c7d05a432167edf SHA512 d4ebe4d0b51b6819c3924eec74beb9335707f244e384e2f085c910f700bc646023bf9971d175f4ab19280753db712f50a4aa9721c8b53b59feb9ba5e21882ea5
-EBUILD kmouth-18.04.3.ebuild 770 BLAKE2B 28a86a37b22b5dba01003bf8444da389068e8daf9b7f903a4c4a19a219987afdf9faaad273d765f440d272e219b999b9de3562a148f2729382080cd15b83a1d5 SHA512 db09f5401d25b9e38e440ec9b705b2327f7329f3be9423e22183836654223646de3c63e5f93a4c945abe80a9c9a5c81bfbd4b253f8b984c9de624399b2d2f7a8
-EBUILD kmouth-18.08.3.ebuild 769 BLAKE2B 2a9cdf94b4b6bcfd583e15961d72d5f1bd3d5ddeeef4abdf1eaa0ce5c8b7aa0f1273f3a57df34718fd6807594a950b90a09db124ecb22e5976cd18242375c9db SHA512 ca2e1404ed495a93925ee895885d90440efe99cae0f88a341b70d7d43d9e4b6ac1d2b5c13c55848c673265e623db71b8ca1900c50aef85305a3f9b2fe8293a32
+DIST kmouth-18.12.0.tar.xz 1766124 BLAKE2B 2931761e12cafe196b011104ca6b77496199ee8c0f9dc6a2a76d80de0ea714eb153649c088705b8a32c5fbad227416d1e8d8564eb327cb74885058ab489f7cef SHA512 df8b756a3bb35b49128be4d80bc7a731b878d76e803c4b08abbde7c25a89d2ebab52c8bae6103dfe2f45d273008448616aa1f3a8254f1084c22f4072bbeff2bc
+EBUILD kmouth-18.08.3.ebuild 767 BLAKE2B ac5c1beb54c67730eb1c8a1aabec33542f202b3e2b5c0a6ed1589cb99bd47510968ead89aeaeaa827ed5b0068e2684f88681ba3e8adfec9c27b55b439856af9d SHA512 2671bc2cde9eb1012151af1f13ca85bd27e6c2c22f587ad6a87bd4d09ad21ea8069ff2feca4b1159586b67d5184807a8af6451b9c5ea2f6867340b942a0d5233
+EBUILD kmouth-18.12.0.ebuild 769 BLAKE2B 2a9cdf94b4b6bcfd583e15961d72d5f1bd3d5ddeeef4abdf1eaa0ce5c8b7aa0f1273f3a57df34718fd6807594a950b90a09db124ecb22e5976cd18242375c9db SHA512 ca2e1404ed495a93925ee895885d90440efe99cae0f88a341b70d7d43d9e4b6ac1d2b5c13c55848c673265e623db71b8ca1900c50aef85305a3f9b2fe8293a32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-18.08.3.ebuild b/kde-apps/kmouth/kmouth-18.08.3.ebuild
index c1f3beb97ade..1c8af3b93347 100644
--- a/kde-apps/kmouth/kmouth-18.08.3.ebuild
+++ b/kde-apps/kmouth/kmouth-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Text-to-speech synthesizer front end"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmouth/kmouth-18.04.3.ebuild b/kde-apps/kmouth/kmouth-18.12.0.ebuild
index 694e7a4dc0b4..c1f3beb97ade 100644
--- a/kde-apps/kmouth/kmouth-18.04.3.ebuild
+++ b/kde-apps/kmouth/kmouth-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Text-to-speech synthesizer front end"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 0f9b25434771..8d222fafd27a 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
-DIST kmplot-18.04.3.tar.xz 3028664 BLAKE2B baf384a0104b44d3ddda7657e0a5135c78728dafcaee2c14a7e36a9251dc3e78ed627923b98bddca793b6aeb173c43eba6694cfad72215e8a38342510b620cda SHA512 798ac10e281efc393f111e222641f92a9a5cca94513f740468aa17626cabdc80fd9628a96972748a7297665957d7c5164f43036e51bef35269899e04d779708a
 DIST kmplot-18.08.3.tar.xz 3028732 BLAKE2B b462fe17faa62fa5c5a9718a6759f001a4c756b6e4f3af575ae9727be3a2c21ee9f007294621fef7925875118167eecfdc057e6b8f37e06540b0a200c77553c9 SHA512 c03eb0f08b5a2182a888dfb40f97eccef4e4e2fcf4f7fef91e66b4e0045e4ba38df50b15f309e972cf56569cc527f210ffefd72f236f94ef881652f07cfd1d67
-EBUILD kmplot-18.04.3.ebuild 930 BLAKE2B efb2b3bd9ea45ca378ecb970201fc6e8b407d27a182b394e0b7c574e81306353977d0b6c0afd61a5a257157e5d5930319b75eba768514cb65818f2a1af0c3a9d SHA512 7f7d9085b96b736c20b7a2281000a0550e9041176b2ed543ef78240f44f649e8994a6f4aa29073313ec1af57422ffbc9df2f1f0b93add0b1ac8f8b27075219da
-EBUILD kmplot-18.08.3.ebuild 930 BLAKE2B 0c67705d948ac74a49f31ef32336d1dabb1e95e2f7ed7cb89e2fcc142ddb5d5780a45e0717360c45c0a80de86e66a6c4a3c362c1d991d85a9f981cf149d051f9 SHA512 2d79033c9913ea7954b264095cae962df5516213aa90a6077c15367112e9b1a8360fd428e51821056578f68663bebc7ca3e09325b5af2b4117dd5d1185abeaa8
+DIST kmplot-18.12.0.tar.xz 3060852 BLAKE2B 7d0aabde909e14065ad06c1feb561c3978eac55a50510765571330b5271a442eeddc92478c2ba4fb1e304885aaf4996c10f3e3c2a712fc751bd6f8f9d7916dae SHA512 69c905091c4172e8b3fa4e7140c38bb643a2d4383be1cd060a49132c816d2059357a2f2bff951a53d0d185c838fdc30202ce6d8f1a2776be16253407f0393766
+EBUILD kmplot-18.08.3.ebuild 928 BLAKE2B d2b37627b3489a343596068a607ecc5ee4b0955144c00481816b7603dae89d3f41b7a6c1acb4379524537f8a8c994c45536393c197d4270346403451d1fffe26 SHA512 c0d0f4a0783c96f1bbf95ac189980e1f89e6c2c78088b1487297d90f47942499ae44f6d3ccd0d420a4549b37d10a0d92fde6002052328c156217200b6f129d7c
+EBUILD kmplot-18.12.0.ebuild 891 BLAKE2B a95289039bcb299d47e95d22296a759d8651fcc00b1c76ef28d0fba8c0789c5cc3ae63d7b93a9adb994797e586237a8f7d5739c7feba6130ef811977575e1e08 SHA512 d10a6b75c07bb58a3b426267a73ee2280cdc8aa5fff7ac509b3fe8b655dd6d5fa650883cb74b5f427b99766f7a04e8a115278595ffdf67bd9afd633f36e787fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-18.08.3.ebuild b/kde-apps/kmplot/kmplot-18.08.3.ebuild
index 875c1b55582f..dbb6fa593b65 100644
--- a/kde-apps/kmplot/kmplot-18.08.3.ebuild
+++ b/kde-apps/kmplot/kmplot-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Mathematical function plotter"
 HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/kmplot-18.04.3.ebuild b/kde-apps/kmplot/kmplot-18.12.0.ebuild
index 1230c05f6424..7b042578ab40 100644
--- a/kde-apps/kmplot/kmplot-18.04.3.ebuild
+++ b/kde-apps/kmplot/kmplot-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -17,7 +17,6 @@ DEPEND="
 	$(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)
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 8bd095403d19..0458d90e3462 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
-DIST knavalbattle-18.04.3.tar.xz 1221332 BLAKE2B 5e074e09f71628032237a5bc19dd5acd19d3758b9b740511ba7bf2947577f23f0f3ce7fdf8e3083bc864af4c28cf06f423f1a1134dbc5434337c10249ab64aaa SHA512 67b9049d55e975dd5f1dc9f9cb08bd3102d633046c75bf172abf33e12506774f3e6606f63c3af6e1b23e0d42494a1b4945f019b9f2bbed7d7d64df8609cb2931
 DIST knavalbattle-18.08.3.tar.xz 1280356 BLAKE2B ab6517e78c78e16223bfa359f395d5024401c85b909d037eab7d878783bd8cda9a8f877076cf17273b201318c6298d218e088c65a0002639e2682f15e379fec5 SHA512 d0d41ab446f2583bcbf5ca9486ef1b2c622c82c39d0aad0abdb371b99461c59fdd5488e67bde9ab12953043e4a0b4dec7dbfe5d605c8ffdddd1d927b647d1b3b
-EBUILD knavalbattle-18.04.3.ebuild 872 BLAKE2B 6f45834f266fa08a99416868578f894d12c04cb13fd023b56f5c32c82c19b02af5ed50a38a3fe667a3eff4e49431b2699c426b463c7543c1bad19ba669b31aa4 SHA512 ac29b5cee1b9d45e47167cefaac334fadf27f3d47e493415bb571557fd6a44aff1ce8f8fac623eb25e5899326782363b97cfb68c42756d22d87b26281c67deba
-EBUILD knavalbattle-18.08.3.ebuild 871 BLAKE2B 57059043c84d1620554b93739e2c9a870f3c86d3c94456ec708a3e6b1a9472b7170b0c788f82573a814bc7a0b22d3b9332124539c3f79efc2eaf66063ce5b0c9 SHA512 1ff94e46b59435ed5ba10b4a46ae0f33240b87475f745e0ffe4b4fe57fd75f063899e5d37e5d3d333994f909f019fb2be7bd5c7c1e072d20657553aba1048822
+DIST knavalbattle-18.12.0.tar.xz 1280492 BLAKE2B b3e64379d5e8de01f7fe4a2a9a497202a649cd7ccef609ca827499fe37375b37b7023f5a7eb99be76576f00a86b74c2d0a54038927b78ce71c49928cb0622eae SHA512 c211a81f94171cd5e837b6d91d79824ecca2797d236abc42b2844baf4e2a64d816a4804543f1d9686bf12256e2d7939237667ae1f5e368c75a61d8a853227804
+EBUILD knavalbattle-18.08.3.ebuild 869 BLAKE2B 00d2590344164212f9cac75f0b70ba3711574264e15720f8b11d3473a517f24b166adc110ebb37b039d34e2ff27d021ebbeadab8cf765b8e41e50441c51cff8a SHA512 f79a3303b593ddda7e25ced89857cd3e99516ba3cca2699378d154a3b3c27a3d58844790adb3d0dce88e7316e37d001ba5be2c9b54afe27fe2991676f088f0a1
+EBUILD knavalbattle-18.12.0.ebuild 871 BLAKE2B 57059043c84d1620554b93739e2c9a870f3c86d3c94456ec708a3e6b1a9472b7170b0c788f82573a814bc7a0b22d3b9332124539c3f79efc2eaf66063ce5b0c9 SHA512 1ff94e46b59435ed5ba10b4a46ae0f33240b87475f745e0ffe4b4fe57fd75f063899e5d37e5d3d333994f909f019fb2be7bd5c7c1e072d20657553aba1048822
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-18.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-18.08.3.ebuild
index 23d70fe88ba8..4d9bdae1a2d2 100644
--- a/kde-apps/knavalbattle/knavalbattle-18.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/navalbattle/
 	https://games.kde.org/game.php?game=kbattleship
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-18.04.3.ebuild b/kde-apps/knavalbattle/knavalbattle-18.12.0.ebuild
index 880bb832c19d..23d70fe88ba8 100644
--- a/kde-apps/knavalbattle/knavalbattle-18.04.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/navalbattle/
 	https://games.kde.org/game.php?game=kbattleship
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 344947235f99..f6747e8de1ca 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
-DIST knetwalk-18.04.3.tar.xz 981328 BLAKE2B bab9922b39d0a8ae7fcbd62812fa2bdc14482e71213335049cfa45ed7af7111ce894d03bc5508751a24e6dc54baed50503a0e529ca45b4999dfba7b5afcf4266 SHA512 1d2d778f170d0ffba2ac9052c53a256ef6682ca82573fbe09b75cf5b00ab6cb4ce0948a3f40ec8bb75b39563c7ef383bde23fb2fca794ce6927e996acfd25e9b
 DIST knetwalk-18.08.3.tar.xz 1036720 BLAKE2B 2a57e065c86a858a56ed7b6bf3fc374814dc924cba61f4b39baceee56ee1a23a809935f705c7f9f6ea4b758d0c66591387d2d8c49340c8811bff6d6d87bf7442 SHA512 a31170250287e4d97e91eca41cfc2b1c0c51e67824723f8740ca2faf5f543fb6e7f9183f703ea84d82692e733e8d849d9efa5cbc7af67a091dbb096114feafcb
-EBUILD knetwalk-18.04.3.ebuild 864 BLAKE2B 0c06b84f708811b29b156ce4adaab1026eaa439538d5f7a599f9d9d0d6da5cddbc30ee13c1f245a6ac489ad23df5cf8f45d35edb8680ccc3842ce3144a7a748f SHA512 adf4cb12f6d2628806e9702f67dd45648fcc78105e0bbb652a6e8c02752740d1e54ad1c63ef953b613d0ed52d950913bc031561341d8608b674ad8e76743eccb
-EBUILD knetwalk-18.08.3.ebuild 863 BLAKE2B 64476569e2f661217c95b216df21e4651e419e1ad65ddb325ff9b115e20ad3a8f8229db5b82d4a65f1add28bd10a7b552268ae57a780b0144757414770f03a30 SHA512 24ee94086c6b1f7fd8b12267a98a392d94164b563cd7689ec94a31f2e36b306f403d1dcb1af7f45d08a84dce462c51c5a6189748de7becefe00d9980e2207a21
+DIST knetwalk-18.12.0.tar.xz 1036600 BLAKE2B 31497d99243f47dcabb6e94420b683d255117237294e6b7088815a471369d3f1caee481abdfc60b56413e1a35a54677ed6672bd6e4de8d413a0f6689012590ce SHA512 f07696553d4f366b5eaacf7f88f93862f42a1bd53eb23f18c5ee2bc075300e1cc09718e54664f7f6c7c2225ac60abc4ae147e35a093d5f9db76b04f7896fef23
+EBUILD knetwalk-18.08.3.ebuild 861 BLAKE2B 04aaacb4fdf80b08d12d58b7e3a51c3b42377ab7bb4208b71f1a2b2b419a00634144a3c6611178b5093bfc3b3d40639ec16d63f109f43d44bd72f4c7da30ff09 SHA512 fd07cabc1dee4f742893ede40295bd7ee2b271dd9902bdbb3eb783d7b6087159e59b082ea35d1339cb67089d4b440870fb92d1da40db9355d04c98320ddb5b72
+EBUILD knetwalk-18.12.0.ebuild 863 BLAKE2B 64476569e2f661217c95b216df21e4651e419e1ad65ddb325ff9b115e20ad3a8f8229db5b82d4a65f1add28bd10a7b552268ae57a780b0144757414770f03a30 SHA512 24ee94086c6b1f7fd8b12267a98a392d94164b563cd7689ec94a31f2e36b306f403d1dcb1af7f45d08a84dce462c51c5a6189748de7becefe00d9980e2207a21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-18.08.3.ebuild b/kde-apps/knetwalk/knetwalk-18.08.3.ebuild
index 289adb382ec2..028a3713c964 100644
--- a/kde-apps/knetwalk/knetwalk-18.08.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-18.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/knetwalk/
 	https://games.kde.org/game.php?game=knetwalk
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/knetwalk-18.04.3.ebuild b/kde-apps/knetwalk/knetwalk-18.12.0.ebuild
index 1db083c44c77..289adb382ec2 100644
--- a/kde-apps/knetwalk/knetwalk-18.04.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/knetwalk/
 	https://games.kde.org/game.php?game=knetwalk
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index 0f22abb8c90b..b3bef1b793c0 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,3 +1,3 @@
-DIST knights-2.6.0_pre20180415.tar.gz 2642374 BLAKE2B 18648348eb4f9c34a37b0992d5b75a90fbb7fb1b6a7b23750bb57f11553d50a320e68dba303c6ec7fd394a0464341dd28fb8b404bb8ad1b9a92934b767a8183f SHA512 ce022463f9efecfed13fd101d958cd753ea1d167d6a6a70c8735afeccb49a6e9b9e5a4fa15ee7a5510a65eaa08fa0615da109793b7df4a50040d809393723145
-EBUILD knights-2.6.0_pre20180415.ebuild 1360 BLAKE2B f1314d5f2cd982c9f5c642161025755690f3bbffa3a2f84090b1566a2768b0d24c77db42ea05cf07e64a125f8ac50e44d92ccb7725a859c748407cee7419a4b3 SHA512 4603c9d07c30a8d6d8f9f099ab9a03d685320a833a2ead326010ca46e5f7d8fb3a7002f2b920fbb7284742dd301143feafd1a265cbb14dc648f64695eddca5b8
-MISC metadata.xml 437 BLAKE2B a392fb3cb9557ccbfec875358b70d68f3d6c778875f650fe4667118c0ed3a3ea45adb6f5d245d8e9ac5d5f8567986bc48383333a455135a2d1664213d2b0f603 SHA512 b05223b8fddc2f3de74899b798b6830df6f8ca231f50ab46a4751d173c2aee3003a6538b4eb810d402ccb1cdec01c70e99b25bca25eb3b2c4b9c8326be43f4a1
+DIST knights-18.12.0.tar.xz 3507724 BLAKE2B 9b9f4d958f7cfa39feb972b47f31ff840297773ff5226664ac0d164bfc7b3d35c79d4fc4e8f673a9758f7702480dfb493bb4fa6277013c523e296c514699f83c SHA512 11128bf41e0ea28c3927488063e4cf6d6c86492aa8f79455901291ecfe53e22099dff0904b19060bf53d490fcc7c4bcc2b497f73811c848bfe16bf3ecfcc7c84
+EBUILD knights-18.12.0-r1.ebuild 1153 BLAKE2B 074871f1a07df27e4a6fd23a0af48daa5faad4ad64dcdc019009fc01b91b4849aa00f6e3325b6ddde6f38dd5c9dde8396031d4fb4d7b2eb8fcc3098f6a37da7f SHA512 4096c204b840a5040cfdd47912ac761f2ab40b7565810ad76aa2d4102cf15390e4c664985678a9584933874a4e79e2368a7130825cee6a4c4d26ef781052984a
+MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-2.6.0_pre20180415.ebuild b/kde-apps/knights/knights-18.12.0-r1.ebuild
index 4b3b233b6101..a09b920890de 100644
--- a/kde-apps/knights/knights-2.6.0_pre20180415.ebuild
+++ b/kde-apps/knights/knights-18.12.0-r1.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-COMMIT=56762d582d8a8543f50c293ff54d5ac5e546c2d9
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
-inherit kde5 vcs-snapshot
+inherit kde5
 
 DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/Knights?content=122046"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.kde.org/applications/games/knights/"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
@@ -21,6 +19,7 @@ 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)
@@ -39,11 +38,11 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	speech? ( $(add_qt_dep qtspeech) )
 "
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog "No chess engines are emerged by default! If you want a chess engine"
-	elog "to play with, you can emerge gnuchess or crafty."
-}
+RDEPEND="${DEPEND}
+	|| (
+		games-board/gnuchess
+		games-board/crafty
+		games-board/stockfish
+		games-board/sjeng
+	)
+"
diff --git a/kde-apps/knights/metadata.xml b/kde-apps/knights/metadata.xml
index ec264f573891..cd28b35c5cad 100644
--- a/kde-apps/knights/metadata.xml
+++ b/kde-apps/knights/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 161c6deb2a5c..448285387d23 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
-DIST knotes-18.04.3.tar.xz 336096 BLAKE2B dcedf008475796e561e411e7739e58d68dfe0557c8d64a30390299ee46e40c1d5e8e5a8cb34946090ed8d6c8da323a5852a201bb24e34e0ebaede21b9fd0aa6f SHA512 899ea5a22b4e0885acb41ca1d4dfd04a399186c452d29ab9672bd0099acafb1b089e1b82e81bf6af8f803fcd89f504adf9a74ceed7c52ba53e3852235999f0ec
 DIST knotes-18.08.3.tar.xz 338460 BLAKE2B 4bfb2b7c49d4ec8dc1a79953b134b21bc3ad68f5591ccb1336b75f26245b706868c2535a77eeb4a1ebeaa028d7492f900f9707ee0afac1ad1f7978db682bb660 SHA512 90221b5194daa39c3d2b33d1200fb03f7e014b0e8a98f1a2619aaaa3c028e9e715e583ccd67d4b690e728f63f1cbc4db3a7a39523ad891c2660fc5c1e04f9519
-EBUILD knotes-18.04.3.ebuild 1849 BLAKE2B b3c436a1c3c07292e46de05368258fcd55a914388f01ce7ad8e0dbfacd1ef0276be14fec8934ce0e887a95d677b00bcb736424b4b728b65d7a58725dc91ffaf4 SHA512 cdc0a287ad739d2db30ecef025af186a5fa16c92658f9e66928bfff76fe405f5be44f67b3df494b54e2e31b293086c6bebfdac8a1e071cf95acfa9c0014a5a68
-EBUILD knotes-18.08.3.ebuild 1848 BLAKE2B ad68d649d60202e35e3bb14cb437a0e09957f2e8be058e23996c433471ff9aa239b9ba0517df6293943a894fe3affbe1de7fbc01757ca6e4e21a2cc3d03a7885 SHA512 ce0fae531e22c73989b5949c8faa2654fd26eb802bad54a61087b4484a88a94b696d1cf6176cfef444260b9163ab8211b72e86d92ee9b41091304e47d1671cbd
+DIST knotes-18.12.0.tar.xz 319620 BLAKE2B 7831acb103e3c5a47ff7825f8627d8de878cc3b10bd0d369446c74935f678ead594d3d0ab5e66c72a7789f59a8c8838f3726d215f23577cffeff6b3272ac57d1 SHA512 2282b5c74c5b32c203f719665bdae815a86f56d69688ce7a9b0cbb2e458f7f80c9bb53ffb77ca28c37d51db6f686b1ffe1dd9078dcfdf27964c78bde19adf6f2
+EBUILD knotes-18.08.3.ebuild 1846 BLAKE2B ec7447496c3e7b0a5343993cd9a216c896339b77e403d93a119631039137740ff5db7f60efed134b1809f1265b9931353e046b4eaebed2ecf9cd098993bc2995 SHA512 79cc96688921051b9c20564ce610750ada34f7ab748a4216f5799d7fc5a91031666ad6cb792e006b616854ea8e0e72aea4a6298bd13f48c18ec1ef8b47bd944c
+EBUILD knotes-18.12.0.ebuild 1848 BLAKE2B ad68d649d60202e35e3bb14cb437a0e09957f2e8be058e23996c433471ff9aa239b9ba0517df6293943a894fe3affbe1de7fbc01757ca6e4e21a2cc3d03a7885 SHA512 ce0fae531e22c73989b5949c8faa2654fd26eb802bad54a61087b4484a88a94b696d1cf6176cfef444260b9163ab8211b72e86d92ee9b41091304e47d1671cbd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-18.08.3.ebuild b/kde-apps/knotes/knotes-18.08.3.ebuild
index 70cf933ae6c4..6b8dbbd795f8 100644
--- a/kde-apps/knotes/knotes-18.08.3.ebuild
+++ b/kde-apps/knotes/knotes-18.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Note taking application"
 HOMEPAGE="https://www.kde.org/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/knotes/knotes-18.04.3.ebuild b/kde-apps/knotes/knotes-18.12.0.ebuild
index cd3f3c3c929e..70cf933ae6c4 100644
--- a/kde-apps/knotes/knotes-18.04.3.ebuild
+++ b/kde-apps/knotes/knotes-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Note taking application"
 HOMEPAGE="https://www.kde.org/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index e7c17db462c2..af74fa07380b 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
-DIST kolf-18.04.3.tar.xz 925060 BLAKE2B 6c04a8e60f0d0a12375f782b722f3f9172210f230725c70d26ed9d0b2bf2740d466380b0278c1ef832029ce48017bb0ac1ef889f03e56c16dc401c353c1ad81f SHA512 e14b94419504f531b615c7dcd7918c2ced7b7512d7219b60680533a16e365eeb3bfcf9f7db3d4838672a4fc70494dd7758a9ea409c87544f36018f590e7160a6
 DIST kolf-18.08.3.tar.xz 925604 BLAKE2B 7cd1a3f0c4d509991f89fd478e1ac5e5d2e9b5694cfc36cbef5bf0334b3761826e69a7180e124dd884aa19edcee4827655ce9eaa9e3bceb7b418f900cef943ba SHA512 e916b8ad647c0e6ebedf076e6fc6ed8040c0010bde70290955e6ce9a158123436536c210ab25cbf12a325e00776088a57a19a46bf22e4c67bdf33cc737c4e466
-EBUILD kolf-18.04.3.ebuild 815 BLAKE2B 00ef1d34aa586ff26f65db6fa933b43b20a5b9d483d9f43e1d370b7be06dedef78e7a49dd7d5dff2e244e506f3dce10d9754c714864d1369074d43e2ab1dc7ba SHA512 b3b84088137f392ce0996c59fc630083f1dfa7aac5978d4525adc747da630dfc5c69810aded6f23b4651b9f24ae54cecf42809e0cd517eac8170f7aa0041529c
-EBUILD kolf-18.08.3.ebuild 842 BLAKE2B 4a82dddd8df395a0f6ec3054836220663fa20a63907c4505eb8af5749831ef9fe35e9af5668359e23bc6bf2a1a12f88f793a59e08ca4415fd0e440b81c4062aa SHA512 9382cb1cb949e5d2ab490ad83d6b8b6dad958092a514e071e9863c39d1b07a5277e9a861a9e3dd69ba6e8462e2840a151c32a7689a2453bc8f2563c4ffe5dcf7
+DIST kolf-18.12.0.tar.xz 924652 BLAKE2B 274d8e6038ff1c8b8ea2ef49d52c9856564896beb45395ab805a9da6fbfa8252a374f40b7d2341e8ffafeb0c9611f3ec80e0e0a8e4f07d3fa4871a8d61418aba SHA512 43ecb26954d9dffba1ee0ff7bc51ffca2a6118006b51aef5474e40b15ab6c5561c856af7c196d393e95ac340dd80aacddb1941b7e080bc01badbc49bfc67aa5d
+EBUILD kolf-18.08.3-r1.ebuild 821 BLAKE2B 3baf57d996e7d70964503a4a8ea2135aefad8fec2285f7897dd8803798720843ef8f6dd36a18e1641157cc6cfd9c999ebbbf5ca15ca9e0be1563e5ffa088993a SHA512 70bbf1b97d0e7b6336bbf13bd0409bc9d0fc1c721a74233a1602455564feb8cd2916aa66c759900cb6cc998bbe6568395a8beed7f00b6267245691ba16ce5e98
+EBUILD kolf-18.12.0.ebuild 823 BLAKE2B 175cc90ddf6b81c3977c8f162f9c6ef7989dc56fba8df63bec2f478d6c7ca7937d1b930820b549fb4252c47544f375fe80af6dfce08c2cb3e5c4656882df6290 SHA512 b59dab77f9eab029d666e092ecf809785d5b2a3589328f719261947383e3eac3ac461441226dd5adaa6fbd8afd5ed89fd3a14fc42252f599408f06948e5f7011
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-18.04.3.ebuild b/kde-apps/kolf/kolf-18.08.3-r1.ebuild
index 8866609989a5..551158482304 100644
--- a/kde-apps/kolf/kolf-18.04.3.ebuild
+++ b/kde-apps/kolf/kolf-18.08.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
diff --git a/kde-apps/kolf/kolf-18.08.3.ebuild b/kde-apps/kolf/kolf-18.12.0.ebuild
index fbb5d8028af3..8490eeb3fe1d 100644
--- a/kde-apps/kolf/kolf-18.08.3.ebuild
+++ b/kde-apps/kolf/kolf-18.12.0.ebuild
@@ -29,7 +29,6 @@ DEPEND="
 	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	media-libs/phonon
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kde4-l10n
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 4829985584be..a4360d72d19d 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
-DIST kollision-18.04.3.tar.xz 272564 BLAKE2B 27ef55f7dc587267b10af8d1db7de418575a8f9cf29bcd651cd093b3a8bd49e1698d79d1099ad7a91ee5a35ccb83f4f4a96b6d9eb634c808aa645796608e9b4b SHA512 c4db5f6a96364e86eed8f344bb378752c9c05e147302d029aedc9a6926a761ae71acaa5b37ae39abe14e6ab7b0e9061ac26e495b5917d6b3cf862516898db58e
 DIST kollision-18.08.3.tar.xz 280676 BLAKE2B 589dc8ed2f9f97a457622d3bcfa00197b709717de3309f2790b38e03c0b05517e792828895f9418c6dc33d95b3afbc7b3c67d18f4857a2cd9ddf07c4c1b0d10c SHA512 26150d77ea6fa523c641739798c2b0ba50666ac980aa98ca860234c0c9b84ae5ded52a307cbe1c93acfd974e45eae380493fcdb340146d4f8437eac9f63915e6
-EBUILD kollision-18.04.3.ebuild 677 BLAKE2B 4aa766c5a0d006410dfe46eaaddde0c53297a4f138d6441383a1331169f3bb4a553f3ff3b35a68f12d85c4c1c3462f71bcc1c6d64bc0ac0d63b580b3a80fc118 SHA512 ba86505711ba8223554c71eb569c50319f71653cb92b9e329b82708d543a8c5056a00af6172e91efc1d0d739b7038b098b53844889c9c28f04e6580a2c2f8402
-EBUILD kollision-18.08.3.ebuild 676 BLAKE2B 9f8603e04353b4c342a8bdf2763cecdf7b2a1fb0985dcf6fb4d681004742bc1acae7f516531da23802b998683c9ed8625d09b58d8d17071b2d7b4fc998a644ba SHA512 afa99f2f74ca97fb1e922f06623ef382d3d9eedb95d240fa54c65fbf32985895dceb9ae5eaf367b51c4dffdc0dca8e9e60c90c6d373b17182866bc29ce2cfc7d
+DIST kollision-18.12.0.tar.xz 280768 BLAKE2B 8db91416ef6e4937b9e80b040e34ed8ee1dd26c3dacd893cc72404552c60e68efaa22efeac692b3f0c5d89340d1d3e7976c8c2d3be96464609f669749ae70926 SHA512 7122f76ad78ce869a18098d8eabc74c2e51a33d747dd7d7542eeb385f2095b6bd2f913a1d54f1de533d756af40d3a168689d7fc1ee1bc9caab6e9cd8d5049972
+EBUILD kollision-18.08.3.ebuild 674 BLAKE2B 380038f023cc63ec20ab04a98bc68761830485cee30fa04caf29d72534b58afe1ca002879a63181a497267076df82970bd223f892cae94e3b544b04832962e92 SHA512 a13bd48a05ec94d317d6e47a06b89c128623f41b8b0d932d300cb90ad2645707dfe99a455a9da7941cbc79d26577a985b1792e71e0f50d19d7e3267ad8591ad6
+EBUILD kollision-18.12.0.ebuild 676 BLAKE2B 9f8603e04353b4c342a8bdf2763cecdf7b2a1fb0985dcf6fb4d681004742bc1acae7f516531da23802b998683c9ed8625d09b58d8d17071b2d7b4fc998a644ba SHA512 afa99f2f74ca97fb1e922f06623ef382d3d9eedb95d240fa54c65fbf32985895dceb9ae5eaf367b51c4dffdc0dca8e9e60c90c6d373b17182866bc29ce2cfc7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-18.08.3.ebuild b/kde-apps/kollision/kollision-18.08.3.ebuild
index f65958c448e3..719ca9fe890e 100644
--- a/kde-apps/kollision/kollision-18.08.3.ebuild
+++ b/kde-apps/kollision/kollision-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kollision/
 	https://games.kde.org/game.php?game=kollision
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-18.04.3.ebuild b/kde-apps/kollision/kollision-18.12.0.ebuild
index 9ca5e1b201f3..f65958c448e3 100644
--- a/kde-apps/kollision/kollision-18.04.3.ebuild
+++ b/kde-apps/kollision/kollision-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kollision/
 	https://games.kde.org/game.php?game=kollision
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index ef47d08cfd3b..cc8f9c4aaffe 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
-DIST kolourpaint-18.04.3.tar.xz 5548984 BLAKE2B 15017e7bfe7b7a8c82f0340f3cd4e222f3871f476f2530df358ca65e0f1971ec85199f2ed67e1a86a998331b4a5bec1e3ba1ec0b4ad5ef8d3d1c949ea074c216 SHA512 e9e90e16ac93f019327f9987f546ea55999a707e5ac93218a6850669bd729506d80c52e2e1cdc78d5c2d12a3abc696412c7eee07343a2bf726d7c5fadb5ff4e0
 DIST kolourpaint-18.08.3.tar.xz 5548536 BLAKE2B b7529b835ca31147cbe5973a15be767e3495084266ce4cd23eae6e78d5f8b86a334a25591447c255a64f09b8d1561e8e306db651fe8d67325be2cb4a358c3e34 SHA512 259eab582cddd2f3bc398e1a99933840ce4abb7ccaa3333c339ee6497a98016f235715e8d7f32f9134416b05d90efdef5ae3f1063192287bd53af6cd2ab3b820
-EBUILD kolourpaint-18.04.3.ebuild 1034 BLAKE2B 6e9776b8a4bc28871147943f6a1be6c0e6abb7f6b94fba18d2fa4d8a98abb00ac20a495c8ffae4315d70f53adf3c57d96f9186def14d067ac15cbd7f14c24f0a SHA512 2a91e2766f47103d893779861492223455289982fc509eba3919aee657f240b984d1daece66659275f5aacdf2543aa833f254c54ed505db591a1d4df5385a921
-EBUILD kolourpaint-18.08.3.ebuild 1030 BLAKE2B 02782a72e9d8a19bc393d6f2c6c4548e4fd573e02893f32d6c4122bb93308e606c3e63cf70b96b43ff91e86c0e7516d80e9ad3281d1630e8446b4792f17bd21a SHA512 fe2b2b81d1c64c72a9fe1c9da3ef36164fe7942b151528d28477ef9f4fad8e9daf5f47ddc202632d6100266fc38d71169f1af68f8f09e2371aa70829de979625
+DIST kolourpaint-18.12.0.tar.xz 5547648 BLAKE2B e8d3e53406fa04635e303a32126e36d5500c8f3a476f6ce776c401b79efb8e98ee43413d6e6bcc4dfbff3fa798434905336fce9bc1679797a2d7fa89f1cbc159 SHA512 47968201af1507c759286025ecf5487ad71aa5c0f1ab152b8e0e2df4e904fa5f702134ca4532770a6e443075ac5319d8c8195827e0c2f0a9d82a0c268fe36ed5
+EBUILD kolourpaint-18.08.3.ebuild 1047 BLAKE2B 1281c1ae31774f9eb4a7255a84765a5d537880a6653c7b55debfad00b901890f29a66d6ff5cc4ea77b901eb2c31b5d766376f619f414c0f729854ddefacf818b SHA512 0da704166f0da28dab3993ee72936b2276f974fa66eaeca9a07cc136c4b8a6952201b5349e0cbb7c327bde23b1299605e8ab5a99fcfd0195529c7e7cb9220e0b
+EBUILD kolourpaint-18.12.0.ebuild 1049 BLAKE2B 72534bacf302b51286b7f72bef68f6884cc5336b02e6a32525426dbf7e6382c331bd9b9f6a671081f86c40223ef1cd41ef96d2eff43cf07b98f01904406dc83e SHA512 937749400ffef2a576af7c2e6230c191b0e18b13b5bafa081d1292a0d30565f0f4429ac76170e5950da1432b353badff70ad479a362adec093cbc28dcb97519d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-18.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-18.08.3.ebuild
index cce9441c5950..ad617e7b500c 100644
--- a/kde-apps/kolourpaint/kolourpaint-18.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Paint Program by KDE"
 HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 IUSE="scanner"
 
@@ -16,6 +16,7 @@ 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)
@@ -29,9 +30,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	scanner? ( $(add_kdeapps_dep libksane) )
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kolourpaint/kolourpaint-18.04.3.ebuild b/kde-apps/kolourpaint/kolourpaint-18.12.0.ebuild
index b2ef4bbe8518..0caff9e0da14 100644
--- a/kde-apps/kolourpaint/kolourpaint-18.04.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-18.12.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Paint Program by KDE"
 HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 IUSE="scanner"
 
@@ -20,6 +20,7 @@ RDEPEND="
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
@@ -29,9 +30,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	scanner? ( $(add_kdeapps_dep libksane) )
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index caaf7872f3dd..8d62b25d48a2 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
-DIST kompare-18.04.3.tar.xz 712096 BLAKE2B f2aba3342dd778abf88daed69967191dbb34cbce9afd006ad9d73341667d4f3c7270b942ea0d89844fb03b663901b04868ee043d3797a03ef9d0b1ec9447034f SHA512 16cbea4ec5202f073fe7251db2682031915509b888eb5ecd098d72f20438ea23576750976a4811f922bba1863f08e280a5f7045248e97e3060c3d37b81ae1b65
 DIST kompare-18.08.3.tar.xz 802164 BLAKE2B 9db037e9b7db3eb71160e16481f116e0a703d275e1cb8d6f7eaa49e1723c187f25d1132971211c8119b70d4504cb32b00c4a04a7ebd3c7f059cc67d3f76eb06e SHA512 92f092e1a7764926c84bbd5018fb9700012f3b40d2af443091e0dc55556dc9eb46b02e0ef949a13cb01f180b450c0a6f54e7aeb6514c25ba9ac58199fa1bceed
-EBUILD kompare-18.04.3.ebuild 957 BLAKE2B 7b5ebca036dbca4a2306a6c090b758850cb904f34a845b5c74339b3b203b5c9df205a21189707be0d39097603340785456bcf7531986dfc2369bb8ac807449d5 SHA512 3dc0f9aa5b85f173d7150f074130d5b2a25262113c63a735bc14d2998cc2eab5da4a71ae61fbb340d6a8aa0fa6e89cc66c2622d1864d83b0022fe41b93573c4a
-EBUILD kompare-18.08.3.ebuild 957 BLAKE2B b17e132e406909ce60bec69b7a3daa607c84b0a13de6dc983323f19a8adbb230f1b02a0a37c17c64454f65242ce20e9ab1b79d9a9339d7b60ebe35ce54aa7081 SHA512 44f92be083ccfa84ae8ab507a9a0cf4bf6945f34b3abfa545dd12d14bdfc33632543067019e87e818371b9070c3753c90637505f1584f16390e46a1fcdc2959e
+DIST kompare-18.12.0.tar.xz 801596 BLAKE2B 235e37bbe608f52f7f8c7850f9c90fd2266e42ffe44da02fad73feb99e26f104ca68a1bbad1bd4f647a85a176b76a53706054292a894abbdabe981e01b1f2341 SHA512 1ea936cc89653fcf530e7954996818a3729b5e2cb121ec7aea3a8cb87692aca98858fa36a357f9968b89ee9eb1d153983134e69b3a897f2c10d3abb6139d0093
+EBUILD kompare-18.08.3.ebuild 917 BLAKE2B 0ab52147fc476f251f99027a5233a08756399552f1533a4ec9bc2f641a0c33f855352be23dbce5efd2303504bb59252d343c85b235483392c1d1b6b28b64c095 SHA512 b08c9281dbbe65698a8986c119a4ab5716eefc4949ffc501df63dbb8694d0ef901465e71dbef78604e9a8439176d77dd178ce03137c56f924a94379253f31d4b
+EBUILD kompare-18.12.0.ebuild 919 BLAKE2B 095b4967852bc1012bba1d053a26caf07408da6c51d184a291d14beb40bbf36ab164263f68e7ee29a66e1cc71d4548532d1e2837eeb2b8c93346237343f767f4 SHA512 61c5f52ee3b75841e4d7ef5a162190050be35b91027290d25681e5862076db8bef018fef709370c399734d6c9e073c65ce3ae57224348db1308f594c8dea8183
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-18.08.3.ebuild b/kde-apps/kompare/kompare-18.08.3.ebuild
index 6648e16e521d..3758bdee44cb 100644
--- a/kde-apps/kompare/kompare-18.08.3.ebuild
+++ b/kde-apps/kompare/kompare-18.08.3.ebuild
@@ -7,9 +7,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/development/kompare"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kompare/kompare-18.04.3.ebuild b/kde-apps/kompare/kompare-18.12.0.ebuild
index 92e04bccf6fe..688b10b3b495 100644
--- a/kde-apps/kompare/kompare-18.04.3.ebuild
+++ b/kde-apps/kompare/kompare-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/development/kompare"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 432af0713d72..8c6e4370372b 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,6 @@
-DIST konqueror-18.04.3.tar.xz 7694900 BLAKE2B fa20f95abee369084796785b622056b759c3acf11f6feee597a0ac788c9d64740283f6bb4e45150b2eb52f4de8689f1e66d3c4f3cf1e8f6d50ead6eae8900e16 SHA512 c55c0bf0f97c5ecaa73c7c56e2fd236642620b9256ef6f7dc3bd922b8d590e33c2524ea154d8308fc9dac9196e5cac3bf08d109565afa756ee6d54264ee4ab3b
+AUX konqueror-18.08.3-tidyhtml5.patch 1645 BLAKE2B 9c9edb5f6cf7f40bcce3764c3c778752baeb27b9df55efbba96db603be61f5a1d01257538abaa8ee44e59d13d0942fdf8afd16860018c07c9c232ec7d2538b90 SHA512 98e13b59d94b65dc163827f0b8b85ee8b4d02afa794ff5e3156a6b7ab0a996df3958fe272e766b5799daf1c5cbb746f48c520f01d6a808f0ce19925d3a95e38c
 DIST konqueror-18.08.3.tar.xz 7742624 BLAKE2B 13b4ee924a3ba1f5373c35676ac940ff446aa5d4beb34fc32b34afc80387695e270543ad720a541c249ef560dc04e87b067a7377986778348c5ffb0dcab1e8a9 SHA512 ac7f03c03e8fed6c052350654d7248c35832d8b13ab325afc7d48e1beb321c3016ff57c434e7121fedc12a9e52780390cdcbe2745c290bb52a5f2dab64a7113c
-EBUILD konqueror-18.04.3-r1.ebuild 2995 BLAKE2B 4c5f270217b06f782ef1930aa9c14f6bc52b189d860207e7ef0acf86a2edaceca9a581519e1892aba73e438f703e17d629ee7f556fee0a965de77858efe4ed5c SHA512 8b7016e5b2f365b18269c6df9195768f30250a2111072a05791ff9f74b845f7a6e82ebc5cfceb199d55664d119182e6c2e160c815cabf60d2b22a0cf151d9f0b
-EBUILD konqueror-18.08.3.ebuild 2994 BLAKE2B f7476f99c10a5c3e004f868f5ef2b46bbe36ddf26fff9c9eb96a7ee99d17b766829853e2d021862d2ee9a5d34d03253810e55129ef0404365b1c15ae62adc03c SHA512 d679ec7403089a025db446a3c9b738b6f09f60a5f8fda346f209139f43d4c273d82ff05724d93f7a64b3d66b19e0c3351e7bf1af9bc9a84c6e50a75d720dff80
+DIST konqueror-18.12.0.tar.xz 7756100 BLAKE2B 8c95aca3fe46c634a0e8de7c43b8cc826fb038b66a847f51a151cb3a16c459ca4f974f32ea668ac5a247ab2aa73cd55e7d1801362c8429fcee743cbb65d412ec SHA512 045b26702c098591ee09556becdc338f8f359b316cfb0433f4035666ff74d88f8fe6482bbfc00df53d50fef60623b29b943ae380abc1a0b5f6c508203672f3c0
+EBUILD konqueror-18.08.3-r1.ebuild 3042 BLAKE2B 8765eea7e54e670282d66e40c1339618e6dc897525772e12aff82bb2e7397e957e40a3e67bb949cf3304b765e67ba01fb94548e6e906eda65ae417649dc63da5 SHA512 60f46ee94d108bd849ee942a49e5113cb5528ea528e5baeec9d6320331845b51c70382d616b14acd30ed40f33c6907715f71f177f1704caa0c758aaadf132e47
+EBUILD konqueror-18.12.0.ebuild 3053 BLAKE2B 1cbe146f7d3850de1b525954a4b464b5a5dd439f6cb7a39dfda8cd4fab6ae1f977163c2c6d98d2d128556d7e02248ac6b0537015770bdc0f3900e4b45082d2ae SHA512 53a0418b201fb22dca2a7fd70b10744e604a9bf8a591abbbfc07f322c1a3eaac8a0dfb32afe717650e393ed55e7f408f7b418a332da6f64e6068c0689facb654
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
new file mode 100644
index 000000000000..dae1486d5807
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Nov 2018 18:07:32 +0100
+Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
+
+Summary: Header was renamed a few years ago.
+
+Test Plan: Builds and validates fine.
+
+Reviewers: #konqueror
+
+Differential Revision: https://phabricator.kde.org/D16982
+---
+ plugins/validators/CMakeLists.txt     | 2 +-
+ plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/validators/CMakeLists.txt b/plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/plugins/validators/CMakeLists.txt
++++ b/plugins/validators/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(LibTidy)
+ find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
+ set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
+-                       URL "http://tidy.sourceforge.net"
++                       URL "http://www.html-tidy.org/"
+                        TYPE OPTIONAL
+                        PURPOSE "Gives the Konqueror validators plugin the ability to validate HTML"
+                       )
+diff --git a/plugins/validators/tidy_validator.cpp b/plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/plugins/validators/tidy_validator.cpp
++++ b/plugins/validators/tidy_validator.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include <kdebug.h>
+ 
+-#include <buffio.h>
++#include <tidybuffio.h>
+ #include <tidy.h>
+ 
+ #include <config-konq-validator.h>
+-- 
+2.19.1
+
diff --git a/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
index fa56ec002dee..a735711ee864 100644
--- a/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
diff --git a/kde-apps/konqueror/konqueror-18.08.3.ebuild b/kde-apps/konqueror/konqueror-18.12.0.ebuild
index 9d8010e34005..503376e9dc64 100644
--- a/kde-apps/konqueror/konqueror-18.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.0.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 52a382b45918..bb663fd6f811 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
-DIST konquest-18.04.3.tar.xz 658784 BLAKE2B 89d675c2bf2bbb8a24c1bc337782dd489c4bcc9cee4539fac34f2b92eec5036067138d888a0af48119e25fbdb8b9c00c14a6f916da636df1102193106a7f5c79 SHA512 211830edd3a3bd24f48dafff7a0e60229f3f24296ba91314f93c00d5494400df7f34a54b792dbfffb5d57f5a169135563485839637055f6234590f95cf38e216
 DIST konquest-18.08.3.tar.xz 658764 BLAKE2B 5202b8f5793561947c5acd09b378f5a8ae5e55290612d4caeb1c376315ce4e4b9df03640d6f9e88bc7b5c4bea0963da7552dbedceb83a6a78134fc944842fe55 SHA512 ac6a4534ea111828a140800e6f084047cb41b639fe861fde2c1633872002e7e900b07637681535925845bd35851a9b20f40453d2e91487ed45ebf5f0a69f33f2
-EBUILD konquest-18.04.3.ebuild 791 BLAKE2B 3f0d7085c9c1c666655799412dc59a7a42eeba0bcae00a63eec0e6b633a7e5108088e30098c0fc962441f3d9e1a666ecfb3c6fcb5986d50e0d8685511d01a921 SHA512 5954afd4c9bed7e21e9b1ed5ab809e0e777e57a06242fbcf6cd87219a2d85d82c496e52186a730d88d8460262700a4ad247878e4f9db2525266007addbb34c2c
-EBUILD konquest-18.08.3.ebuild 790 BLAKE2B c84a2891441794ea069c231fc4f31530ce1f06ce731d19a509f4955444a003a2b14adc3df71f3ef97cc09bf71a0a7486411f26cef8e72ecc5a3663008cb8bfa6 SHA512 ea8de0eddb6570343d3937b589fccd5f02b4881d98c8980dc414de5fa1543018cb2addcdb86c3880d9d45e482c4fc0640d9a59afc0f4f6939b0e330898b10375
+DIST konquest-18.12.0.tar.xz 658540 BLAKE2B e041d5d7d718eb0a53e2abc2ab52b42474e0d27dcd82d046f571fe4da226fe752bdcc3641e5c854233a0f06825f0fee660a10122ea80a379bf5f6e0aa5653384 SHA512 e31499b1b55b6b46fe423ad27ed4c002dc2cb87724daa7132e9a8b244b135cd99fb2e71025bfe1f4e04752cc1836acced05b20e539c5b5fa2fa6d16242a97cec
+EBUILD konquest-18.08.3.ebuild 788 BLAKE2B 66c5cf7bff53da6846739fa72c7409cdbf657acce4b1922a9b018baf395a5d527dfa39796da69e6c044dadab7dc62588288b71abe00920dad42482869bdf82e0 SHA512 b576c9eb4fe29ada3ceec05783144b244ac10ceff1d04c8d70057f73e9a81cea2b5f599171a962a2042bae38b69d152589ba641d3a0610e2c85fddaf33cc567a
+EBUILD konquest-18.12.0.ebuild 790 BLAKE2B c84a2891441794ea069c231fc4f31530ce1f06ce731d19a509f4955444a003a2b14adc3df71f3ef97cc09bf71a0a7486411f26cef8e72ecc5a3663008cb8bfa6 SHA512 ea8de0eddb6570343d3937b589fccd5f02b4881d98c8980dc414de5fa1543018cb2addcdb86c3880d9d45e482c4fc0640d9a59afc0f4f6939b0e330898b10375
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-18.08.3.ebuild b/kde-apps/konquest/konquest-18.08.3.ebuild
index e45c88b6a578..6a07dc8d13e2 100644
--- a/kde-apps/konquest/konquest-18.08.3.ebuild
+++ b/kde-apps/konquest/konquest-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/konquest/
 	https://games.kde.org/game.php?game=konquest
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konquest/konquest-18.04.3.ebuild b/kde-apps/konquest/konquest-18.12.0.ebuild
index 303802389244..e45c88b6a578 100644
--- a/kde-apps/konquest/konquest-18.04.3.ebuild
+++ b/kde-apps/konquest/konquest-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/konquest/
 	https://games.kde.org/game.php?game=konquest
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 0e66a12437d4..5331dd573d65 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,7 @@
 AUX konsole-18.08.3-desktop.patch 821 BLAKE2B 3b86d8c03bbc23e991ad2e84172f64591ccca3cf5877c3b1812593df8e817adaaf5a34c72d34ba57af09adb7f64eaa9e78732f724de8adfec523c17ee65d1e5d SHA512 0a6b36edff6067c18312b44d5b7fbe6f4c8659dd34ddda5edd5b483bea462fc4abe4c07710530997adf83be1dfc77c3fd72a74f60398ccdae8f8bdb84f3822ee
-DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066
+AUX konsole-18.12.0-fix-drawing-box-chars.patch 6037 BLAKE2B 9214a32c9ab66ad6a0cfd7d02a3dd05d4e8dcda067b247322d7a320ebab9a251193906577e1a395ef52d06658e436776cad628e1d6a7ff81bbaf1bed5486e045 SHA512 6439b1c90a37c80c3de0dc16aa1f68eff87e41562c74f86748b99c20702fe14c27cd6a0553284e4c957b70f1d6ef3c645b1b2485a73858cf390fc6603caf48ee
 DIST konsole-18.08.3.tar.xz 1077100 BLAKE2B 76ffc17c72ef6ccfc9618fd7ae59aeac00f8d686dcbe8fa61ef57248ba494d5dde94bc7f320c373f119e2ae60530d49640be7914aba7868b69e36c3673211f83 SHA512 3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82
-EBUILD konsole-18.04.3.ebuild 1420 BLAKE2B f940eacd6525caabc7f69e5e89a8cf1b470d255a3334f98ade87b950b5c91ed45bdeec7769cfd274c32d39abf99e0ba9475d4284c5ea042ba546949d78e7f1b8 SHA512 8da1c3cc6e9ae895ba7fc992bad527de09e8355dc6d49fc74d5a925fa18b0b64b79233aaf5fad2617d7ac93ebe56594669a07487ddb1de0c8c825c5ce223fcc2
-EBUILD konsole-18.08.3-r1.ebuild 1465 BLAKE2B 3c05b1fc9acf278919cd93d21d6f86db948053375c9e7c9682c307ccf7729753e63b1dc644dfc81f885bcfef6a5eb513745f89c778209b5650698acf1e9dbbca SHA512 7edaa956ad37143b3626d37ced1025afd3d5ac414b44a352a11cc19f94ed707d5b435f5cd90d09913d7023e6bbaa6ad67374345b90cfe51087c5b917d0552007
+DIST konsole-18.12.0.tar.xz 1093284 BLAKE2B e2a50364d80f1060c705a6ae09e657dcf3461a9903b0485650c57547964b57f99a98b2101e0f7702bf487f386018f40c1d9a96ef9a926fe935e193c7036a2588 SHA512 fce0f46d68453d795c68bc91ebc56c3db8e04e3cd20c5a036d12dd9cf29daf5aed7cd53f5f9af96081c3e6d3b79f52af7e0a127412771fe12ac1e24e09fcee95
+EBUILD konsole-18.08.3-r1.ebuild 1463 BLAKE2B d8b66938939c560a9a8152e1a3cac2187156e725f80ee1ca1bacc8bdc5e8a2f13de4b287aa049180423feda04a9854fda2835ba23c8e21ec8deae74f34f942a2 SHA512 0114d8802c1863cd68b559c7be971436fd99585e804c84919bcd494d6156967b249e950742a33a4b3f884d5cbfc4da90231310012b5299d5bcae731a0f2d707f
+EBUILD konsole-18.12.0-r1.ebuild 1498 BLAKE2B 56650907571190f9b7333bc837585d52b795d6ef2b8c94ea21a5a519269079a7882c8ae14cc0f52a2800199fe522e5a21db04ced713b194f5ac6a214a0f598ca SHA512 9148092b94af0ee6564b5d68e3b143fba64ecdc6d9d88d3e18669d9ba61ce2c14647cdc0a23abfa5cf299b951527fb256418c78ddfe5765363906ae102539afb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
new file mode 100644
index 000000000000..1847543737af
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
@@ -0,0 +1,188 @@
+From 807ac77061604c2ac7cf84b0a0b29dd949a6c634 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Thu, 6 Dec 2018 10:02:41 -0500
+Subject: fix drawing box chars, avoid storing and saving state all the time
+
+Summary:
+to get the box chars to be drawn correctly we need to turn on high
+quality antialiasing in qpainter. in addition only turn it on if
+antialiasing is enabled.
+
+lastly qpainter.save()/restore() is called very often, so try to avoid
+that if it isn't necessary.
+
+BUG: 401463
+
+Test Plan:
+`cat tests/boxes.txt`
+
+old:
+
+{F6428268}
+
+new:
+
+{F6450304}
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: wbauer, konsole-devel, #konsole
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D16947
+
+(cherry picked from commit 14b3c8be2c15ed9711b1308b4a991de4aad5802d)
+---
+ src/TerminalDisplay.cpp | 45 ++++++++++++++++++++-------------------------
+ 1 file changed, 20 insertions(+), 25 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 722e200..2b14556 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -619,7 +619,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
+ {
+     //Calculate cell midpoints, end points.
+     const int cx = x + w / 2;
+-    const int cy = y + h / 2;
++    const int cy = y + h / 2. - 0.5;
+     const int ex = x + w - 1;
+     const int ey = y + h - 1;
+ 
+@@ -671,33 +671,33 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
+ 
+     //Intersection points.
+     if ((toDraw & Int11) != 0u) {
+-        paint.drawPoint(cx - 1, cy - 1);
++        paint.drawPoint(cx - 2, cy - 2);
+     }
+     if ((toDraw & Int12) != 0u) {
+-        paint.drawPoint(cx, cy - 1);
++        paint.drawPoint(cx - 1, cy - 2);
+     }
+     if ((toDraw & Int13) != 0u) {
+-        paint.drawPoint(cx + 1, cy - 1);
++        paint.drawPoint(cx - 0, cy - 2);
+     }
+ 
+     if ((toDraw & Int21) != 0u) {
+-        paint.drawPoint(cx - 1, cy);
++        paint.drawPoint(cx - 2, cy - 1);
+     }
+     if ((toDraw & Int22) != 0u) {
+-        paint.drawPoint(cx, cy);
++        paint.drawPoint(cx - 1, cy - 1);
+     }
+     if ((toDraw & Int23) != 0u) {
+-        paint.drawPoint(cx + 1, cy);
++        paint.drawPoint(cx - 0, cy - 1);
+     }
+ 
+     if ((toDraw & Int31) != 0u) {
+-        paint.drawPoint(cx - 1, cy + 1);
++        paint.drawPoint(cx - 2, cy);
+     }
+     if ((toDraw & Int32) != 0u) {
+-        paint.drawPoint(cx, cy + 1);
++        paint.drawPoint(cx - 1, cy);
+     }
+     if ((toDraw & Int33) != 0u) {
+-        paint.drawPoint(cx + 1, cy + 1);
++        paint.drawPoint(cx - 0, cy);
+     }
+ }
+ 
+@@ -705,7 +705,7 @@ static void drawOtherChar(QPainter& paint, int x, int y, int w, int h, uchar cod
+ {
+     //Calculate cell midpoints, end points.
+     const int cx = x + w / 2;
+-    const int cy = y + h / 2;
++    const int cy = y + h / 2. - 0.5; // Compensate for the translation, to match fonts
+     const int ex = x + w - 1;
+     const int ey = y + h - 1;
+ 
+@@ -792,16 +792,17 @@ void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const
+         const Character* attributes)
+ {
+     painter.save();
+-    painter.setRenderHint(QPainter::Antialiasing);
+ 
+-    const QPen& originalPen = painter.pen();
++    // For antialiasing, we need to shift it so the single pixel width is in the middle
++    painter.translate(0.5, 0.5);
+ 
+     if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) {
+-        QPen boldPen(originalPen);
+-        boldPen.setWidth(3);
++        QPen boldPen(painter.pen());
++        boldPen.setWidth(4);
+         painter.setPen(boldPen);
+     }
+ 
++
+     for (int i = 0 ; i < str.length(); i++) {
+         const uchar code = str[i].cell();
+         if (LineChars[code] != 0u) {
+@@ -909,10 +910,10 @@ void TerminalDisplay::drawBackground(QPainter& painter, const QRect& rect, const
+         QColor color(backgroundColor);
+         color.setAlpha(qAlpha(_blendColor));
+ 
+-        painter.save();
++        const QPainter::CompositionMode originalMode = painter.compositionMode();
+         painter.setCompositionMode(QPainter::CompositionMode_Source);
+         painter.fillRect(rect, color);
+-        painter.restore();
++        painter.setCompositionMode(originalMode);
+ #endif
+     } else {
+         painter.fillRect(rect, backgroundColor);
+@@ -1041,8 +1042,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter ,
+                                        const QString& text,
+                                        const Character* style)
+ {
+-    painter.save();
+-
+     // setup painter
+     const QColor foregroundColor = style->foregroundColor.color(_colorTable);
+     const QColor backgroundColor = style->backgroundColor.color(_colorTable);
+@@ -1062,8 +1061,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter ,
+ 
+     // draw text
+     drawCharacters(painter, rect, text, style, invertCharacterColor);
+-
+-    painter.restore();
+ }
+ 
+ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
+@@ -1071,8 +1068,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
+         const QString& text,
+         const Character* style)
+ {
+-    painter.save();
+-
+     // Set the colors used to draw to black foreground and white
+     // background for printer friendly output when printing
+     Character print_style = *style;
+@@ -1081,8 +1076,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
+ 
+     // draw text
+     drawCharacters(painter, rect, text, &print_style, false);
+-
+-    painter.restore();
+ }
+ 
+ void TerminalDisplay::setRandomSeed(uint randomSeed)
+@@ -1499,6 +1492,8 @@ void TerminalDisplay::paintEvent(QPaintEvent* pe)
+         drawBackground(paint, rect, getBackgroundColor(), true /* use opacity setting */);
+     }
+ 
++    paint.setRenderHint(QPainter::Antialiasing, _antialiasText);
++
+     foreach(const QRect & rect, dirtyImageRegion.rects()) {
+         drawContents(paint, rect);
+     }
+-- 
+cgit v1.1
diff --git a/kde-apps/konsole/konsole-18.08.3-r1.ebuild b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
index 5bc727ab78c7..a3f626b9bcf2 100644
--- a/kde-apps/konsole/konsole-18.08.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE's terminal emulator"
 HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-18.04.3.ebuild b/kde-apps/konsole/konsole-18.12.0-r1.ebuild
index b4451f253c16..63fec0b9fa7e 100644
--- a/kde-apps/konsole/konsole-18.04.3.ebuild
+++ b/kde-apps/konsole/konsole-18.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE's terminal emulator"
 HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="
@@ -48,6 +48,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-fix-drawing-box-chars.patch" ) # fixed in 18.12.1
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X X11)
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 56f7f14731fe..ab48b261c1cf 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
 DIST akonadi-calendar-tools-18.08.3.tar.xz 225844 BLAKE2B 7c0e6689049a7bd022cc5b9e1201244997b20b944f9e350e71ea0f9cd7954e2e07a3ebf431c455c925f7180880d127ba590debf16ca2544bfa762efad33ac547 SHA512 f858d8eb2b79b999459d04ccf8e8a05c53c7275b6b3cd2f80224da42f280a4d2a4d6738a235c1f3bb4b40e36d605310cda01097678441b5c4a94698fdf42097d
-EBUILD konsolekalendar-18.04.3.ebuild 942 BLAKE2B 9488a6d4c482fd997d83dbba4d8a461af2c7594832bc30ca9ccb1de4a804021db5121a659bf1c2da3a23dac63f58d7ce2af33ff63b8906fc66e3915529cdc245 SHA512 944719833fbfcfa708a2f77b840782cd42b5abeb9d06339c07ea98e8f97f30bcf868a6e6c98d9d7230b76ed33e85691ed5f6e48dd0ffdba6c2e8d0acaa0d9a85
-EBUILD konsolekalendar-18.08.3.ebuild 941 BLAKE2B e780558a1832530137a7c98f20e4df2230a3996883f0fd8a2aa687fd2864c8c90d6a3c77f3b7fe4a8ae4eb724b29289b8d9e513af63a623b036397c143ada218 SHA512 3c189382d6b13e0ba53599fe4c3f0cccc72a1c702db4f2c37e06ac594106ba62d207d24038bbb10d078910813b095fdc4c3f535f484f12efe2eb31ed78bee593
+DIST akonadi-calendar-tools-18.12.0.tar.xz 225048 BLAKE2B 9cd9f65b11a7bf848c246e5ee627e3ec9a7dadc21402e86821d2db9443f9fb8d8fc2763b28dba8fc4bb8b82352d0130e05ff93b804297c68c3c72669200bc2e0 SHA512 e230bd5a71ab10ac7cde4696ce29e46f06011826b581988cc29d5703732dd3be1443f9ec686fafa08fe6c769a5b05d1fc66b5f0fa99aa0c932177ec09f472ef6
+EBUILD konsolekalendar-18.08.3.ebuild 939 BLAKE2B e37f9b52e4e697fd45d502a04c94ea1e4b4ce48e3837ca94907f5fd52c67e7046af48cde1a1e99f7423a16bd34b5d796ef5264cc48e80ec137ed5afc36767bf3 SHA512 045b9e676b4a707a761f732ea774a906b10817bfae92a2cbd112e7b774591d1818fc7d2bcc143cafb3f925dfa41b8b73dd152ae77aaab139655e75528920f0c2
+EBUILD konsolekalendar-18.12.0.ebuild 941 BLAKE2B e780558a1832530137a7c98f20e4df2230a3996883f0fd8a2aa687fd2864c8c90d6a3c77f3b7fe4a8ae4eb724b29289b8d9e513af63a623b036397c143ada218 SHA512 3c189382d6b13e0ba53599fe4c3f0cccc72a1c702db4f2c37e06ac594106ba62d207d24038bbb10d078910813b095fdc4c3f535f484f12efe2eb31ed78bee593
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.08.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.08.3.ebuild
index 7a038070c7e8..4e65a544294f 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.08.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.04.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.0.ebuild
index 8f286d827a78..7a038070c7e8 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.04.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 80da44fe1207..9395124a1e42 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
-DIST kontact-18.04.3.tar.xz 862824 BLAKE2B f9bdd0833aa84e971af18894677bb43ea3f7c857fdebd1e2352403599927a90cd80c878a318cad992c6bef15b1da178b836db0eb73d913ddc2bcdeb94147e0c6 SHA512 e902e9089f26d831fd85d91415d13a259cc91866e1df4fc4bc3a25bafbf67d180a44cfe2f18f0f49f94a11efe0e5f43737ab49ba8a761b24948725221f2218c0
 DIST kontact-18.08.3.tar.xz 864428 BLAKE2B 613eceb643a62ef912a4c48c5124fb90458bb45af0aed5987e557f0783a9e2e825e0a78e56024e0469a30053c5fdddc918eb103ce654ccb12afd69b308617da2 SHA512 26dded6a7bf8fdcc273aca194c4920ed5cc2017d7e5b092282a0f72d9d73c6f77e793e7467c280707351e393d81b1c1500be4faaa4b75fe51452a31b659fc091
-EBUILD kontact-18.04.3.ebuild 1201 BLAKE2B 25a39047a7b805c48b0e125a9abdd90fd399f4adc01857261370205157d3dd8d92e7858d6be58434770ae0cc29eeed686894c7c8d377ff3bb9a114fb7bc93331 SHA512 8fb6256b7a1e35ab92642cf673ff334281deb9c6e8afde36dea0357d39e942aec77cd602186cc69e1f4e49f758c7fb6b4d995c938b8a230f465de270b4d252a3
-EBUILD kontact-18.08.3.ebuild 1200 BLAKE2B 55150e69bdc82295562dae9646db00854f15de36efc3270ba23f6c2867169d7e8d1c6782bb60e148088a63390f51b01c559adb67e8ba0838c312d8cf6405addc SHA512 c56cdd26bd62757da6da55f6547da4757176548410d5c724def69fed4da60fa05ee1e18e7eb37d4ac96103fef58032151a9279a1161d53ecdd73634e0d8a23da
+DIST kontact-18.12.0.tar.xz 792068 BLAKE2B 18ef8533c3eea7f211cd35223ddc99a1a1e9f73ef5178129df7aff08d9fe1a152cee8f30b854a59cd0f70cee4582e1c4aea057bb4d5723a39fdd6dcb68f49363 SHA512 349991ab22b005fd87caeefc7c79d15ef5b0ee84f8b53ef22f06746aefcb7395b92b5b3c28a9a4b5b88e676db48d6e1ef61ee08e521ba57f981dc1582c4b868b
+EBUILD kontact-18.08.3.ebuild 1198 BLAKE2B 9e3969a3bb9339e3866a174221220b63ba62feb2442358ad9990a1851bff5e7d34b10ce80afa12530ad018dbb39cf4e75886d2fe23453e1c7a9fadd5ea514506 SHA512 9ac9e17ce9aa1306c4a7e3390cde863f29ce2e07b0d035de6f5c98743d0cfb19072dbdbe58f414b5e307fc99f22f9ac927711f9a95af6562efecd1c9e7a7a7e1
+EBUILD kontact-18.12.0.ebuild 1200 BLAKE2B 55150e69bdc82295562dae9646db00854f15de36efc3270ba23f6c2867169d7e8d1c6782bb60e148088a63390f51b01c559adb67e8ba0838c312d8cf6405addc SHA512 c56cdd26bd62757da6da55f6547da4757176548410d5c724def69fed4da60fa05ee1e18e7eb37d4ac96103fef58032151a9279a1161d53ecdd73634e0d8a23da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-18.08.3.ebuild b/kde-apps/kontact/kontact-18.08.3.ebuild
index 69556fe33a42..37590ef1454f 100644
--- a/kde-apps/kontact/kontact-18.08.3.ebuild
+++ b/kde-apps/kontact/kontact-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Container application to unify several major PIM applications within one"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-18.04.3.ebuild b/kde-apps/kontact/kontact-18.12.0.ebuild
index 42005ff8bdeb..69556fe33a42 100644
--- a/kde-apps/kontact/kontact-18.04.3.ebuild
+++ b/kde-apps/kontact/kontact-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Container application to unify several major PIM applications within one"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index bf316a4f92d4..bcf48ee19936 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
-DIST kontactinterface-18.04.3.tar.xz 32892 BLAKE2B 984b35cca9863cf21cdf7c19c891a0ad7bfb1b3874fb2657d69f766adf16b8d385a4d1d0837938ef7b1e00ce70f0a12ecf9c1bc153fe039ad48283293c543fb6 SHA512 2c1a0ac71c5222189aa37ab606205cfc7f7fb6506cbae97058c73584b5195547c2d7813b12f05542173853081b6ce54cc9792d4c9d6114e424ba5fe24b3bcfcf
 DIST kontactinterface-18.08.3.tar.xz 33020 BLAKE2B 23033866f94075610c0daad82d982db51613de0dc0f1175632e1a8532a1eded5ee0600a0d3d2580ab06d5c15a0f71e52073fd0f2a48cb539f200e2b4d6a438b1 SHA512 9aeac4b40862ca30240a7ce0e92ca9921b43fb8b2c5be0f9093361c7f9c1e65ce42c6c53a93dd4180e64463a896682b89cb8ab0b524be9ed18472a02a243e94a
-EBUILD kontactinterface-18.04.3.ebuild 592 BLAKE2B 459a8ab4dc042f07180f7571e3a23d1e99051835e77ba7f60b79b188fa592f0ccab18991ffefa550235d1fe54fbbafa8ca7a2829ea54898051404f28b27fbe52 SHA512 7e8dd97122cb8ad60418dc70f39c153b8cf0f4be05724be1ed4890c87cecea3daede34b6f7df5dd36706699a4adc5da78f5ca34d3a4c96590f6c56681dba94c8
-EBUILD kontactinterface-18.08.3.ebuild 591 BLAKE2B 305563996029b4b26068ba099686d2c3ed01dd70dad151c6bb5d2d3be13fa5514948b577add05d326fe3c457c431dba495b56cd6f7dbd85e3cc30b016edd3db5 SHA512 abf6a9887906fe1c3b69babe365a39caa709699d619aa55057c4b56e316da036b89e0e433807dc76f25fd3be8c6d23cb247126c94426ab0a701618d8e970b134
+DIST kontactinterface-18.12.0.tar.xz 32860 BLAKE2B b36183f853eb9dd702d8f30e51aed9d99f5727d6012709e3e7b71ba8d9f5817ca5108ce8e8660aa450c97ce1df0ed6bb3b6adc53e766911f168b310ae3763c5c SHA512 072cf12c0005355475fddf6012dd8b2d6a746cc5a92feb2953147f71868d9bf12a6560978130d9eab4b27ad71ce6e44d15156229822628a9539d876c4d750d98
+EBUILD kontactinterface-18.08.3.ebuild 589 BLAKE2B cbb5c5fdc6edd4abc19409cd6933a6286eecde5d1a763dc23bb9a9854a9edc92705fcd5abc78b86c012a381a8da54e9c3262e134bace66a71be4095d899b7b71 SHA512 f7647e386c681653a1bfed377b4da288bcf22bf608dae0682a62f08b07bb56a9985397183ebfc4cf01fd2ca952a5279ebdfb7ecaf25bb5bda6906e5eebed0aa4
+EBUILD kontactinterface-18.12.0.ebuild 591 BLAKE2B 305563996029b4b26068ba099686d2c3ed01dd70dad151c6bb5d2d3be13fa5514948b577add05d326fe3c457c431dba495b56cd6f7dbd85e3cc30b016edd3db5 SHA512 abf6a9887906fe1c3b69babe365a39caa709699d619aa55057c4b56e316da036b89e0e433807dc76f25fd3be8c6d23cb247126c94426ab0a701618d8e970b134
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-18.08.3.ebuild b/kde-apps/kontactinterface/kontactinterface-18.08.3.ebuild
index ec6d4a14ce0f..ef1b193bc7bc 100644
--- a/kde-apps/kontactinterface/kontactinterface-18.08.3.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Library for embedding KParts in a Kontact component"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/kontactinterface-18.04.3.ebuild b/kde-apps/kontactinterface/kontactinterface-18.12.0.ebuild
index b54cbbc19570..ec6d4a14ce0f 100644
--- a/kde-apps/kontactinterface/kontactinterface-18.04.3.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Library for embedding KParts in a Kontact component"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index a23050b318af..eea820100cab 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
-DIST kopete-18.04.3.tar.xz 9568508 BLAKE2B c20ffb4ffdde34f94a400a7a42b6c36a3432df8db438b9c94cff50dec5b9a39f03679dbbc1a38151c517d99ee4d8bb4c8b7ad0e79e4947ad1643cc0f7d0064a7 SHA512 568f36895f66df00e4207e893b7a782111df5fee6a875d77aad30a214088589d1c317c0131eb3b21b264224fb8bde239b31af8c9cda4405079990e3f5999edc1
 DIST kopete-18.08.3.tar.xz 9382668 BLAKE2B 3a45ca45c89dada7aab805997c66c58d3cd68294acf15cca738e5246cc4c23b45ce96869e0a126a0cacb545b919e4ae1490a967cc6ae5bc59f806d18d400507d SHA512 411222369e82395610604e62794442bd34e3916a8874533873debe29afb42dc24877137ceebb6872f2ec3717a80a6a6b14242d2549892dce6573668a2f8ac02c
-EBUILD kopete-18.04.3.ebuild 4550 BLAKE2B 801d3a10360bb7ff519aacb7b9a9c1a400509b4ee6b4c98a28f904298e60d98572fc8f28b74477a50601f42a80e7d2d3a1f0b687aea9f6731de075bfa6d43cb7 SHA512 95af3a60c2424f063688ab53b560614e492e4cb65a7aac05ab9a9a7eb2e6cfdc039cc1acf1f62c6be529b4a11db169f81ca43f8d22552f29c706059ec8c853f5
-EBUILD kopete-18.08.3.ebuild 4512 BLAKE2B a34b186d39677ec5c3bb3df6ca7532f0277deee6cdea1440c98feaa9dc3cbe448f4584d23450da3130b75407a7f8fb67e28ddf0218a1fe4432a81d786ec063fe SHA512 14d6ac96d48a6ab6ba086b517f08d147c6533420cf5f8ca1cb260b84515612008d6696b1691297350d88e4dac7599a0dea6c92b58c4af272968955dfc44a7342
+DIST kopete-18.12.0.tar.xz 9346732 BLAKE2B 0ede322180d0609890ff947f3994999fecd88d67857bb0aeb8e6c58d59a1e7a5346e0abd7d9ae103f7f24d5691d1af2adf60f84a6c70c37abe16931976c1a022 SHA512 9400cf572cd1ad47dd1f9f491fe85376fc8b8232ffa59d2c2c68efb930cc013ee8d264e88cdb86fce7736c4cf061ad2c79d90854b961d660f5fb517f27f6c43a
+EBUILD kopete-18.08.3.ebuild 4510 BLAKE2B 38fe478e55503659c0ed71a43d5e40f61419549d78fba5eb1eba291af818dbebd4f69adee7b0a16d29c844c529629bcf771dd6304de3132eddfbe503c7c5e706 SHA512 221894084ce809fc7837a0a9e3ac784e40ec2ac51a5aa25338c99af15df3877c0934ea8b059f1e93a4bb4b78bce4756f0c67ea3da8efb1e7523eee229ebb28fd
+EBUILD kopete-18.12.0.ebuild 4512 BLAKE2B a34b186d39677ec5c3bb3df6ca7532f0277deee6cdea1440c98feaa9dc3cbe448f4584d23450da3130b75407a7f8fb67e28ddf0218a1fe4432a81d786ec063fe SHA512 14d6ac96d48a6ab6ba086b517f08d147c6533420cf5f8ca1cb260b84515612008d6696b1691297350d88e4dac7599a0dea6c92b58c4af272968955dfc44a7342
 MISC metadata.xml 2031 BLAKE2B 10d27c95c13f44ac3a3149072350e9434ef5b88c2dc4d493bd628d398e531de6a0d7b25071981246da3d53cd5aaff20d392b32d358da3af3f4238fc76143f6b0 SHA512 790e5f6a88bf63533cc6555b44b1a4fd43fd9697d4dac284b0770d67b5dea6cbaa33d399f8ac653d976bb12a29ae583cacc734f2c2bc63be9363ef4921efc568
diff --git a/kde-apps/kopete/kopete-18.08.3.ebuild b/kde-apps/kopete/kopete-18.08.3.ebuild
index a35312c6fbb2..0ce96c78264d 100644
--- a/kde-apps/kopete/kopete-18.08.3.ebuild
+++ b/kde-apps/kopete/kopete-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
 HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl v4l"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-apps/kopete/kopete-18.04.3.ebuild b/kde-apps/kopete/kopete-18.12.0.ebuild
index 166468c7d884..a35312c6fbb2 100644
--- a/kde-apps/kopete/kopete-18.04.3.ebuild
+++ b/kde-apps/kopete/kopete-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="amd64 x86"
+HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl v4l"
 
 # tests hang, last checked for 4.2.96
@@ -56,7 +56,6 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 #	irc: NO DEPS
 #	qq: NO DEPS
 #	telepathy: net-libs/decibel
-#	yahoo: media-libs/jasper (service shutdown)
 #	skype, sms (until fixed)
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 69621b76e3af..a5ceaa7f282c 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
-DIST korganizer-18.04.3.tar.xz 2267176 BLAKE2B 2731a2660d2eea48e61cacdce4d8f73772bfa8cd6817ff50059ac8a92c31b7aa3b56064f38c88c915dcd3a0a1f96a5a9ba85e9b251aca48edc0d3ed441041aff SHA512 52a777001ab986fd1f1bfc573519b2a19d0b0308f654a4ecfc2a273d88c0feaccdde86a044d1da1617fae4442811d3e9c35628e6199aa776cc8fab61c13bf5aa
 DIST korganizer-18.08.3.tar.xz 2278088 BLAKE2B 8ff533c434856b674c187594368d84544bfa7bc9c662ee8f12a6600e63df7bcbd739c6610156bde259345260d6aec93b12338b4a5f14cbaeed82a1fc511dd2b0 SHA512 b1290740e1ce7c0734197cd8c3cf040c6cb1cabc89049225ae9beb4fdbae633ecc38a97c55db3228b13e35be238d76f1ab3d8b3efcda85d885823626f60c5549
-EBUILD korganizer-18.04.3.ebuild 2394 BLAKE2B 130a1d34ab261ad3cb0f5fba0a9f06db3bdc8d180ee4b18b25ec029986bac66afabc8b893c1db7af3d3dca941d3659d5f4dcb207c9d8b0cfddaad1cdefd6d71e SHA512 b3bbe707942c826c71056e40cd38597650a9ba786d60adbfc9e6ca7a8b826af96a6bb4591efc8ad41c1ce1e1023700a1d246e41851c68043cb6ded615e74478a
-EBUILD korganizer-18.08.3.ebuild 2354 BLAKE2B e856b02125c3a6c4f3507dbb8d42d2ed2fe13da36c97266abbc7f22e76b6302ac9afa48841a2ffdeaecbc9ec102dc5f2ea1a687285a04859c28032da6bc52d36 SHA512 0321bb0669f70ff10b3e1d645c6b9b3cffb03b3207f7f6e0fa17a7e7612b85bcc01017d755fe2624277164e0784bd0bd600a42d79bddcaf5146953c173de9743
+DIST korganizer-18.12.0.tar.xz 2232952 BLAKE2B 14b7f0aeb9ae3eda7cd8482d0e8c438014ad78faa4456f0508910fd95ca867252c44c6a158f886834ddf367094d73f740bff7c9790ea0498ea7a25480b5a9961 SHA512 9c38b6dca1548d61b9b58a681365d436dae2aa117345f7026fdca8c422f798a62c1cb5eb9da5ece409a4f6cc5e8b408334a34ab66ccd67aa50ad641af8513337
+EBUILD korganizer-18.08.3.ebuild 2438 BLAKE2B cfa6b77d1c96f94046b4a1f1fcb314ff0fe50d18cf542405306009acd408ed8e623e81f9a54f81eecdfa549a9fd03681cf20b3478ddf3722313dbad5fffe2740 SHA512 c751af95eb58acf7a9450a5d6d3555fb01f04f3765b2e00244ac1a95d7c4ca7497cd6aab7ccc01f93121d58f476793de8726aac9d38326d05eab196bc46151a2
+EBUILD korganizer-18.12.0.ebuild 2440 BLAKE2B 6f2c589d1d0d93cd6c9f03798edeac833bd5e2baeb9e906af87286a06bb11cfcabd3a5c8233c1ee68c1c963f3c91999109d9675ed207969b7c467053376de1e0 SHA512 8bc92ca8b4b7a57515c61255d364c833e080510ba474da58daab771a4d82b1ca762310ce183d6caceefc47879c457830f8ea1d34e54fd5c4aebbe4843d5677a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-18.08.3.ebuild b/kde-apps/korganizer/korganizer-18.08.3.ebuild
index d2c630c1f07b..923cfed25182 100644
--- a/kde-apps/korganizer/korganizer-18.08.3.ebuild
+++ b/kde-apps/korganizer/korganizer-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
@@ -77,6 +77,9 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT+=" test"
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X X11)
diff --git a/kde-apps/korganizer/korganizer-18.04.3.ebuild b/kde-apps/korganizer/korganizer-18.12.0.ebuild
index 79b37be4a7d4..c8488051ea9f 100644
--- a/kde-apps/korganizer/korganizer-18.04.3.ebuild
+++ b/kde-apps/korganizer/korganizer-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 COMMON_DEPEND="
@@ -23,7 +23,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -78,6 +77,9 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT+=" test"
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X X11)
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index e11b57f65a19..dc122e37922a 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,3 +1,4 @@
+AUX kpat-18.04.3-qt-5.11.patch 568 BLAKE2B edb523a493613cff7a3f56d434c79052b178a7b26e9b2352d761af961ae4abbbbcfb969a8bd3df72d750e737a0649247635a540c9309190962335f8cc498e7bd SHA512 ba6ad3d6cf110b5ef3a618dcd20f17cb1a97249c1a1105cfe11369bf1b249fb7d8a1f7f7c6077aa91af14217829959a848a3f382931e49edbecce8f5b6d4ea12
 DIST kpat-18.04.3.tar.xz 3565116 BLAKE2B 3b61d26df58e6c502f45acdf3ece92d400301c6e8087fe00034d56f4acbbf047cb5ffe391345cde20b5ed69317cd703ecf1871c891e192e53d91eba73d6e4c8e SHA512 bd325d52faad7200d5aa1738cc539d8f285c4b9cb67e2f63837379fc89b4adb8873433df01392447e69546db04698b2f108613fe0a3001bf7c77dbda0bd73acf
-EBUILD kpat-18.04.3.ebuild 900 BLAKE2B e459b04f2ac003caf9d1df8e038f7a531d82a5075b93f262daedbee37e4536ccddab64d310d999383b72f6f22e56f2751b42e626422a71f89429be96d768f022 SHA512 7f9e6c61b2c74add0e25664566f511daf9e8af76170514536cb275c957596a1e1438f341db4aad968dd370d71b8441dda9c45539e9ec0941b92455c375d08104
+EBUILD kpat-18.04.3.ebuild 943 BLAKE2B 4556072482bf996c91f101c4c2c770a578b9f68dda46a5c3dd383e7add8b6aa6edc055cde56640a3f89ddde01cae295f7160a2f4a530c09f060c1e9a8454cbe6 SHA512 17a5ecb87bffec8d68f4e858c2cf0b40f240dc357d5fc277ff497968dd23adf696eb01753ada055e17e7408ee4e96c31cfc6cba33da27082bab65b78dc5644f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/files/kpat-18.04.3-qt-5.11.patch b/kde-apps/kpat/files/kpat-18.04.3-qt-5.11.patch
new file mode 100644
index 000000000000..d3c7b7843610
--- /dev/null
+++ b/kde-apps/kpat/files/kpat-18.04.3-qt-5.11.patch
@@ -0,0 +1,23 @@
+From 7a69e3f4b15a902c4008a428d5fbf0335526f49b Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Sat, 22 Sep 2018 16:56:04 +0100
+Subject: Needs include of <QBuffer> for Qt 5.11
+
+---
+ mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index cec0685..a597717 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -78,6 +78,7 @@
+ #include <QList>
+ #include <QPointer>
+ #include <QTimer>
++#include <QBuffer>
+ #include <QXmlStreamReader>
+ #include <QDesktopWidget>
+ #include <QKeySequence>
+-- 
+cgit v1.1
diff --git a/kde-apps/kpat/kpat-18.04.3.ebuild b/kde-apps/kpat/kpat-18.04.3.ebuild
index a023a866ad02..f6681caac28b 100644
--- a/kde-apps/kpat/kpat-18.04.3.ebuild
+++ b/kde-apps/kpat/kpat-18.04.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,3 +34,5 @@ DEPEND="
 	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index ba89cd4ce6f7..1f9f9bd5e411 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
-DIST kpimtextedit-18.04.3.tar.xz 142880 BLAKE2B a8ff9679cf54f0445c4fea83ace27774dd801aea2ea11a29031fea906e35f22867cbcffec3e1541d45ec4dbfdc34dde0f508f2bc85d7439707a8b2be0dc0dece SHA512 e8cf0563a2c60bef0b82b0d60a025191c8660c783f262648bc0c9c9c17eb24b5c3c2a0d21159df60009256e920e8a649f06b22815ab051099ba4d6ef145d848e
 DIST kpimtextedit-18.08.3.tar.xz 143012 BLAKE2B 157a6231e2def27b89781c29c99c73f8c35cf6e60bc6b5e293e9aa1eb78be65dad5a24485500193e9156c1fe2986dc75d7e8e80d3692e5ce1001d590fd2f5229 SHA512 3a5ca2c2fc30f1c961a6f8b76a01c29be4b36c4e512e3c0cfaaa36c95fa9ba548f0d56cca3b9be86f2453c5c4be990b031cb2cd52a0747e1ab8af798156a7da7
-EBUILD kpimtextedit-18.04.3.ebuild 1129 BLAKE2B a2e761276a599082c12b2a2567ec078a53bc09f946cd06d57e5d61eb40aa35380202b7f4369a6cf0f6e5e6468cecbd2f674791c9d6002a91293d13c18a44e11f SHA512 1c09e0d93b126047052e1655df2877b5538ab13964eb42a918e1ed08c5c345e6674819f3ff6a578ecd5f386cd98dc7449f7eda6cf1f0f5643af3824919400e52
-EBUILD kpimtextedit-18.08.3.ebuild 1128 BLAKE2B 0420fb6d2cf46ebf1e3aa1c3f2727906f110f30f167a329eb4ac13958fd164884f978879c00f4f4b87e8a0dfb50c9266e511fed5ee88458a28afede45d2c1cb6 SHA512 966fca51657a9c396d646975e9663b0c601cb82d4057e421d2638b345e2a6f4ae1bc37ca6ccc12c8e39d385fc392dc8122c55cd1ef2a56c14565ff46846ae52b
+DIST kpimtextedit-18.12.0.tar.xz 142472 BLAKE2B 64957360e1144d318747b3d7ef40712b3260fe7c66de5f95e5ec3d46494326c3fb63917ba1189845f78a2c26c382f5698b077aa01b95e3bfa21b1cd1deef0355 SHA512 72b3430844710f7b6840402f6e94798d5566e5b97dacaa246a097b85bafa31a02e293f930b183f565ac61a64f4353e885764094728098559afd5b7c5e288909f
+EBUILD kpimtextedit-18.08.3.ebuild 1126 BLAKE2B 9cc1f3938f65a86634fc8ece24faa8d03da54f951c13a777f0d4a4108bfc4ea34b8edbb442350b996836f45d73745fd1d3a5228a2f98eaa4556c12bab8a9b83f SHA512 f73cdf8c965360617aa9f43e862bdce21b0305ce360578c93e1bacb507863e590da194591b113ee2e952a2a6d5a8707c23b063ed4baa76f71474678fddec38e5
+EBUILD kpimtextedit-18.12.0.ebuild 987 BLAKE2B a5be845edce2b73fee5e6c09357d3a0932dec5bc33acb53bbeaccdbb5db66618c4446b78347f73b4752412f1786c1ae4e633c00474cd51663289636bc9d7e46e SHA512 074ffb976a7cde33bd7d836eb07009847f8d064bb17496b5415a0a2c4bf8b64e6a0df40855088fc4aed41d877d09a2ad15a7d15103483e694539195da1804daf
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.08.3.ebuild
index 3e7c1d30ba2e..34c57f8d6970 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-18.08.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="A textedit with PIM-specific features"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="speech"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.04.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.12.0.ebuild
index da42300dfe80..52842fcf41f5 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-18.04.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,8 @@ inherit kde5
 
 DESCRIPTION="A textedit with PIM-specific features"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="speech"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
@@ -28,9 +28,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_frameworks_dep syntax-highlighting)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtspeech)
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
-	speech? ( $(add_qt_dep qtspeech) )
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( $(add_frameworks_dep ktextwidgets) )
@@ -40,11 +40,3 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 4bd83391f423..a53fde85137b 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,3 +1,5 @@
 DIST kpkpass-18.08.3.tar.xz 22924 BLAKE2B 357aa5dec52adf5e9de61d88b8971b9c6b50250d81957a3ffda93d1a682c02be755e1224c514bd56f56d0a9de408190a7a4cb277186bc1cb0891800531f76fd6 SHA512 391d618dfb6378d8665156df7b7a2123ef87cfe07fe8a5352ddd492b6603bc7f83fa06c7ab23ce63d02ddc423b753d6b848e6a1c25d14b49d19290e2cdae5066
-EBUILD kpkpass-18.08.3.ebuild 469 BLAKE2B b302c2e948dc2ef36e0b0201d476baa53ed8a34c611c2e818582841e4e25bf23a7fd8f121789476a381cf9751946ce470633c59672904e8fc58e6eff42e5e0bc SHA512 d90cfa48b4ee1c433c7d00f1b15a5a0ae2c3868a35caad5dfe3a9e5d5b11c6f0c5fae68e9f1e09523306d2e4a38af18319ad77e436127ed44b75d0c25dcb01be
+DIST kpkpass-18.12.0.tar.xz 23220 BLAKE2B 506ce09a08140391e9ed7e170b34eaf32abeec2d5e0daf0179cb5d8cd2389518da49d2bf81ab820bba7232cc70e0fae353bce3856e14abdb876c2388ecef63d4 SHA512 8c1fa70149544739b5b96f1c6b4a25ebade5fa944b004c8a32e19a759c8939cd402196d5a7f91962a2221d57050555349c777437b7ae79a73b3406f1be5a51f3
+EBUILD kpkpass-18.08.3.ebuild 467 BLAKE2B 1d87103ae63ce670395f1ea4bee0278ad493fc5543dd6b937b1a40433f0e4e7de48635a2167f1126f9912edd66aea0a0341a756ef6c591e1cd0e626571b156ae SHA512 9589f24f3a4924508aa5928cd750ca801170cc7155c1d99039a7feae5e9d5c58356c6e255353102119f0a4efb5ed15cd1d053fe8b6a386dd0a7fabd46253a522
+EBUILD kpkpass-18.12.0.ebuild 469 BLAKE2B b302c2e948dc2ef36e0b0201d476baa53ed8a34c611c2e818582841e4e25bf23a7fd8f121789476a381cf9751946ce470633c59672904e8fc58e6eff42e5e0bc SHA512 d90cfa48b4ee1c433c7d00f1b15a5a0ae2c3868a35caad5dfe3a9e5d5b11c6f0c5fae68e9f1e09523306d2e4a38af18319ad77e436127ed44b75d0c25dcb01be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-18.08.3.ebuild b/kde-apps/kpkpass/kpkpass-18.08.3.ebuild
index 1923f58dfa19..4852a0115e9a 100644
--- a/kde-apps/kpkpass/kpkpass-18.08.3.ebuild
+++ b/kde-apps/kpkpass/kpkpass-18.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library to deal with Apple Wallet pass files"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpkpass/kpkpass-18.12.0.ebuild b/kde-apps/kpkpass/kpkpass-18.12.0.ebuild
new file mode 100644
index 000000000000..1923f58dfa19
--- /dev/null
+++ b/kde-apps/kpkpass/kpkpass-18.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library to deal with Apple Wallet pass files"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 7a5050d0a1f4..b8e7c954e29b 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
-DIST kqtquickcharts-18.04.3.tar.xz 25688 BLAKE2B 617a448edc1f24ea0819f047cb4162f21cd4ce1ccefee9b57787df1879b010b06929b48117298f30c4d7208e278ab55253e028b48413248f9462ccec2d8888a8 SHA512 1569a64fdfa1ba95368976b25793c24b19a796b2a62e50942b0588368e5fab17df3dd6b0aadb774f32b64c1f71705264057781a2ce3b151fa3bf3f6444e2e8df
 DIST kqtquickcharts-18.08.3.tar.xz 25684 BLAKE2B e5f78ebb48ad33d37cc5bc10aff3070cd105ed87b6e77da7ebd1e1ce8e5dee99364e342343df7d599ea7242d850ac4e6f2f91ca3e03ed35dafe43da4cfaae2c5 SHA512 4736b2cd4aa29171adf2979b3aabad1aa06d9d2bf7ec3ed6c97a267a9de2f7d2350590bd440f93003d60fa42793ca786d240778dddde2f304de41755b50a3e0a
-EBUILD kqtquickcharts-18.04.3.ebuild 308 BLAKE2B d7cf5e9111fa6601dacc8c513226c6633e1a9c267522b2ccff1781f5642e845aabe57be692c6ede94aa76496df5907867636d6125eef33e242f7cdc6912c7698 SHA512 d7245eefebe52badffb56eaf5c63e54009ddd6843dbcc130d8eb62d4618d4d418b2e592b5d050c940d70acd139ee688907906edce8fd051b11ea9ee793a73c7f
-EBUILD kqtquickcharts-18.08.3.ebuild 307 BLAKE2B 1cde0b04e772a71bd2398d5dc437054699d76f821c791ad3f52f161f571a1244d05417a09cb1fdc1790dca48cce0f945b6920ec373a8aca9a2d355f9259d1876 SHA512 c4fbcabcd0b2cef875304ef929417ac31e02af28070fd2fcb5c93fea77e106b30429b60fbf85d8bf9dcb94f470687838f4d1993b8428e8f4761b335beb879590
+DIST kqtquickcharts-18.12.0.tar.xz 25688 BLAKE2B 2a21d25e61dc05a68f237518117292e24d42b73b3a0afad8d30db7274a89264058c37e4c01bdade1226a3b7363173cad6b1e4652466fb7eec8ae7c890f647c41 SHA512 bce0e6381c24baf8d1cbab74ab983ab9fcbaf8f98b8b0a2b2a4aaa0ab15537d52c1ccfc97210e4149f05eb8c291daabe2686a273944669d7d7d24061adebb773
+EBUILD kqtquickcharts-18.08.3.ebuild 305 BLAKE2B f3abc853043c950804c4ce3c38fce195c7109979452212416ea1061b9a35bbb011e917f533f475cc88faac6fd26c8d95de3292585cc7758734e1e27d26c40b4d SHA512 d69c295d541f6a32b5e1812a75cd71f49d3c4a44407aa93547f57203ef2996c62b87b762a7160ad9363de7aeb25957104a2112b09eae2250a1f40d1c13a90f7f
+EBUILD kqtquickcharts-18.12.0.ebuild 307 BLAKE2B 1cde0b04e772a71bd2398d5dc437054699d76f821c791ad3f52f161f571a1244d05417a09cb1fdc1790dca48cce0f945b6920ec373a8aca9a2d355f9259d1876 SHA512 c4fbcabcd0b2cef875304ef929417ac31e02af28070fd2fcb5c93fea77e106b30429b60fbf85d8bf9dcb94f470687838f4d1993b8428e8f4761b335beb879590
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.08.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.08.3.ebuild
index 2550e18378ac..7cd9e3dd4a3e 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-18.08.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.12.0.ebuild
index e623f1f207d2..2550e18378ac 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 65a14c4db97c..3d4d7ac9bcb9 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
-DIST krdc-18.04.3.tar.xz 1553844 BLAKE2B 712f94ece355d7f5f16c2b94f058a93cc7461b1992d04ac54729e6b8ee8774dba86bc84f96563e18867a88c4ca76c57936ecf9b4dad92522000660555b0ebb4e SHA512 ee987c449b76abeaca909a3053ad41eace8a1890eff8cf05f6a2a83faa7707ad60e2c1c18cbd06268d4d9f0452a033574b26c2b38c29f463179c6a9fcde82e30
 DIST krdc-18.08.3.tar.xz 1561228 BLAKE2B 1c55b4af1a2ce9553a2de297ce0de02e2c4331360d64220998d340a93e6241a6b9415a6e9bb60eb460ea52a4db384a4469a37014b94656a380d6a1f165e2da96 SHA512 6efd562839d512dc5188b18c3a33b8dd3b13d6021ea211a0c1691100e9948aef27ec3a3beefd213f9e939606f5b7c2bfa6027955369b38d5ad1d10c381d466e8
-EBUILD krdc-18.04.3.ebuild 1175 BLAKE2B 6206722e0bc1d69af854ae2a41512651cb216e6c4e1db5041785fbd0439c1fda773158f3f3983483cfd7efa1f4264460a50580467ba9512ff0a811f31075e41b SHA512 65e5f03c34946e9c14a7637a075e6bf2a3af3433ccb6197f94a9676b89bdd14bc185109c419e15c085162836c9108ed8fe19ab4b39bc8891c172eae3450c71ed
-EBUILD krdc-18.08.3.ebuild 1174 BLAKE2B 0e5b69b6af85575927b37d3a1ad5825ea3538ca9722a6f76872fc5eb1b35200e9ee4bc87914c460c4a5ffe1accd64003d13bb75610a1eecbeefdf2f82e841012 SHA512 d0f911492c5a5512aa4662b9315626c8f3cc3a5ffa0a03dec568f2131b052d272a6faea3e57b5ae4d234857332e2177ac0fcdf660310f4a48265c5ea2754bb11
+DIST krdc-18.12.0.tar.xz 1558304 BLAKE2B 44058739afd921f380639f11acb3dfe87294e885287c609047a52d35a60a23fba92f365c9eac6bf640c8d097fcd5a732fc1516f4b9a43ae8663c5ad456e5aa4c SHA512 006410808635330f4074d855cb3b0f8cb3dd8a502914cf5af756ad28928f77d8ddad24394a4e97332719b653d814717f3656d5103e170214c191d46ac1b9bdc5
+EBUILD krdc-18.08.3.ebuild 1172 BLAKE2B f73eac791c859a7e69e6a199e66d8b4449e87e175135598d9229b72b3abc63816347e7049bc679008f5e34354571540c423627c90cb8e5cef2b34c94d4d6115b SHA512 3be76ff505306d511e8eec7a2ba18601a6a8c3ce82e0c083bff05e41b92a7bb6274320953952501fb07838a2873f6a25f4b5636d76b3361c3e27e81526cee9e5
+EBUILD krdc-18.12.0.ebuild 1174 BLAKE2B 0e5b69b6af85575927b37d3a1ad5825ea3538ca9722a6f76872fc5eb1b35200e9ee4bc87914c460c4a5ffe1accd64003d13bb75610a1eecbeefdf2f82e841012 SHA512 d0f911492c5a5512aa4662b9315626c8f3cc3a5ffa0a03dec568f2131b052d272a6faea3e57b5ae4d234857332e2177ac0fcdf660310f4a48265c5ea2754bb11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-18.08.3.ebuild b/kde-apps/krdc/krdc-18.08.3.ebuild
index a4556201d51b..614e59d19bda 100644
--- a/kde-apps/krdc/krdc-18.08.3.ebuild
+++ b/kde-apps/krdc/krdc-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Remote desktop connection (RDP and VNC) client"
 HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+rdp vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/krdc/krdc-18.04.3.ebuild b/kde-apps/krdc/krdc-18.12.0.ebuild
index 1775fbbad641..a4556201d51b 100644
--- a/kde-apps/krdc/krdc-18.04.3.ebuild
+++ b/kde-apps/krdc/krdc-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Remote desktop connection (RDP and VNC) client"
 HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+rdp vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 01b890ca8b68..d4d020c47a5a 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
-DIST kreversi-18.04.3.tar.xz 913708 BLAKE2B c489932a6edb2e7dca4b249109a830d57f54d32e264315410599300c5d7cf6b2b5dcc8519050fc2673934cceafb28455204cc96f3acd28aa5844701ae3c43714 SHA512 b5c104e23b1dc26d3e074b3b1f5863f8a937e5a4c6be3344defbbf5f43226b61a666a1cc7b967dfea36b44386a56e58f8953185477972698c37667d2c583bd21
 DIST kreversi-18.08.3.tar.xz 943584 BLAKE2B 751d0c77ce4bd8bdbf6b6d207fd1ecb4f4217b70b4508af896816eb1947bf000a53cb4a084bb19196da48f7b2c6014ecb4353f67051078a81e9c789b5eb6c9a6 SHA512 e239328b253b8835446638c78ce7931952da4acf162587aff24c69960e56b63890a1a9cbf9e92f1943174e065e962ad7d0d4c00ae3baf69fc109d16ddf7607b0
-EBUILD kreversi-18.04.3.ebuild 929 BLAKE2B be265893561a6148a0bbb33c1d2664af84aa002a40f6539a7dc07d3dbb6be2c889094d3ac76a2fc91bdf3fc5b7c54454c9d4f7eaf2e2ea824e8d3a373ad2d491 SHA512 0272785202f8ede0810cef15e8724aff7183e366e00c7cfa63387922d67a2e13a7bc43c3dde9eb638593b19cbea4b2f5978f44b4d16b3ad7db7dc7501594d7c7
-EBUILD kreversi-18.08.3.ebuild 928 BLAKE2B fb1820f2538450e18d2e46dbf8e25ff51ff6add3b21fab50cd5fa7504283b4c00f168423f2de5e4823a7be45afea5647781a8cd9172fb4f4b0014b0638290887 SHA512 45d19b391d545032329fe9001bebda5a3249ea341036fb8bcb35567a34ad23a40e0d8d59f7a7cbfe0b227b8df1be17d33a2fad0dc56a1e2997aed86ebe2c4f59
+DIST kreversi-18.12.0.tar.xz 943036 BLAKE2B 5a35cb25d4c016c95714d349915f5fc746a748f8b688ec1e9eb582355c464b2bd7bf69539edceec422df4d0903a592fd38585010081969e4b2a949ab86181944 SHA512 c1dc910e3da36b4db8d13f8ab7426e304844d6764e0edf52c775d84a6fcd9abc77f78058f8f1d5bb254b77de750cf3d75f54b68ff38854e47d8c73fdad8f1108
+EBUILD kreversi-18.08.3.ebuild 926 BLAKE2B dac973f1499858bf9cc718a5a89fcbc160fd8e0294430c888e697ba7dc69d5be99c30f55a16b83af2aef26705a7b62e69bd10025c6367b7f408c38e5d289bf71 SHA512 d3e3c697730a02520064accb19ea5c07393e3a857031c1ed0851b16709236cdbdb0ec0faa112ac7cf250b4395c225365c42b9a4879d83545a6fd6b19d21e7c66
+EBUILD kreversi-18.12.0.ebuild 928 BLAKE2B fb1820f2538450e18d2e46dbf8e25ff51ff6add3b21fab50cd5fa7504283b4c00f168423f2de5e4823a7be45afea5647781a8cd9172fb4f4b0014b0638290887 SHA512 45d19b391d545032329fe9001bebda5a3249ea341036fb8bcb35567a34ad23a40e0d8d59f7a7cbfe0b227b8df1be17d33a2fad0dc56a1e2997aed86ebe2c4f59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-18.08.3.ebuild b/kde-apps/kreversi/kreversi-18.08.3.ebuild
index 37472d2a6294..7dba309cf733 100644
--- a/kde-apps/kreversi/kreversi-18.08.3.ebuild
+++ b/kde-apps/kreversi/kreversi-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kreversi/
 	https://games.kde.org/game.php?game=kreversi
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kreversi/kreversi-18.04.3.ebuild b/kde-apps/kreversi/kreversi-18.12.0.ebuild
index 436086f29d35..37472d2a6294 100644
--- a/kde-apps/kreversi/kreversi-18.04.3.ebuild
+++ b/kde-apps/kreversi/kreversi-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kreversi/
 	https://games.kde.org/game.php?game=kreversi
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 7097e9635c2a..a7ae222a5a9c 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
-DIST krfb-18.04.3.tar.xz 996132 BLAKE2B 00b13411d52ca0f7b96dddfaf0b0563aa8a89a92c38d0136fc687f6d79bb63e819a610aedeb58ff5c652eacf57effdbe2c538d116474f71b9d2e26e3f2c49198 SHA512 25ddd2a9a71266961a1f55f0e2442e67e6c4ebb45205903981857b3d24f82b1ba5edd34e7386b56b301a7c925a4498cb85213c543d74d5fca522619dcc107e8f
 DIST krfb-18.08.3.tar.xz 994716 BLAKE2B 0977f9ec1e91f32836758e7fc388effa4a66d56ae4cae5286dec43fc1c143545599ebb190897ebc4ac9b5d136d50e33d6b0dbde655b126b3570fb76f3f58b96e SHA512 7e629b29065b1d2c84cf888bb4c1d65a4d532feac5daafebb9169e0ce92ebd67a1dd6bb99c4b8157a9b7bcd75466a09856ef1f1bcceb656a36685546d66da315
-EBUILD krfb-18.04.3.ebuild 967 BLAKE2B 31a7a97ddf448e04a6647a706fd05e9be0a3cf1abe6b1f95ae0d3560203318f2faec4f0b4d719b2dc995b03acb9de7f2ea9888a2fc5a85755a6331ae5778a9c1 SHA512 9b65eae19b6ba77d51add635b0b7d5f6d987b22a0200e46f1deecdb75059ed69339433c801be23f974a707c5c85526d5b066ac0e326570e632931ba8fec8a9f3
-EBUILD krfb-18.08.3.ebuild 966 BLAKE2B d52ec5424d6d794d704b29a31017d4923ae444063d81de392f8d669a43b8942be0846b83a1b993102ed445bff3f160b98e978f7f7f47551661efad81b7e14dc0 SHA512 723281d0c797ad397da720162a6474e5d2e86d3510b73f379b32f8903061dae09d54a4507d15dd10a2ae837933349cdf913dbeeb5f56803e54db06a5de63c41b
+DIST krfb-18.12.0.tar.xz 992260 BLAKE2B 081da3eef60fc7cf41bbd4f6677a63b8c58412a1954c36a9671bdc3bcc67906e4d2e4f24867cf1faa28c5d472d25b4daca3c222dcb04f6b4f8008f938b615547 SHA512 76e5f148f6dd07783eb0a54f39a45aaa552faffd4ab90be06b11e51042a34334300550135c72462fe1b5a5403d14d51ed1c9eaae87e21b0ebd7a1fbf2956f4d0
+EBUILD krfb-18.08.3.ebuild 964 BLAKE2B 94b1f5df4ad6bbaaddf35801f375667e371818fe8143d0d628a2a8ee9c1d1c5b7e985f8ca4133163046666371febf8cc479d63c23a864f55e8716d741a25a09d SHA512 ebcf583627862242a41dd91364d972f2b84080b40e942bf3461dc8811e7cf68db5e586e977665fcf6731f3b6f0c7acc448ab57eca36585ea6321bc251eb4df0e
+EBUILD krfb-18.12.0.ebuild 966 BLAKE2B d52ec5424d6d794d704b29a31017d4923ae444063d81de392f8d669a43b8942be0846b83a1b993102ed445bff3f160b98e978f7f7f47551661efad81b7e14dc0 SHA512 723281d0c797ad397da720162a6474e5d2e86d3510b73f379b32f8903061dae09d54a4507d15dd10a2ae837933349cdf913dbeeb5f56803e54db06a5de63c41b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-18.08.3.ebuild b/kde-apps/krfb/krfb-18.08.3.ebuild
index 3c2f257cad90..cbb144da1abe 100644
--- a/kde-apps/krfb/krfb-18.08.3.ebuild
+++ b/kde-apps/krfb/krfb-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krfb/krfb-18.04.3.ebuild b/kde-apps/krfb/krfb-18.12.0.ebuild
index 462cbfbd15e1..3c2f257cad90 100644
--- a/kde-apps/krfb/krfb-18.04.3.ebuild
+++ b/kde-apps/krfb/krfb-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index f3d71eb93a5d..aa08248ab3b5 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
-DIST kross-interpreters-18.04.3.tar.xz 144832 BLAKE2B e1d32ae2dec8c4ada9c69576cd0feaca79c641c8d50e6772a966c4e766fac1054ac226a6fa3cdd4fa30aa11a0f2b04dba424ed2e4617eead3e49f9e2f11b7104 SHA512 d5ff06870ef0fc7906dfde9e413ceb0321dfe40296ad08f0a7f74ef63b368b91179bb140d12c650e0bbceed0601c5d141d76497eb87c95ac4f1f523b523d1a4d
 DIST kross-interpreters-18.08.3.tar.xz 144820 BLAKE2B 4be475441b0ea9024848460b730a4f026fee8712f767d0bd3f4b98543b39bec09c134f3758de316a75186cf70b3819088fa61bcdc3a1517497fea95d48f7ed61 SHA512 8ad0c10d6a9552bb6306f3aca9af729a80c8682c0416b90e1610a67036a80b84ce85313fcd693023115e5bdb56ea28d63b79704bed4c26d90dcc146f059ce645
-EBUILD kross-interpreters-18.04.3.ebuild 852 BLAKE2B a41c05e9e3a4463898168dcf2256903b44cb4710bbe7eef54e38720bd598176158c3e528ed0c11cca9e170f0a55c551103bbcf57f1aceaccf4f334f21b49a403 SHA512 4aa4a2f5a807e6b33317d6033cdaa525702d98341f78962bbbe1487d0557214ba8fb6e919cc78950d08ca11e2677b7b6b11ce153e46a939ae19e730e1c56dd48
-EBUILD kross-interpreters-18.08.3.ebuild 741 BLAKE2B 0b219b4bfd76c133fe7468ddd7e11fc1baff9f8c8b39b3c1f4443bcc5e76d12fd66ae1e39d591a1a9205c71e873eac88976d09e083a14c697af9851e1fbdfc80 SHA512 c09efe698f177ee4dbd90687685beed753e07513d6faea1a54cae4f15fb66374a9f77cc74e54864a0368d4e50d0b66b946a19cc9bd4b1fe7db81e8be712e9742
+DIST kross-interpreters-18.12.0.tar.xz 144800 BLAKE2B 5d09e05ed13454c4635e2c2ea49e1a77f530eec535ecb19c68d2aabc3f7c175ae077d2c301f54f2b5d91a1c9aa05b39e0f5891c6e72d3f0597b96817c89d15a4 SHA512 4fdb46d2386c1f0d5a6e646b71700a28993e4ec6be29edc3fe42838234441ed23c4e3daa2b038631b91f931816031ce0c86a50890c2e3d0b84a59d4a6c7636e1
+EBUILD kross-interpreters-18.08.3-r1.ebuild 739 BLAKE2B e8b0d50e4367fc5c343862f87474d6d86ee6c932532fa24e8df3a45066de9e0b98566425e3b658f7b0dc5138ed0eaaecf6dadba400ad56d38ea120028ad70785 SHA512 e4e49021524115d083db8b7e346f99f98859778fe4d5b743309e6bea0a773bef0c8533a0596b176f9023aa676e66e6c28aab7213f9f0039441473000eeb44857
+EBUILD kross-interpreters-18.12.0.ebuild 741 BLAKE2B 33e911267e1a792285197fdf666bbad870928666927903a385ecae523044b2a573d572541fd893405ef9b677dea8fe7382f8d653343ffd9a843a312cf1603356 SHA512 21d6f9598da88ca657e6bc283d83c54a3d2e249c02578ad68243bc52ffe27258c76ff95e36af7e84bdfbcd674a922c097f18e8182b6db8f304078661b2f2a243
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.04.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.08.3-r1.ebuild
index 6ed78bde1b69..38f4ee94df97 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-18.04.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.08.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 inherit kde5 python-single-r1 ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
@@ -27,11 +27,6 @@ pkg_setup() {
 	kde5_pkg_setup
 }
 
-src_prepare() {
-	sed -i -e "/find_package(PythonLibs/s/REQUIRED//" CMakeLists.txt || die
-	kde5_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_python=$(usex python)
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.08.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.12.0.ebuild
index 4b045bc686e7..7e529ce23054 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-18.08.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23"
+USE_RUBY="ruby25"
 inherit kde5 python-single-r1 ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 86e27dfc5619..7680c8108040 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
-DIST kruler-18.04.3.tar.xz 296084 BLAKE2B 20281feecca79c90970b1452883a3603467fc6cfe3a69203194cf145e94a4adfd1523953d6b71a1122dbbdbe96b42b5a0c1a63c90bcbdcae31021a3b7b466b70 SHA512 0d1ff9656530e4496e18b4382bd73c5750b4b2ecfd677140a57c3e159687e56254790198f406898c140654f01288580fbe48d84531d24c53b629a7d2a87557c0
 DIST kruler-18.08.3.tar.xz 295980 BLAKE2B ea8045968085e42f18486b18ba9c1c4f455812231879785200626ff92dc137d707ab2113617f2e5e3e914f1f4eb281cea5cda812aee193d2ee645198abfeafac SHA512 44be1edab33549e7e00a87c16e2abbdc6cf8aab7ce7b265605b82b74c678d3453b0c694a35af00258446c713e4f6e5e9c0472b02c79a058fd5376217761cdcfd
-EBUILD kruler-18.04.3.ebuild 844 BLAKE2B 2dca8d115cb3241c82e077a2ba890874fd5ea94a09f8a47c99f5b4ae2dd195e5f9770e90a4ffc7e8704423b84358f87c64d00da40bba4a844c188f9fe206ff59 SHA512 6bc2032c25a9c2c903aa305544488269822b689acf312585ead9017318494c0c8bff8ebd87e9298bf5eff5ea9567a5778fd839bb6c89ed6dc19ed2aae429de39
-EBUILD kruler-18.08.3.ebuild 843 BLAKE2B 562363358514fcf75cbe8773410a79de165329646c6bebaea5995ebba16b8d55f28f0ca2f9b76397e2c558996e691f1e314bb64d25c21348b43e6e46f54e1b9c SHA512 2a226a8c2b4d42f99bea0c370481cc8353f1b09df4c64a62ffb880147e8d97d41d08318beabbd6d1c05cc544428ee59f90086d55e3fe1d19635b490978865e1c
+DIST kruler-18.12.0.tar.xz 295872 BLAKE2B 79e22dc4b01d293dbb7262ee64ec94d7cb17169f13aaf612fa9c14977c74acd7678f13d8d2b7af0e4e34a572c9905708eb8a67b2ccfef7275e502fdf6f029d71 SHA512 119b7d8c823ec86bf12971186a1c472d133e90e76638fb03d0009348f9f461a70c4389b86fd827991d07dc29e1413b804a51e5b491724821decf948528866e94
+EBUILD kruler-18.08.3.ebuild 841 BLAKE2B bc65bdd49333b3695ae378227ed869e8d8f09372eb5d7c5c23938180876048294a751d4c5a3c6ca1ece35de2e1afd95bf7e718d2c00ff0715840328a94a563e6 SHA512 cfcc79c548358aeaa36fbcf4bc7da822b5b695f2d685cdfa7133428331aa9bcd4158cd72010a4f52d4d7aa0323c07a86cc0b5a020be7ce952a2610576e81236d
+EBUILD kruler-18.12.0.ebuild 843 BLAKE2B 562363358514fcf75cbe8773410a79de165329646c6bebaea5995ebba16b8d55f28f0ca2f9b76397e2c558996e691f1e314bb64d25c21348b43e6e46f54e1b9c SHA512 2a226a8c2b4d42f99bea0c370481cc8353f1b09df4c64a62ffb880147e8d97d41d08318beabbd6d1c05cc544428ee59f90086d55e3fe1d19635b490978865e1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-18.08.3.ebuild b/kde-apps/kruler/kruler-18.08.3.ebuild
index 41726831f97e..ede41add43be 100644
--- a/kde-apps/kruler/kruler-18.08.3.ebuild
+++ b/kde-apps/kruler/kruler-18.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Screen ruler for Plasma"
 HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kruler/kruler-18.04.3.ebuild b/kde-apps/kruler/kruler-18.12.0.ebuild
index 9d45e63ab264..41726831f97e 100644
--- a/kde-apps/kruler/kruler-18.04.3.ebuild
+++ b/kde-apps/kruler/kruler-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Screen ruler for Plasma"
 HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 473f7baf42e0..cf59ed4e58b7 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
-DIST kshisen-18.04.3.tar.xz 710776 BLAKE2B e9fc3a3ed41d68c85f1f4b0b0eb1f94521d6aff12158589ff1146642f854d4cf6b64f3944f443bf98843528639e3763a237b1e0da78511d412c6a91b9baf66b6 SHA512 87d7e86ac41fe179735afd20ca5186c659a8eeefa8b4973553f295ee712649a7bf05fa25b051583c4904d2b875816cb0175206b48febc48520f4ec548149081f
 DIST kshisen-18.08.3.tar.xz 821192 BLAKE2B 22d548aadb1dc902f0f27443522f8c88402486c36e35abde03e0d69c18f4dedc814c307799c7d66a6023dedff8da75cd94be353c2ffee4f08e30068a262297f3 SHA512 c38205319f142a9cc7b70042ea142fdc0904fe0af8c56056d87269599507b69970f1f45f9f023b02767baa693104bf946314847fb949358f3783f08b0de07581
-EBUILD kshisen-18.04.3.ebuild 778 BLAKE2B 287c583e113f4b8dd114318ab6d66bf34171193851d65c02c9cc92a8ea5940823b90fa543ab15deb6030e987e371b9cf26ef6199896ef4d5c68e1b178dbe2824 SHA512 ddcdf43eebd4d156e7df00bbf8eeee016d7c16f72f84d3813996aae88b63e938d94f23f88594dd0d20e6139e06be3c880004d7fde01a1889946c36725aa99c60
-EBUILD kshisen-18.08.3.ebuild 777 BLAKE2B 59e8162a41b7d67eb7e5e0cbbd2054faa8d6c64d47169b92fd72652af4489bafda7a8860706435946808adc77f76c0d9711fcd5cc5003f1459c18df128d63cf7 SHA512 4e8e7592673ea11d0f6f11ebf26b20cfe1f8e7ba291720fb2fa6cf6845238ea485e519c425874ede48ef838a2d1c43bc5bb19214e5f933d901acf362f2b05e6d
+DIST kshisen-18.12.0.tar.xz 820884 BLAKE2B 1a3c0bf2ea6aa3ac8064f5eca8f8405f82fce1027cd47e8f57cf0442768fa44beea6483fd9bb4e33ea5ff2f70b5284b65454bbce922bfea27aa40b4cda6c036f SHA512 e3ac23ebd287215de317b3d254cf267b67a006fbb46022b6e29d7cdbd64be5c87e73e407b5987f6652eb2e5779b306a1f62f7bc913497fa5394de35b1f6b801a
+EBUILD kshisen-18.08.3.ebuild 775 BLAKE2B 7cb955009f7e24f80381ce897f1520709e2ed65e09ac807abbd1193ff964c63233bb22b7fe9198f961c636126782eb4d352c81cab9ba6994cd0462f037155678 SHA512 7da46cf3a8a7d184c739971c76b25952e7439175426afb85fa03e860dd561f393add88ce51585704828c3241ca6caffeceffdc09be650eebf6c07becde2f2f50
+EBUILD kshisen-18.12.0.ebuild 777 BLAKE2B 59e8162a41b7d67eb7e5e0cbbd2054faa8d6c64d47169b92fd72652af4489bafda7a8860706435946808adc77f76c0d9711fcd5cc5003f1459c18df128d63cf7 SHA512 4e8e7592673ea11d0f6f11ebf26b20cfe1f8e7ba291720fb2fa6cf6845238ea485e519c425874ede48ef838a2d1c43bc5bb19214e5f933d901acf362f2b05e6d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-18.08.3.ebuild b/kde-apps/kshisen/kshisen-18.08.3.ebuild
index 4f186338f786..ef648aa0a510 100644
--- a/kde-apps/kshisen/kshisen-18.08.3.ebuild
+++ b/kde-apps/kshisen/kshisen-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kshisen/
 	https://games.kde.org/game.php?game=kshisen
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-18.04.3.ebuild b/kde-apps/kshisen/kshisen-18.12.0.ebuild
index 03898b82af9d..4f186338f786 100644
--- a/kde-apps/kshisen/kshisen-18.04.3.ebuild
+++ b/kde-apps/kshisen/kshisen-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kshisen/
 	https://games.kde.org/game.php?game=kshisen
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 06e9897ec231..be799ba3f1c5 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
-DIST ksirk-18.04.3.tar.xz 6985888 BLAKE2B 965337f838aed03844fa43fb0b3740fb84f65615d9646757124516974a32248ea77861428dcecba8090c09f16ada6d58e7f401e504e03477d650698da675d268 SHA512 568b5d1abc51ee9b46fc35dfdac0a1e0bdf7e64f4640da751459bf81bb5f2ffabe5efb62462dee36630ef6b6e967bd2f1be822b2af739ba2bfa87b7d6d6013cd
 DIST ksirk-18.08.3.tar.xz 6987428 BLAKE2B 5c839b86f86b4298b90e4aee1d3267ef9beca67cf3a2fd48aef32e45696df102a53517523f92ee12302834bcddfb6958e2d9bdb89d607a185ea200ea75060f89 SHA512 59bf76dfe9bf39c485e178a5d95b8b6daaccbdf411aa7447aa55b4ffc146ad7b4bfb3f9b56209ce093baae09a212ca9c6fd5a7cf5dd799fba561be3847c50d20
-EBUILD ksirk-18.04.3.ebuild 992 BLAKE2B c23517b1e85f4b12db1417bbd326834aaf1af327883e98a61d3eec720f1e1a18aeb43f5c2aa94a33b14cfaf266996c2e0ee2cce99c428e04cde9b1aaed2f9b44 SHA512 9a40f9bf1d56099ba864c113e828dad9d5543381016970c51a1cd66456cb25b37d02aeba727d524aba1a0e887b2538e51e4f0e4a4b64f1353edd0b956671e1c8
-EBUILD ksirk-18.08.3.ebuild 991 BLAKE2B f488d60906403a681d3ef48e2ab1c1d9d14561817bd2202cb32e15733bff9b2fa8fe052482115b2f6a658e3beab5c3fe6292810407c143557a31314ebebce586 SHA512 93d505d61b8ac6f562b9d0da1e5108df5b74d260ee21e6982705e130f9d1b7d1a6266ec88edf09e34118cc40c96341334167ec3a2423276907a680e1fb83e7a1
+DIST ksirk-18.12.0.tar.xz 6988160 BLAKE2B 48b7674703264efedea878d9d589ea5f6acb64ce39a186f81f44ff6d495dff47b0d239392fe706417569e0a3221633a3f516eb42232b4d6c46265a621cbca7bd SHA512 698ce0b5a688fdb1beecb86ef618b6b0a3992a5c8f4bbbce49fb62c8cf10e82b6b833c076ce86aeba8cd429addefd0504d83050ed66b47fbcb5696e5740a8a0a
+EBUILD ksirk-18.08.3.ebuild 989 BLAKE2B e9f7c6c507eb357c1366182536acc41d3e3af499b3079e1a7cf2f9e8c748ded72ac49fd6088cb7d36551cf57c362097ea50e340b27fff060f6bbcb5dc3f17103 SHA512 d1fcad9ef71c7a449277530da75cf23f42d401276b49c9e3401f442571a88e9f33cc1b1f135d626695c613f3b2a94e2d5b8b093fbf2288cfef30eb438e952663
+EBUILD ksirk-18.12.0.ebuild 991 BLAKE2B f488d60906403a681d3ef48e2ab1c1d9d14561817bd2202cb32e15733bff9b2fa8fe052482115b2f6a658e3beab5c3fe6292810407c143557a31314ebebce586 SHA512 93d505d61b8ac6f562b9d0da1e5108df5b74d260ee21e6982705e130f9d1b7d1a6266ec88edf09e34118cc40c96341334167ec3a2423276907a680e1fb83e7a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-18.08.3.ebuild b/kde-apps/ksirk/ksirk-18.08.3.ebuild
index 81150eed5337..52b799c4d544 100644
--- a/kde-apps/ksirk/ksirk-18.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksirk/
 	https://games.kde.org/game.php?game=ksirk
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/ksirk-18.04.3.ebuild b/kde-apps/ksirk/ksirk-18.12.0.ebuild
index 0e3b32157b31..81150eed5337 100644
--- a/kde-apps/ksirk/ksirk-18.04.3.ebuild
+++ b/kde-apps/ksirk/ksirk-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksirk/
 	https://games.kde.org/game.php?game=ksirk
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 9697e69beb67..f31e8da9f271 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
-DIST ksmtp-18.04.3.tar.xz 38044 BLAKE2B fb35f06e63e05c82e958b0113356ef80cefdb2af19dda511ac4d8a5803dba12d31655080fb3f4ccfb357dd81ec5c88e3a486978c13e9bca705222361d737ea8f SHA512 b4149d8e6805e75f6de1e3e491859ae43aa596fd6ff59909f99d7deeefebe051ad34e1300f9879ea552f78d789e58e70f31f71e83f1aedb2e352ada4be302831
 DIST ksmtp-18.08.3.tar.xz 38996 BLAKE2B 341e5f8c247494ad868a41754e4a8cabed363eee43d2abfd4d372303e3885583de0758d82dea7c663af60fa3e331bbf2e99224838c48e100771042208a9f9a33 SHA512 80553111da6bc6ca070a68c6de62b3fe28f5938889c78dd227b546c62f0eb712222fa6a49747e627c386ff6bb229b6cb561af0ced804490ea45b028e1107581f
-EBUILD ksmtp-18.04.3.ebuild 491 BLAKE2B 0d8c11d06da656a119826b39db7a9134334fb0efad3e7c731e4b9b4d435460b2dda02f8340e5864b89c236bf9e669aab0f401f5fdf4e32daeecf425d8605cfcb SHA512 88050509a6d5ab2286bcf680d77be6f781c9eb9936813b5c839bf887b8459d923fe17983504bd461cda3bc251cd8b0608a3c20bfcf50ad5d8511718f4ecdb7f0
-EBUILD ksmtp-18.08.3.ebuild 464 BLAKE2B 51f2d974c5a5e25bbb7fe37e8bf1bd589c312eb08f5d50945bd7ff59622d0a2e75837f0a03134e4d2c5c5e8f5abda57788cd6c6cb4676d910f2a891d5613d70e SHA512 1aceb2f8eee3d5d7b6991c633066d37f5d965474e643e3e82d1bbda38b471851794925849a3eba275bf234d0dd2222daa0be159316ee344b278ed39a7344b5c8
+DIST ksmtp-18.12.0.tar.xz 40112 BLAKE2B 33f79bd9c765e77e1852f0d2afecda17f817b7dee224e826bb6c06714b6b1e12220358341c2c92aa525eee6b7f94b1c272f2dcc8a56ff5cf4c74274ce713fbc2 SHA512 3c5fcf2914f3de909f3f19959b362418046c7903bf8d6a208e761bf6cfab90f538b041624020c4881426ce5a8031a4759d8f40e66e58ddbe3743639ad7ea3c12
+EBUILD ksmtp-18.08.3.ebuild 462 BLAKE2B 961031af57e66ca075fae710404d41d21dfb80aecd3cd87cccf2fbfd60972f4a96a90d49e60a23c9ab40c236c8fed022567f114ac3e8deb51b6215194d7863a1 SHA512 6770e7dfd2f5f5ac3941979385101d433dbda1c8b74ebae5fbd036391447c730cb7d6c4bc730c6ac457de1f61612ea3f8cc132b3d0061d685ed2d4f1778d0036
+EBUILD ksmtp-18.12.0.ebuild 464 BLAKE2B 51f2d974c5a5e25bbb7fe37e8bf1bd589c312eb08f5d50945bd7ff59622d0a2e75837f0a03134e4d2c5c5e8f5abda57788cd6c6cb4676d910f2a891d5613d70e SHA512 1aceb2f8eee3d5d7b6991c633066d37f5d965474e643e3e82d1bbda38b471851794925849a3eba275bf234d0dd2222daa0be159316ee344b278ed39a7344b5c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-18.08.3.ebuild b/kde-apps/ksmtp/ksmtp-18.08.3.ebuild
index 33ebc23a9dfb..88298a5c7ea8 100644
--- a/kde-apps/ksmtp/ksmtp-18.08.3.ebuild
+++ b/kde-apps/ksmtp/ksmtp-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Job-based library to send email through an SMTP server"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/ksmtp-18.04.3.ebuild b/kde-apps/ksmtp/ksmtp-18.12.0.ebuild
index 19ff10a3d840..33ebc23a9dfb 100644
--- a/kde-apps/ksmtp/ksmtp-18.04.3.ebuild
+++ b/kde-apps/ksmtp/ksmtp-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,14 +8,13 @@ inherit kde5
 
 DESCRIPTION="Job-based library to send email through an SMTP server"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
+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
 "
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 536aba9bc957..1056a92601b4 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
-DIST ksnakeduel-18.04.3.tar.xz 605444 BLAKE2B 4977fc37e1bb324ffb26c6d78cf537dad14c653b77b23b8ba7caffd613bd1db84392b7fbf648456dde25321b13533b42b925bc940c0c42efc9d9f890e025fe66 SHA512 04ccbba57d99aecbba962d45456f59b35195991653491550115e1f4d9909ca67ad55e2c5d603475334e795d8ee449fd5deb3f3aa60b319602d159af475b5a465
 DIST ksnakeduel-18.08.3.tar.xz 605480 BLAKE2B a337c7f7333609c3efff6f80ebe59ae5a107fdac82f93f2962925c94b972b8c19f9ec4a24004f506913b77b2cdbe676622b25c41c37dd2ab798c2feb8468451b SHA512 1948c62da1e348d1cc093a0577af38db8352a25d12608eb1fe20a8a93d93f8b5f9d78b1e8c529a6d269940104c392047291f387426161a34d417eb482243e63f
-EBUILD ksnakeduel-18.04.3.ebuild 799 BLAKE2B 49dec31ff6c24dcfcfc3810913d57aca0ffe7b897c65c78336ea245e0bd979dfe8650a0cd6a3f156e9be5f4a209b09d1e28a1bcca7d932f5e35b1ce139de1f39 SHA512 1dbfac43ba40f312124b25bb6b3170f5e85ce5ed7da0b083ecaa023558fc434f40e74fdb7e23290df763178a52c3f15e442b20740a3bb4ba0b194fc40c1c73b3
-EBUILD ksnakeduel-18.08.3.ebuild 798 BLAKE2B 873e58c9ca92bb30b4237f625cec4e983f095ffa9acfd4bb3cd58d0784ca17354ba04998e8d7bbba04e6ad8f9ebf25c0c3d116a8d453c60fd4df3c47404337fe SHA512 8e2ac131d94d6d3cbb6317590ea44d3c44eeabc7c768f3bbdaadf77c0ac0015ee9816f8c3ebce83925915a10dcd70775c691ddbfcdbd9a40b6f1fc899e9091a8
+DIST ksnakeduel-18.12.0.tar.xz 604952 BLAKE2B 6b59f35bdd752476a42f035b9535ee9210c5b8a64917a30a3509aeaea8dd9028c91318827dbdc09ec7ac30d04655781bc6974a9e1d322a34b5a4f5b0aa7ac221 SHA512 ea9b251d2cfd5f51becd5f4bd8d86e46d54b23d51487c117ec5849b9700df30ad36a3497679c7f2ada2a73ab827ff6ba9bb5e4c53f4ab38b9533fe88c5959539
+EBUILD ksnakeduel-18.08.3.ebuild 796 BLAKE2B 038854f6317432c58e616faa756f621b5079a022e3b7d75357140553f965538ebb7ae9f3518716984978d38b473fdecc01549e35eb059a6c025a0cf810641a08 SHA512 5ef04da334e1db752f7637f5b3ed3fe34f4cde54ea15516f8af3edaa18f21814943c6dd751ffc49e00dd9a64c3a8b35dbd15e3cb461f90fd2186280f0cc1e181
+EBUILD ksnakeduel-18.12.0.ebuild 798 BLAKE2B 873e58c9ca92bb30b4237f625cec4e983f095ffa9acfd4bb3cd58d0784ca17354ba04998e8d7bbba04e6ad8f9ebf25c0c3d116a8d453c60fd4df3c47404337fe SHA512 8e2ac131d94d6d3cbb6317590ea44d3c44eeabc7c768f3bbdaadf77c0ac0015ee9816f8c3ebce83925915a10dcd70775c691ddbfcdbd9a40b6f1fc899e9091a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.08.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.08.3.ebuild
index d7d13364f717..7db5c14c156f 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-18.08.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Tron game"
 HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.04.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.12.0.ebuild
index 24f56ca12baa..d7d13364f717 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-18.04.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Tron game"
 HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 0151627e3764..b59162d81f25 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
-DIST kspaceduel-18.04.3.tar.xz 611180 BLAKE2B b09aedb33f5d5fd56302459e31bc9d6c44e9c50e846665f0209e08eedfa37e80e653293d8235222d591b5c6c7aebd938d9f2c4902c4a87b466ea039616f3eb63 SHA512 aabed6df0c78ff7cecc2f2d3c8cf7803a4bb2c51cbc9482a964ec537808b016bb4d517d8af628d58a6bad60dac56312ff49c19b5bf1c8149486651c56174ab5f
 DIST kspaceduel-18.08.3.tar.xz 611248 BLAKE2B 171188b38528f98502b4d53a28b929c75594390c9c3d37b0b2c79b06648beec5f49ef94eb2955cdfe016cbb69a2171e8fa56dc5052d5183b86cc1fcd9d7dad21 SHA512 b69c6deef012f9dd7a4a174920c9791839b1dc6aa3d70b903493018d6169871f32b7fce1ac5ab54c3f45c23f3ffb69737d108c69242522b101d7c98d90136d80
-EBUILD kspaceduel-18.04.3.ebuild 752 BLAKE2B c4b0dab1f8fe500bd162eda61631e9b155962a7a6c31f292e39c5b21434a86d0bdbc58afb31b94fd06c6f229863bdf16b32f5100fea08fd5db7152d6fbb1ac0c SHA512 4d7187ab554af0e9e8a8bc7b8a9ff64f3f120c10bcdda8f39c6674aa47b07fa48be65357f73e397f218ab93ad8334461eb06bafc3c017dbb6765425b8d9b326a
-EBUILD kspaceduel-18.08.3.ebuild 751 BLAKE2B b2b0b8f7698f1ec0a2ea607bb1dcd6c7187b2d431452d8b6d4ac2640dfc50d50188b39d9b81c75d371199f756c5babba3849e33e3cfeeb52cc5bd7a268c54f52 SHA512 9fa65bea8f6c8a737b401bdc42e9df94363849514659e05e2c6a0f68309bd9df6a551e063dbad5e1e647d86f135cb5d57451e1d9fd2bb36bbb801bdae90ef947
+DIST kspaceduel-18.12.0.tar.xz 610444 BLAKE2B 8edb9d3f7d67d62c269f2dcb06d624c4dcd51089c351d42b65961787d6214a8a7cdad32975f18063e4a0de2ab32f0fe33e8c124f0ae314288c34a41af045d9f9 SHA512 80ad3e7cadf5057b2fd1b4d88b3167695d9dd8889463956ed6b9f46f78675927d78c4d6064c2b3fd274b42b214dd3c5e9e4f6078250ba415bed3096c7835bbcf
+EBUILD kspaceduel-18.08.3.ebuild 749 BLAKE2B c99d214cd66b1bce9894aed25817891e1141d377bfd31b412595052ae2c8caea7c63449b4ee071e92a4f4f573e866a529fcd3283db358b7c80f7734d25a4855a SHA512 66ae19747122260fe7ada5f7cf977dd96aea29fdf3552a20f27f57e075656599575c4b31fa14fb76bd69b8f015f2a24c044adae5f1964017ecc3469a2b80bae4
+EBUILD kspaceduel-18.12.0.ebuild 751 BLAKE2B b2b0b8f7698f1ec0a2ea607bb1dcd6c7187b2d431452d8b6d4ac2640dfc50d50188b39d9b81c75d371199f756c5babba3849e33e3cfeeb52cc5bd7a268c54f52 SHA512 9fa65bea8f6c8a737b401bdc42e9df94363849514659e05e2c6a0f68309bd9df6a551e063dbad5e1e647d86f135cb5d57451e1d9fd2bb36bbb801bdae90ef947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-18.08.3.ebuild b/kde-apps/kspaceduel/kspaceduel-18.08.3.ebuild
index c76df004541d..5620fee15d0c 100644
--- a/kde-apps/kspaceduel/kspaceduel-18.08.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kspaceduel/
 	https://games.kde.org/game.php?game=kspaceduel
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-18.04.3.ebuild b/kde-apps/kspaceduel/kspaceduel-18.12.0.ebuild
index 1d3abe18a497..c76df004541d 100644
--- a/kde-apps/kspaceduel/kspaceduel-18.04.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kspaceduel/
 	https://games.kde.org/game.php?game=kspaceduel
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index c78e5f7f5002..efcaa14d6be1 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
-DIST ksquares-18.04.3.tar.xz 216800 BLAKE2B 97d0f6c594bff6046a8faa9369c58466a92ee529f38c39a9732d0af6620b912c31e4b59d2a3c9f726e9dbe03876324dd1f3193692f550759bcf7614bdca545b1 SHA512 58b28c87321ad2380b95d58ca5969f5def22642bf3d073a4774acd036cc9d50489594feb0492d9e53c33744c0c7ffd3fc1243e475e00ac9ec6f96b9bf2c9f646
 DIST ksquares-18.08.3.tar.xz 258964 BLAKE2B 53bfc39bbd8bd4aafd1f3139ce65e09c15e7968653247e344897aaa25b4577c89b6f848fe191859a50572a46519dda52da52873ff775404083f5b0d29d051437 SHA512 0252c5d00a661e29ab82af18d624aee3486a28ff4a58bfe0a4460603430dac6342c9f41231a971e8184c88c2e5b76c54cb5c4fe11d9493eb8026bce02201ee1d
-EBUILD ksquares-18.04.3.ebuild 753 BLAKE2B 527ea5200d86e94fe946f3ee106694729f0d7517807907d7a5acd3b4403b3b8e36245ac2327b29be254ccd664dfe277c31c2fd9031cea2d65172036ee3dd30e8 SHA512 37bafc3b3251cc6bb4651e13bf4db0c9de0a1fd8fe0f019c33e592e318eb4b8a7f6bb6b1e88f47f839d9c49044b22c5e6b67728287dc3b0aebf9579aa8c69514
-EBUILD ksquares-18.08.3.ebuild 752 BLAKE2B 2281dae8912cbc637f330d8acc4953437b96b0bbf53aa6fa867a0f2b56b44bc09dc8ff0d7f9b3bafdd8bf3c8086e6a5aed5129a218fa1302dbcac213c25e27ae SHA512 90509f13a4a869f9b9c8dfdc9f7cdf4c35d6e15c5afdb72bae143fd382704ed31058a22a92b1f5c5e529a9b42514c201fbd3449c242901db1dd807d3125d5e17
+DIST ksquares-18.12.0.tar.xz 259220 BLAKE2B b9fb1cb9a7d226c148630ac2066ba7f23f8170ade918b1ac762c2ad83bdb0bcdef54198df21ea1e67ef688195e12482fd2fd5375cc91251c40b92bc5771f6ed0 SHA512 2aa8b437ca89483fc3ee41fa88d79911a77f33792ccf384a421a3a037c0b7d8d2446d4c1cf38d3a188d68b4eb263ca68f93a848fb93421d8d137a1c70a4b16b8
+EBUILD ksquares-18.08.3.ebuild 750 BLAKE2B b030f205357f597c9a10e161c5e38f36d43f243361c387f1eb9cd3884166a2bdaee780583c8da8b89c112141daa83c6503fe9e6d575373be50d80c238353623b SHA512 048f2e49f709cbb6f29cd187c3d38fb4e5345e32ebe5fd320ffe934ede8f4f00e84cf2e97cc25548ce6d2a830a392047308eefeec8d7986c3f4fd070a39e1909
+EBUILD ksquares-18.12.0.ebuild 752 BLAKE2B 2281dae8912cbc637f330d8acc4953437b96b0bbf53aa6fa867a0f2b56b44bc09dc8ff0d7f9b3bafdd8bf3c8086e6a5aed5129a218fa1302dbcac213c25e27ae SHA512 90509f13a4a869f9b9c8dfdc9f7cdf4c35d6e15c5afdb72bae143fd382704ed31058a22a92b1f5c5e529a9b42514c201fbd3449c242901db1dd807d3125d5e17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-18.08.3.ebuild b/kde-apps/ksquares/ksquares-18.08.3.ebuild
index d3cda5cf1bb6..cc9c77c39e13 100644
--- a/kde-apps/ksquares/ksquares-18.08.3.ebuild
+++ b/kde-apps/ksquares/ksquares-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksquares/
 	https://games.kde.org/game.php?game=ksquares
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/ksquares-18.04.3.ebuild b/kde-apps/ksquares/ksquares-18.12.0.ebuild
index 8c8b16b046a2..d3cda5cf1bb6 100644
--- a/kde-apps/ksquares/ksquares-18.04.3.ebuild
+++ b/kde-apps/ksquares/ksquares-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksquares/
 	https://games.kde.org/game.php?game=ksquares
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index d483faa0670a..40f8b68595d1 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
-DIST ksudoku-18.04.3.tar.xz 1639068 BLAKE2B 2627851afe3c1ad271f5c835c198cc449a5ec13f532043e9e0b9ee0f7ef3681506783e5ad85bd943730e7990c691f71ee3dcee8fa0d413cfb209031f276ea4bc SHA512 b205523e365c87badaa9c0b47f3228df2c678e89346329215c2a11cc652f92399d0a31edb09db992164e20addf44ba18c31b989b1d5b66b090138c656d4b32c4
 DIST ksudoku-18.08.3.tar.xz 1646020 BLAKE2B 01b53d387832e6a2620d0abceb04fb88d2ea04568e69f998ba0f9b5983aeea255c7da98616f504022e582266d82161962d7184355315a59a83a2b54fd77f072d SHA512 7c57f178a834027d23ed24f0f2b2c76956e204211539845ce275b0eb021a5d2c8dc99e977cdc8f8f26db01f6363875efb6102a8829e880225a917aa016e6e40f
-EBUILD ksudoku-18.04.3.ebuild 1134 BLAKE2B a3974c852ae75b254b7b6788daad23ddd899df4d163be21c6f4209b779eeba49a7d7fac7274ea323a814231179b6cfb09d016448fd9e0cd787cb9d3c07e59c50 SHA512 bfdd9f816c958358db157ee94f1f22c9bb77d2eb404e505ff2da78481472111fdc255d9b04092d761da064cc479994c024e3fb323e748beb5284f7a25309ccdb
-EBUILD ksudoku-18.08.3.ebuild 1133 BLAKE2B b7a44ff98cd1020f695f16988d794e4e9db8c8273f52ad493f8ac15e5b59398f85f476db2a9f5612c70f7ba738b81ec18dd6718cdf213b01872697faa8eaee94 SHA512 2342c2a07212cea55b56f5813f92d97d8b6fbaa1df0921f666f881fa8fa131a88d3de0a7233fcc462a1fda9123e76fd4d0ffa9efd3b46af2cf895cb86b56773b
+DIST ksudoku-18.12.0.tar.xz 1645928 BLAKE2B fa851966cd346e5908e1b2b74a703b32451284fac3f941c19e51d4da48442760944bc0115082d536a5cd1f0eb3df646e4c4367fca38d0f0a1d156ad1dcfeb407 SHA512 ce3b6614d5a14f0163c1d3d2130fc8e21048fb8dd8506d359b808a1f3531d6909ca45b23f77c5c9cfd67407d0711706153ffbe92f7b036135fc0a35f186b8ba9
+EBUILD ksudoku-18.08.3.ebuild 1131 BLAKE2B ea652220e396bf3a185ecf38aa7efbd7c6eaed87e010fc128ea75b88964d198499eeccd633ad3ca9dcd6fde08859f7cc328a8e85612bdd9bb6d0fa2f411fe029 SHA512 73251afeada1d739a8b2a2567ab671ac0d77665e71227d3a4ff5fe73af33bc684a88a4600cb13d8bc948b2102e7a404893a2005bcb952ffbe3687c288477364f
+EBUILD ksudoku-18.12.0.ebuild 1133 BLAKE2B b7a44ff98cd1020f695f16988d794e4e9db8c8273f52ad493f8ac15e5b59398f85f476db2a9f5612c70f7ba738b81ec18dd6718cdf213b01872697faa8eaee94 SHA512 2342c2a07212cea55b56f5813f92d97d8b6fbaa1df0921f666f881fa8fa131a88d3de0a7233fcc462a1fda9123e76fd4d0ffa9efd3b46af2cf895cb86b56773b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-18.08.3.ebuild b/kde-apps/ksudoku/ksudoku-18.08.3.ebuild
index 9e8e4b863a6d..7e88fb75674b 100644
--- a/kde-apps/ksudoku/ksudoku-18.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-18.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksudoku/
 	https://games.kde.org/game.php?game=ksudoku
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl"
 
 DEPEND="
diff --git a/kde-apps/ksudoku/ksudoku-18.04.3.ebuild b/kde-apps/ksudoku/ksudoku-18.12.0.ebuild
index 8e7b1284a73b..9e8e4b863a6d 100644
--- a/kde-apps/ksudoku/ksudoku-18.04.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksudoku/
 	https://games.kde.org/game.php?game=ksudoku
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 5a8edba5067a..8579cddf0490 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
-DIST ksystemlog-18.04.3.tar.xz 1784680 BLAKE2B 27f71ffb37ab30311cb638f1ed03a1ff0a78c92117c0452f1797c0b01cc1c816763b6ecb7295f22118747ad85856b64399d04a02447ca4766cde598385ad3ff0 SHA512 f42d7fdabd93f98180077388ff4fc93921db562795edaa1892dd4526a8f8637a2f5ed5c063c0b97f96603a0f0f2f0425336c61b956c9ba933cec565fb2cad827
 DIST ksystemlog-18.08.3.tar.xz 1966776 BLAKE2B f6715026b009296856c9120b0236b4efff681d1cd02d7694db8dde3d8df7a521c0640540ee3b1cfd69d1cf8bf8a6976773a217dcfcacbde5f4aaeb2689786fe9 SHA512 0cdf798c3d6c51851fd3cc2eda04e445a413459ee29d7b98d799a749d21a6a80447bce37651ac22e4b652fc10452dc2fb6408108cce2a968e7fc7f2379b0c915
-EBUILD ksystemlog-18.04.3.ebuild 1564 BLAKE2B 3c90337a6c5caca3d546aeb611e8545be0cb9fc2d840bcb5bb1b41f837b7faaf1dfc8537ce60e3de21bec325173a5e968b3d55612b1d2173f2af69aa65f0fedd SHA512 ef1ae57fd6276bcc9bb529b2a142b3f83774f58fe93f727320c5ec8ca696d1b6d5ff8a2a8f7a7ff4268408516050f989c6467ed623075a84d6db26dbad12a77b
-EBUILD ksystemlog-18.08.3.ebuild 1563 BLAKE2B 7c845a45766eda673347e79a837efe7fb8084cb90f45da14626212c4cd84a912233e5b3c2f22f430ffbe1d711d6640f481c89f15f73cf8d143af1774a98d4963 SHA512 accc43953db180e11d92962e8ea675bd8ed3768fc84db0f4f28fbc394973654f7b6e57d60dea934f3bfd88ed50dc3eb38fb79835049b03f42497fe528603173b
+DIST ksystemlog-18.12.0.tar.xz 1964412 BLAKE2B 9dceb8df613f7ed2d316bcdf0284f952947fa384660296e516d1c8883c04b82383d7d5dd93cd49c7dedf16e119fbfc8c9ba2c644c200f1189fc737607ba34f7a SHA512 3d22774144f2d2e52926a10b5ff93e1ae9e356fb60457aa9cc6c81535307214d0ab7d4339d221450f42166dfd8153ea608cb03e808d0a66d01a92fdcd63c93c2
+EBUILD ksystemlog-18.08.3.ebuild 1561 BLAKE2B 9a30c79477294ffc2164aa9e088d00d62b15f0af1d62a9153aa86e63ac80503ead1f31932108d54af492afc8952608f711229ec71269a4b83dbbab0b9155e89c SHA512 e697b4d7a5d7a450e2fdb03c449f1a005028d1cf605d9c31dd54b537479c7dd13f6a8a22c734f542c7032c116b7e444e1e31816dc56b45a15d6ba5d133acc05d
+EBUILD ksystemlog-18.12.0.ebuild 1563 BLAKE2B 7c845a45766eda673347e79a837efe7fb8084cb90f45da14626212c4cd84a912233e5b3c2f22f430ffbe1d711d6640f481c89f15f73cf8d143af1774a98d4963 SHA512 accc43953db180e11d92962e8ea675bd8ed3768fc84db0f4f28fbc394973654f7b6e57d60dea934f3bfd88ed50dc3eb38fb79835049b03f42497fe528603173b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-18.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-18.08.3.ebuild
index 5392f6e78e42..22199717be49 100644
--- a/kde-apps/ksystemlog/ksystemlog-18.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="System log viewer by KDE"
 HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="systemd"
 
 # bug 378101
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-18.12.0.ebuild
index a76e19a8614c..5392f6e78e42 100644
--- a/kde-apps/ksystemlog/ksystemlog-18.04.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="System log viewer by KDE"
 HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="systemd"
 
 # bug 378101
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 02050890084c..7330486052e7 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
-DIST kteatime-18.04.3.tar.xz 297864 BLAKE2B ca37f60362e8b4554bfe12c12e110fca5f1277a86fc2e43371e29cdf884ab3c76ff809ff325fc8ad6d7a2328d11a95370055ba6b8b4bbb80ff5389a881bb870b SHA512 5d6e19eac3687b1ecd0abeec1f6e0e28f69b78fe599e9d2cadca33a5f38b4565fe6a7abefc3877ff5a3b174a12d85c057c020d92318f311b7917466195e72961
 DIST kteatime-18.08.3.tar.xz 298004 BLAKE2B 1e3637c71c554df64bbc8a994dec3c062fd98b76c196f88d897eda5958c8380594369c1d5436b0ede1bcdf3b74a5d4c07aaffb56796fe282784900862d15d171 SHA512 8530abc2aa61d4b309b6eeda075184b8572b5a82dd59a7c2a19e209ac2440e0b560d587e79af772d92d1fafd04940919a8258729c25ca812aaab419fa0f244f5
-EBUILD kteatime-18.04.3.ebuild 718 BLAKE2B 06cbb4252bcdc2d843e2f162fff7e915db999203d1e0ce37d3e355587350bc311e838aae0b4069250cc10207d81b8b68e0bf1789cc709960879680686aac268a SHA512 80ee20c830c03c3b364fb562d08e09fe50b33186336a7409b476b5e1d786b8a36c56658954b33a413006ca5bbc5743f11144a67d82693740633d3001e4a80d61
-EBUILD kteatime-18.08.3.ebuild 717 BLAKE2B 6f29ed929dce34aec9ee847dcc7a1fb2a380ffde7e66b7a98e2d65a3a684d490843372e67ef7e4d8a34e8b9527c8d4600caa7e1ff55825dd4f71b11eb2fa8794 SHA512 46129320812a1ecc0401f8b6fab330a5fe95492babd51ee3e44ff327d987540d7e68df928d6504e35da26ba2c76fde3c0e5be374f15fc9b835fde881aa799bd5
+DIST kteatime-18.12.0.tar.xz 298372 BLAKE2B 510882d5505e1d3191d2d06a8a3fd745ea2ac263fc54b5c29d78c1e7720f5992abaf33d0d30e79dc869904a9da7be86f42c065b33d384f90d3d0142fb7ac2635 SHA512 8abe08fde2a2f0852737cbe901ef21b5ffaa0e46f89f94aa159942befca6c163e129c3eb4f6f701c869212ab5829c6fe15d4f89ce59d5cd281fdf0d3e3d606e5
+EBUILD kteatime-18.08.3.ebuild 715 BLAKE2B 80de303b39d5f35388f7acb08bae7198245b738f48b9c95a7041032d9465dca392fb59021122532fb503a854725f76fe8a033ed82d9945da53aa1db1a0586624 SHA512 c99b9790d251deed121e481a1b11502c3881b49042e089b049d982fe634c99188868ff8701ea091a197d29850b7cce7c2e30dbf207611580f6268aea55d1ee1d
+EBUILD kteatime-18.12.0.ebuild 717 BLAKE2B 6f29ed929dce34aec9ee847dcc7a1fb2a380ffde7e66b7a98e2d65a3a684d490843372e67ef7e4d8a34e8b9527c8d4600caa7e1ff55825dd4f71b11eb2fa8794 SHA512 46129320812a1ecc0401f8b6fab330a5fe95492babd51ee3e44ff327d987540d7e68df928d6504e35da26ba2c76fde3c0e5be374f15fc9b835fde881aa799bd5
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-18.08.3.ebuild b/kde-apps/kteatime/kteatime-18.08.3.ebuild
index 2a570b268121..9d89be913580 100644
--- a/kde-apps/kteatime/kteatime-18.08.3.ebuild
+++ b/kde-apps/kteatime/kteatime-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE timer for making a fine cup of tea"
 HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kteatime/kteatime-18.04.3.ebuild b/kde-apps/kteatime/kteatime-18.12.0.ebuild
index a362c5484d57..2a570b268121 100644
--- a/kde-apps/kteatime/kteatime-18.04.3.ebuild
+++ b/kde-apps/kteatime/kteatime-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE timer for making a fine cup of tea"
 HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index e45bdcb40250..e48d6c4c8b25 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
-DIST ktimer-18.04.3.tar.xz 456116 BLAKE2B 3a37fc65efe73991e30873fdc60a396966ae6e4f94d277b01b5119933d875648ce02121d3f81323c68fabfc8ff16eb7803c71898777030e85d15ba51ace6e2ec SHA512 d964f1751782ee112d91d59c66e8f5836751e41cb607d04d61eff4450c75dee44989a73cd484b651ec31b233e7242ab8ab8a39c29d175d20259a35dc54d02e56
 DIST ktimer-18.08.3.tar.xz 509468 BLAKE2B 82575a73dc824e3b65fad1dd027233d0ebdc28149dea0bfc9adf6b01b27431d06a94fe2320b3eab003935b1865b3569dda42c9e3316c9986266ebb6b091d5318 SHA512 a7c4aab964d85f813b4567cb822b9cb845ee29520175f04cbf60a4a729a1acbe569bf02e2af01b6b545fdae4b4dd912839f8d419765d63e45aa33ab534a3cd81
-EBUILD ktimer-18.04.3.ebuild 660 BLAKE2B 37955088d78d5daba9a62a36db829157900185ef1b934d99d2567782185c2397c1826b13c9a7b4ab5c3212ea9c5ed04c2eba48226c3acdbf7d40278545a8961e SHA512 e7b802fc6f09b0bb488546c02891708c4c8a5ff442c68537e8b2ed64c2559bfb749b2c390bd8699adaff7a37dba3e3be270be631dc61ba27ab46584217fcb2cb
-EBUILD ktimer-18.08.3.ebuild 660 BLAKE2B 666531fed8bb8ce7d1a244c43e05020909b8c0113decf428519050ccc6e6844a0a0c90407b83340381d267fb8e0eaeaa46e5efdcad5fbca3378834d669e1fc00 SHA512 5e53df93eeaa1ab07964d32e592771e99fe1782eb5bff23e22335c5de5604d0233731e9365deb4dd29bdfc654d423c4215b75b7e8b5ed837cb0f4cf41b085993
+DIST ktimer-18.12.0.tar.xz 437312 BLAKE2B 33ab730c9ace3f15b9e10869ec96daebe32c34304fce333794fe15c1794a48c031c438d4edefc6e9de5033867c553076a2c484cad135e041146f05fd94db39a1 SHA512 df07d9bf9714868e43b721af18ea6a1beca1d5cd59f7751b613e93f9f8d66b45ad20be727c8743eea3ac123d6917dcfc0d13fa778bbc606047c8ef42af581640
+EBUILD ktimer-18.08.3.ebuild 658 BLAKE2B 71e3aabff44ac5ffb1cd28eb0e94ed757d83e90803f5598f24c193e855f89d75737c9e096469644a7decb56cfd77639ea80d31bcb08c65a540af66bc92a5f279 SHA512 27f8ce0014f17be70270613d28bd8a11c06e09f0d68f6f094df4862ea5e17a0eb9734328dce4804fd2229aef004c7ec53c752ff2d46d2fe8b2e5fb43925971a3
+EBUILD ktimer-18.12.0.ebuild 660 BLAKE2B 666531fed8bb8ce7d1a244c43e05020909b8c0113decf428519050ccc6e6844a0a0c90407b83340381d267fb8e0eaeaa46e5efdcad5fbca3378834d669e1fc00 SHA512 5e53df93eeaa1ab07964d32e592771e99fe1782eb5bff23e22335c5de5604d0233731e9365deb4dd29bdfc654d423c4215b75b7e8b5ed837cb0f4cf41b085993
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-18.08.3.ebuild b/kde-apps/ktimer/ktimer-18.08.3.ebuild
index cc6e0c53c5ad..40663e9c64f2 100644
--- a/kde-apps/ktimer/ktimer-18.08.3.ebuild
+++ b/kde-apps/ktimer/ktimer-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE Timer"
 HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
 https://utils.kde.org/projects/ktimer/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/ktimer-18.04.3.ebuild b/kde-apps/ktimer/ktimer-18.12.0.ebuild
index 27e5fad06d44..cc6e0c53c5ad 100644
--- a/kde-apps/ktimer/ktimer-18.04.3.ebuild
+++ b/kde-apps/ktimer/ktimer-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit kde5
 
 DESCRIPTION="KDE Timer"
 HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
-https://utils.kde.org/projects/ktimer"
-KEYWORDS="amd64 x86"
+https://utils.kde.org/projects/ktimer/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 719996ed743f..ad5b884b8c7e 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
-DIST ktouch-18.04.3.tar.xz 5111132 BLAKE2B 36ded77fc81acc624f4c79aa8d9bce9e7df0718c8ef326ec2d03f8b70730a7629d715a681d96a8614f767649e794dee26a9ab378157cb6ef6dae84beca4a60d8 SHA512 eb27ecb18b9b06b839d56e150248e0ca89e12b89d80c1ba7237f46462e28056cdc423c1e3f3e9282b746f94c265d944dbc2cd4143dff1b145d6bdaf83d2e563d
 DIST ktouch-18.08.3.tar.xz 5106384 BLAKE2B 99bc9f6b3d403fc723d7a4eb1bf7c2acecb919b5e6d710254002f39a8db05f03e2f3969b6b165c539bc76244a1b73df93eabdc9a813c0241a8616d3aa102ab4d SHA512 a6c0a7bffb754a5f92555cf6658e5bd2b79e563831824674c17e939df8ca7d971677188f5f473a27bb00651ad5b903e454169eec0e51fc14900bc9c6bc00ec0d
-EBUILD ktouch-18.04.3.ebuild 1111 BLAKE2B 3595076fec0dc3b9e18b41285dd9ec7cc8c2bfd155555a25537d612c2e946b038be06fdfb3b7b86296238a12a58f6dd4e28a0d3697bea836fa2e672575d9d660 SHA512 ba126e96bff53bedb5210766322cee11ae7f5e828aab493a58b42389131e098f65c879b32ca0f3f1f5876d32faa006754ab8d146639302840460e4bc29d8f5db
-EBUILD ktouch-18.08.3.ebuild 1110 BLAKE2B e68ba87d61699481c054f7229310a05dd0390845eb10cbb5c5c1d3a6af03512a05dde7a48901addff9b48d8450348d983cdd5b610d4cbfbd445088e629024677 SHA512 b0333939e268360b9d162efb0d6ff2b8ee2de0ccd06cb18a4f55349b8e6dba74f9e22153ef734f5d1d83b7593e35f196cf2111cd70f4f1771a18f7f2f7d1e4ee
+DIST ktouch-18.12.0.tar.xz 5121672 BLAKE2B d4a09150007c94a9f32bb9c2a6e71bebbbf3a744bd667fe26bb71956503777eb53b66eb4910439307a233d5fe598e443accfcff379ce42dcb24d1f99b1e7094a SHA512 45d5136ea882f41d84d426b7b9d06e1020af3eb3a241566bc70b3a7ab63234e637050ab3bc27c6df713d21e967551e9eaf3fc93f224f8ae5430e6c6f3d5d5d1e
+EBUILD ktouch-18.08.3.ebuild 1108 BLAKE2B bc5d6a4bde31231ac3d95af604b5ddc3a7db4ec51c0e2b574081212101deba452356c78ca3e6805b8ddd9d9e47b946e1d544aa0869f4fe671e0e45511e4db3eb SHA512 5a1c824fcf288e311dce2e528d43b4b46120e02ab4a087b6e21fa65c26b3b789067f47778f9fc4fe484e3562470f3b91f778f9c6201f6a181c2f187b902fb675
+EBUILD ktouch-18.12.0.ebuild 1110 BLAKE2B e68ba87d61699481c054f7229310a05dd0390845eb10cbb5c5c1d3a6af03512a05dde7a48901addff9b48d8450348d983cdd5b610d4cbfbd445088e629024677 SHA512 b0333939e268360b9d162efb0d6ff2b8ee2de0ccd06cb18a4f55349b8e6dba74f9e22153ef734f5d1d83b7593e35f196cf2111cd70f4f1771a18f7f2f7d1e4ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-18.08.3.ebuild b/kde-apps/ktouch/ktouch-18.08.3.ebuild
index bcd1ef9192a8..a469382efd7d 100644
--- a/kde-apps/ktouch/ktouch-18.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Program that helps to learn and practice touch typing"
 HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktouch/ktouch-18.04.3.ebuild b/kde-apps/ktouch/ktouch-18.12.0.ebuild
index f13700391c9b..bcd1ef9192a8 100644
--- a/kde-apps/ktouch/ktouch-18.04.3.ebuild
+++ b/kde-apps/ktouch/ktouch-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Program that helps to learn and practice touch typing"
 HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 7de87d3deaf4..715fd0d3b894 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-accounts-kcm-18.04.3.tar.xz 264164 BLAKE2B 39f51d40b275b72e4ed3e38bb317fd9e3ede37c8fa1991c30b412938fb835dade8ff33c51256e3fd5cde4d325f780909f3d11d93420c21b3e20a4d1579c4dcb6 SHA512 410b9cc74abdb11287d633a7188970e7e12c21797da19e2a5595057c00e3311d916e3321475309cdad6492ae2bc6404439bc78b0e83d53702fa39dbdd7c39de7
 DIST ktp-accounts-kcm-18.08.3.tar.xz 264276 BLAKE2B 437b13856295370b630341f0dc7b0d2cf547026a6ac73794861aa4ad9ec87eee00df26162c07f920817743c50bef34e71e28092797058adbc8cf887bd894465b SHA512 76ceadf72dc1dc6e9265fb5976e4123e20863fa470cc1dc1c1537a1ba664699b69e9e3b1ff88708859d194b9033ae963e619b1f571e680d1ef758bbe63ce8d98
-EBUILD ktp-accounts-kcm-18.04.3.ebuild 1534 BLAKE2B ec8fb22eabefaaa23f458dd6138f553f2273b30b0c2badcd42ffc424785b526cd91a902d2577814b8c47af93be762e763ae3d22398f4ba90b919f22ea05f844d SHA512 db5a5d131242c33a778fb2884247fb48e82af0a1cc0afbd10e08d8ca5a1011e290c3a655d87f84eec1d9f1b69142ac51f49cdf175377a0512f3a73d222a268b2
-EBUILD ktp-accounts-kcm-18.08.3.ebuild 1533 BLAKE2B af44f3fee12cbe17bfeae8ab14e2e70d0607a7c602216f85c69d14f68727eb9d0b5926ad99d8a2a912835a96fab5dc5b3e6eee7e406eb82b4f8a0f766531138e SHA512 f0195dfce3576756b997378ca53d5c66c5ac6274fb35bf10f39ae11f2c0a2ec4ce1b4307a1b025152c5509f98b440fb0879bdd76f076188373408bb7de08e236
+DIST ktp-accounts-kcm-18.12.0.tar.xz 261664 BLAKE2B 717e104fed7c25b143a32577282f5f1e928cc4d329c257a8dfb66abb2fa5e8e75c076fd75e53d0eefaa3906b6de849fb8962417e6640f91c2f19418b3c086f5a SHA512 ca94dc40d360f89c650c369c5c3b4dc3ddd99965085298b37c7e61a2a4f816ae944e94afb60b17954d3f7ece9ff75cd9bd782ea4ef1c84765dd2256d4c432f82
+EBUILD ktp-accounts-kcm-18.08.3.ebuild 1531 BLAKE2B e354ac4cdb14c9fee712f5b011eefb9bade4b812592407b9179d499bdace824edbab8ab21065e289c6c3a8f62eaa017e405c5d3b0ee4e9bdc941f60a754e6309 SHA512 ac328a96979813c943c5d119cd8709430afb50fde82b007301b9d73e0a4ad833d59cbda2de952df0ef70c204f6bf6517aebc7a94eecf34cb7c00569fa3ecce29
+EBUILD ktp-accounts-kcm-18.12.0.ebuild 1533 BLAKE2B af44f3fee12cbe17bfeae8ab14e2e70d0607a7c602216f85c69d14f68727eb9d0b5926ad99d8a2a912835a96fab5dc5b3e6eee7e406eb82b4f8a0f766531138e SHA512 f0195dfce3576756b997378ca53d5c66c5ac6274fb35bf10f39ae11f2c0a2ec4ce1b4307a1b025152c5509f98b440fb0879bdd76f076188373408bb7de08e236
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.3.ebuild
index 3aef765d210e..81bc1bbeeff6 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy account management kcm"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="experimental"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.0.ebuild
index 53bc8434d0f2..3aef765d210e 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy account management kcm"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="experimental"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 5fad12f9bb94..6c6f780a34fe 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-approver-18.04.3.tar.xz 37088 BLAKE2B d3120dee367a2b9f3528a62ceece05d7aeceb824f0b6a9cbd66a255485e5227e424064d1dfdf83595f93f260e57dd8f0954fa086ccf74cf4764488e6f8cca42f SHA512 acc974de146cd6d5f803c34039d9db10c28c9e34775ef8194a65a2ace1da22108fb58756a630bf825e05a48ce43f477f9320ac93a710e69cb52e53f9bed855f2
 DIST ktp-approver-18.08.3.tar.xz 37124 BLAKE2B 17e1aeda81fcf0f1905ca5c25d88457e508653a330c3d4667cbf88c5e3c182fe0b371fbaa6c80c60cb5e47ec894f49414f6232f7b6aa2d078498d6441135ad59 SHA512 6482a9f117e7b6856c1732cddfd03bbe816fb5324595987c48ff7eb837920dc80ef2306de782ec8cf12c9631862592d52530826c1781a96fd2c1ac2e8259bfb4
-EBUILD ktp-approver-18.04.3.ebuild 676 BLAKE2B 27dece05da5da88d16f3d81d4824a7eebc02cd9bbfb3cd5a16ff13fda8f1b0528e2ada5f1255c977743a1317eebcb23f081a186b85cb1a103cf477083886b7d7 SHA512 be36ec7dfa033aaf1618172cc4ce9a7a1ffd81fc5bae4e606489b063766a896c0743aba06ef359409f7fe6005fc0a0740e2ad4ced0bf00c0e6e3b40f193ff87c
-EBUILD ktp-approver-18.08.3.ebuild 675 BLAKE2B f0a0427561107961f5498bef2e0f07108648a44a3734c36dd151707147d4106ab6405a72cca6cacb899ac7d260bab2533a61aeb40167f91abed8bfca3c3f8d53 SHA512 edc1598b9c8f6e9a9557e976d4e7507c4112a848ce990b3c261758dfda6cc720d5e255c87064d6f7875303308197c5fe9f1565fc6468003a977648c966fde1a4
+DIST ktp-approver-18.12.0.tar.xz 36900 BLAKE2B 5f1876a2ae07a0a862a5a2dd6cc29c65d96fe9a7cef1d0265debe8e21679b58047447abc132564f5b1fb53fb3eeaacc798b90a882e6d2efd4a2b5f46b0f0cfb2 SHA512 a9cc126b6be79a78ae14aaf55f8ce233890af6ab8f7621b745f95fb5089b6de68cbc11effa164fe8537b003361f4dcafdcb9264a455e5570d453ca48b9c87c96
+EBUILD ktp-approver-18.08.3.ebuild 673 BLAKE2B 5c1f8a04bf1e84fa8e46d57d5e9889177ba0da30d12ff64dd14a36d0db68fecb7b75c93fd39c8ba79c48f7a44053a67d4700c74420db12b12987fa58ad468960 SHA512 a484f757b2147f687db5ffba3b5634126e43c119dc78e8e307454b2539f1a79c83477af522cffaf27e3d425e529af6cb7ba675f0315a4a2e141ebeb2a9e6567f
+EBUILD ktp-approver-18.12.0.ebuild 675 BLAKE2B f0a0427561107961f5498bef2e0f07108648a44a3734c36dd151707147d4106ab6405a72cca6cacb899ac7d260bab2533a61aeb40167f91abed8bfca3c3f8d53 SHA512 edc1598b9c8f6e9a9557e976d4e7507c4112a848ce990b3c261758dfda6cc720d5e255c87064d6f7875303308197c5fe9f1565fc6468003a977648c966fde1a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-18.08.3.ebuild b/kde-apps/ktp-approver/ktp-approver-18.08.3.ebuild
index d7a49cebabc5..33f040bdd5b2 100644
--- a/kde-apps/ktp-approver/ktp-approver-18.08.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy notification handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-approver/ktp-approver-18.04.3.ebuild b/kde-apps/ktp-approver/ktp-approver-18.12.0.ebuild
index 6b422c75e3c3..d7a49cebabc5 100644
--- a/kde-apps/ktp-approver/ktp-approver-18.04.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy notification handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 27794f290cec..05ac8117b990 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-auth-handler-18.04.3.tar.xz 46356 BLAKE2B ccd7155b4ca8b42f26338d95cd4e8bac926bc1265857f9e7e748fb4ac1e327f1aa75db983bd656b45464a9e269c09f80b2649c74ee9c53660a11459cd91a7320 SHA512 1e674f484e445e244d7c70e43063ef6deccf50b4e75058bd290ca55d3ee792f9ac596ce570c16407a61fb97b87ae58077c5f9352a510541bd95231ed2cdddf52
 DIST ktp-auth-handler-18.08.3.tar.xz 46392 BLAKE2B 566a1f301db510cbaa01c951efe2d56aefe9d7d9fd0ab0241c8b24bd3cd3ea927e60092d9311b1f7e53a105fa96ad34b73c7cc84858c80f10ceaab8bbd530949 SHA512 83f0ba7d0961b9ff8ba36fbaf5aaea34a7ae5d66df7d3e1fbc3a5440f9050c07d6199e03ffe373a4c030f3b3dc3bdcc0245c5001238ed32911ce485eb4c658cd
-EBUILD ktp-auth-handler-18.04.3.ebuild 827 BLAKE2B 237e604a61a6c5ac61a2541a0daa73d1afb77db4ad747305f14a8ea31cad8c443fde4249e3729f77071c95e754750e5875d5d58a5609e9af8796e31a892ca1e4 SHA512 47e2ff24b54a5a88fd2ca27dcb5e7f8f0bc76bbf78e111263a3fbca089b29c72e38c7c42fc0d0a74acbfa0564ddf39ae9ff319804879e7e8c9b8cb24cbd88345
-EBUILD ktp-auth-handler-18.08.3.ebuild 826 BLAKE2B 0d135a22ff3e283adf47edf3a5509330a23ac282d2c56addd7cd1f7e97b7a1a3250424212da0cd10b19e66236d05dcd52b6d6a498c42e0473c0e0bb22c222c4d SHA512 4d6f2889d35d44bccb80f93b7ccce7eceb52ac07a52d49ff72652f65907fdc3e0c85b334d0b39e0898aa88d319abe1d5fe4fa9e4622ec01cb4aef55e13acd4ca
+DIST ktp-auth-handler-18.12.0.tar.xz 46012 BLAKE2B ef5a838fe138d9a86417a7986febf72055a657eb415ad9a4cd43459b5fb652f902a1bcde8ce3649aaebeef50e1115e12c2f5b796e8784e6d0229a06075a8a581 SHA512 715b9c6e87ccb8cce477f9710ee74d2d8fa53b0ba9642991419324145e2dfbcf9139fcf2a763b3e940f92f76e685f228b0348f6a38865d06dd5bff5bf5313d09
+EBUILD ktp-auth-handler-18.08.3.ebuild 824 BLAKE2B 06dd50bc4338f8864124242e744697ff9faa050b970c9e4a6c35fbd2f767de8b9b58f5349195ed083d71570c4a91346108ed70353d8d328f2138e02cbd6085d8 SHA512 78a00c8accfa954b90be96be57aafb30f8764688b8a5d970e7d1a01dcf24021b5908c769facf78360e2d80daa93f290352fd4b1833b189191cfedd8014f62f2f
+EBUILD ktp-auth-handler-18.12.0.ebuild 826 BLAKE2B 0d135a22ff3e283adf47edf3a5509330a23ac282d2c56addd7cd1f7e97b7a1a3250424212da0cd10b19e66236d05dcd52b6d6a498c42e0473c0e0bb22c222c4d SHA512 4d6f2889d35d44bccb80f93b7ccce7eceb52ac07a52d49ff72652f65907fdc3e0c85b334d0b39e0898aa88d319abe1d5fe4fa9e4622ec01cb4aef55e13acd4ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.3.ebuild
index 73d0a5129257..7e90727fae7a 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy authentication handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.0.ebuild
index ac65e27313b3..73d0a5129257 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy authentication handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index 92edda21cc86..dec23aa27f15 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-call-ui-18.04.3.tar.xz 97288 BLAKE2B e4b33af35f505bd03d4c0ae6509cba9f6c0ca63052b556bbe6dde46c637b8c81b1e2ba84a0337c81de84270b6031ab20754a667d454d6ee81eba04c4c6d308f8 SHA512 837252b0a788064b186423630178aff76e446a1c192b83dd06a70a4e6c22b39894763f524f9489c91767cddd05b61a2f46bc0d2ec48fb6f216cc9c4e6472588f
 DIST ktp-call-ui-18.08.3.tar.xz 96960 BLAKE2B 7b53ac3118428700e6a066c56648fe87327beed9133d96e31d4a425c4300fa4bb091bf23a740986ff69acef1f4728c04f79bd017a903739e4a3303c46547d14e SHA512 427b4b59b4762790605143be806679853dbcb7e79f4acf3a16321817e91209a972c5e4d24254b8e47df3f58e7f1cf1e99ee8ee47e5d60da34cb9c5c494f0e3fd
-EBUILD ktp-call-ui-18.04.3.ebuild 986 BLAKE2B d96de4faed6b79fc39132c4b39f7f747d3295e6a8e8d6246e7470717b8f1632f35a52e9265857f260c6f3776209b281af8dba8fedef29bb8a3733dbf7fa67fe0 SHA512 d9d93eea87d6b24e113835482a9a48af0e0bb24ce6d6e4ae5aca97bb5506ae932624931df319240a586586eef89bd07c79d0b01b053b1b8d48ef3d4c577ee385
-EBUILD ktp-call-ui-18.08.3.ebuild 1057 BLAKE2B 9f993daa19f58d2a18752dd167ae1373db6d701f9bc32e7d76bdd568b7dfac8225ed3fd3379727a015b7218118c48a8fd78144eee8e713f12dbaccc899d30ed0 SHA512 98a21dae3b4ee37339ac2dbfa4a14a279164473c2487c6b27203662e43709b8b5dd4019280264547a114e4b5b491136085b58d981d76c3f0e488d6397854c1ce
+DIST ktp-call-ui-18.12.0.tar.xz 96284 BLAKE2B 9323ab82366044ed4606519f88b0207f286e25cda6ab990d480be96dad6a005cb7c7e6163b4848e68007a6363a12d7fde5db6f96d118e9481ba4d9b55a5e71c1 SHA512 984ebbdb88b7a468c2cb4b9d65c6e775171e748372516e66fcc0340cac4edd0386ecada479d572d78158d2936588174bdd140f2a3fa76e53d8711f98f923745a
+EBUILD ktp-call-ui-18.08.3.ebuild 1055 BLAKE2B e711400215a550f6d94c63903869c7c2151bf7b8c0f25b7fb333dc389018bef8a1610ddc329a765b84dbd08ad5ecd3e98befd683e4ee00cd8957d502470db493 SHA512 256ce3572148c56539459af263fe684621fb22a7131691b88176e843985f1b74b76d4c28f9f5bb153c14328d3540067bf951ef18413ee2cb04d116b009666539
+EBUILD ktp-call-ui-18.12.0.ebuild 1057 BLAKE2B 9f993daa19f58d2a18752dd167ae1373db6d701f9bc32e7d76bdd568b7dfac8225ed3fd3379727a015b7218118c48a8fd78144eee8e713f12dbaccc899d30ed0 SHA512 98a21dae3b4ee37339ac2dbfa4a14a279164473c2487c6b27203662e43709b8b5dd4019280264547a114e4b5b491136085b58d981d76c3f0e488d6397854c1ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.08.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.08.3.ebuild
index d8cacc85baa5..66aba4dfb4b3 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-18.08.3.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy audio/video conferencing ui"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.12.0.ebuild
index c5f03b2540c4..d8cacc85baa5 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.3.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,25 +9,25 @@ DESCRIPTION="KDE Telepathy audio/video conferencing ui"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep kcmutils)
+RDEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep ktp-common-internals)
 	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	dev-libs/boost
 	dev-libs/glib:2
 	media-libs/phonon[qt5(+)]
 	media-libs/qt-gstreamer[qt5(+)]
@@ -35,4 +35,7 @@ DEPEND="
 	net-libs/telepathy-farstream
 	net-libs/telepathy-qt[farstream,qt5(+)]
 "
-RDEPEND="${DEPEND}"
+# TODO: dep leak suspect
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 1177371976dc..3ce8bcdaa460 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-common-internals-18.04.3.tar.xz 443664 BLAKE2B 2c66f2a401981675b8b393a2de2928cacaa6f1929b3f5aef5cff681a9b6abc30de8234447c35cf4a33fa51981785241848a4d161a153a98b9db2e300c849f15a SHA512 b405fa103fab1a366497ab19d5fc60bb8d939bde2119e50e43e240fa7066b5cee5647396b1b4ba246c9c82bf5bc876481c8ca586400613a410fae08735b120f9
 DIST ktp-common-internals-18.08.3.tar.xz 443696 BLAKE2B fe4660f48edce06f8ff5479f36d111130ccc6204d46a3cd8ca9e6f2b6a58968b49d33d1719d04fa433a7664cff1e6a4396e16fbba3efa0a744078d264736832d SHA512 a951c6b9c5507706331cefe8fc3b60d92ad1a44709c789c8b37f15ba9ccafb59f53814ea3a4d0314d70ac5f4784c7d8aaa103af0d3a205c047938f4b389b4633
-EBUILD ktp-common-internals-18.04.3.ebuild 1575 BLAKE2B 40d89f97145068b5b6e27077941ba229f258698a3b05bedde6c966d22ae5ed39801ed4310d6dfbd736578d9f5dc8853b671b73d7dc8d50f65462c88c8e483844 SHA512 11ec9de3d9940f861e4eae9d3dcf1cbe4291d108f414c7a0bac0c1362cfc3d7831cd0ce7cd1ce5ecef8d7f58b01e5245da6e10cbebbde3b3ef568a83d99e3d60
-EBUILD ktp-common-internals-18.08.3.ebuild 1574 BLAKE2B cf172b367094b23634ff8c4fb662e18411bc532fbe33506d991d94711cefcc356e15d098fe04b67029f3f22a5af8c6ad499ad2bf3e390d86949062a436986f1b SHA512 75a8c40eca0b446c91bd543033ef3fb3b8b688aa5d0e3f61670a07ae7dce54d854bc092173b502dba8125a7e02e901550c9435136372b02501871d78eaf1ffb6
+DIST ktp-common-internals-18.12.0.tar.xz 441212 BLAKE2B 978edeb34af91935d3773c23b4b5b8e006a8b198e15b5ea5939b07968aebea154df6c52bd9ed4f6108c653cbcead58d9cdf05b74f6ba55015896b40479e47b63 SHA512 64e0ca0c586c69ea875dba9fe8370d730cf7af302109752fc4354f1e8040fdf613d35dcff2c3c1ea7f3f8aeb3709e402825e21677d79beffd90bf7853fdb4127
+EBUILD ktp-common-internals-18.08.3.ebuild 1572 BLAKE2B 169e376584cde7715777bdf7e14f24b7da56a57d5103edc1ca6305a0469a419d933c9c3644cc30b9375b093c26b7a1ed954b77ec95489ce373718d31b8cfc2e2 SHA512 2f3cb77ca188c6130b94923162e60cad2aa2e3e1ce6b8cdeec0586cef4ed56b903f7aba53b4f0e812334fec56d250c1e8c89dc56f85e05aebd01c9086fcde67f
+EBUILD ktp-common-internals-18.12.0.ebuild 1574 BLAKE2B cf172b367094b23634ff8c4fb662e18411bc532fbe33506d991d94711cefcc356e15d098fe04b67029f3f22a5af8c6ad499ad2bf3e390d86949062a436986f1b SHA512 75a8c40eca0b446c91bd543033ef3fb3b8b688aa5d0e3f61670a07ae7dce54d854bc092173b502dba8125a7e02e901550c9435136372b02501871d78eaf1ffb6
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.08.3.ebuild
index 847ebb20732a..e2719e2e774c 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-18.08.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy common library"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.12.0.ebuild
index 8debec6aa8bd..847ebb20732a 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy common library"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 0464f3fc0cb0..b91a0cb14b38 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-list-18.04.3.tar.xz 146956 BLAKE2B a0eef7d446ec629d3b5c409dce828eae70e248e43013abe22981036698e2695884074fc916366a6fbf23854abf02721be2cca094067eecd0c87e1d19e3de4b5c SHA512 17fb11cea4f20e529f6d9b27c1d79a5d4a876d6fe2a5c240b7aff36793637aec227e23caf3b37ff247017b20244266be2d7a7f67fb4b5bd0dd1e1672ab2276cd
 DIST ktp-contact-list-18.08.3.tar.xz 147424 BLAKE2B 57184f9fbb0416925c6ea88cb637a5adcba4437143a4194e72b93a282a47a235543ea945eebc156b52e9a4687cd70caa1b794722d97d52568a625a7aa8b5f806 SHA512 2b91cf1c1178bed377ffcfda2a19d0c9dc5eb08d0237e73492da81527b778801c8ec089ab1299846221a821cbaa27dac75b2766e54239866f453becbd2e644be
-EBUILD ktp-contact-list-18.04.3.ebuild 1032 BLAKE2B 81c466f9879a9d4cc03c073c74ecc85ee7787a4ec026dc9ada56d75102cee2d026b8c3235d905927fce3c3e62edfb075c46b5053b9482ac064bd45449e22bacf SHA512 914e0ff38721394f9b828072c806a7884c32f9ca93e32196566b0b85025db90d97e4be207b4a805fe7afb0db9ff411fed4aca561a99bbb35ed68191f54751239
-EBUILD ktp-contact-list-18.08.3.ebuild 1031 BLAKE2B 41b86a921f050407a4689aa69340e690f8fa1e60d900decaebf48992a1584f8a4d3deffff3b02e082536cc93b3809ce0dffbe28d1c518b8a5d31fe6d7f83265f SHA512 f3448b6406ccd9ff5bdcd0e743e6ce2674c5c8aaedeb37ea2ce5df8d3be174bf072e527b1961a02279b10ae73cc538bd073b6023b21e1e36747d3f81c773fdd0
+DIST ktp-contact-list-18.12.0.tar.xz 146452 BLAKE2B 18ba0855b9b3d2fa286feea60c01919d36c4db4baa9fa6b36a68857132602b8a9e123abc0177e8b936d776d0b7367555c065b628a595644b1f97dc513ab89c28 SHA512 56f9b7124f1384804336a7816fe185ffc7db270ca16a5f344c3cbeea600fb311b798cff4b598dd02ff67db8db9d38c34041a1abcc81af219f500c6a276d5d8fa
+EBUILD ktp-contact-list-18.08.3.ebuild 1029 BLAKE2B 4ec1b13da622fb6da7969badb80d224f27510235bb4bb0318987d1267c1231afba20da3b6a5c6a972e3cfc7350bc5cb0928018a635c8b2ef9ad26175f15abd15 SHA512 9770cbf59dc25650f0c594b8bcf905d310fb4ce68de4d9b8c043fb946854737af7df80f0fc53dedfdd51d73360b7e2125cc9a33e5380766d1cf4b4ea3b385b59
+EBUILD ktp-contact-list-18.12.0.ebuild 1031 BLAKE2B 41b86a921f050407a4689aa69340e690f8fa1e60d900decaebf48992a1584f8a4d3deffff3b02e082536cc93b3809ce0dffbe28d1c518b8a5d31fe6d7f83265f SHA512 f3448b6406ccd9ff5bdcd0e743e6ce2674c5c8aaedeb37ea2ce5df8d3be174bf072e527b1961a02279b10ae73cc538bd073b6023b21e1e36747d3f81c773fdd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.08.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.08.3.ebuild
index 23ce063fabda..798a4ca09280 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-18.08.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy contact list"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.12.0.ebuild
index 676060d49efe..23ce063fabda 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy contact list"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 297506dbc25c..adec1a5f2e58 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-runner-18.04.3.tar.xz 42700 BLAKE2B bedc758583266aea0a4ab31b532eb835c0b13cf7eea8b369dfbd7b24b9f76d9bad98e5ba936759d5f3f9e0f653b35e84335d10aa47a82613f1b02e89dd43105f SHA512 7b775570a4179b4a97c162e0e2b3b76f932394d527809ccdbf6bc2a0f1e4d700c2281a768145ed3a90ff7ce25430a267ad1bf4f9d7857a8b1de3d7a94bcea93e
 DIST ktp-contact-runner-18.08.3.tar.xz 42720 BLAKE2B 51a9808af1d3ab170e592007dc00e68f32d1d7b3bf1f87d97c4000cd853c34b88c12d9ffa3fed89f589bff26d5d0c84e1e13400a84b0dd3b1f896c165e7cbf9c SHA512 bf2cf64fd53d6289e2763bec35265f0c89749f85d0c3e7f3dd495ca221147e7ec5910bf4f2602f31fe1167b26e1cd9de9ef53a9e32244d18e0bb3ac6880ff27c
-EBUILD ktp-contact-runner-18.04.3.ebuild 602 BLAKE2B e61fc57cf35cb8129dcb9c034316c2ac66fad4b4e91d7055cfc3a9cff345b5a22706678ff35487d660c78f1f861768abe94a079e3ef0cca103be7e1c2ee2b10c SHA512 28eefe0bd03dcffbe5f6707ffc9b54616f795434fe9d6a932c666f203c004973c41bf8e71b0fa57aa2ff1f346027bddf75e61c6246f22af36970c1584ad91288
-EBUILD ktp-contact-runner-18.08.3.ebuild 601 BLAKE2B c759075dba061f823e18c15aa6e605d5e05bace225be03954c9dcfefbd1bdf8ccd8184da86fa74886967853197abebd351d706fc13b40f413ce656e21edde1e1 SHA512 e3479869c86a46604368cd3ce642c67bc9d04a4c3588988de8d9736ac254ebc0b1bb62446bc431f542c1f9bccc93a7450a16a0fafb5902623e9e8fe3219e093a
+DIST ktp-contact-runner-18.12.0.tar.xz 42180 BLAKE2B 48f4d60d3a6cd29ff8376fa0dbf477fc6ced5449156b8b1eb49cafdb1e8bed78f73f04bd5fab077bdecd754ebf82f707f32e9946f34a1c216026f64abfc4c3df SHA512 2ca8e3450d7d4562053a525a9f8a780beb113957df7ff06d0c787bdaa2c8fbcc24ba11eb2dc16aebd59d6f0241aab3bd25a1974d2b3c05b2fdf7df8fdb055fee
+EBUILD ktp-contact-runner-18.08.3.ebuild 599 BLAKE2B 71eb3616f4d242698ec1d668690b6242a34d3f1a92e9fc5174ae9e64e42d61132c2334404a2586070223fb05043478f873f12a4fdd95b2b61124c28e3b5cb73c SHA512 1730c891bf34bf9d918c95c74a1aac52509e88f30f38388f1abbc7218ebe908a15a4fdf8a90f5f8832db2313c026da2375c242849f2c8942e0cbd52b0200310e
+EBUILD ktp-contact-runner-18.12.0.ebuild 601 BLAKE2B c759075dba061f823e18c15aa6e605d5e05bace225be03954c9dcfefbd1bdf8ccd8184da86fa74886967853197abebd351d706fc13b40f413ce656e21edde1e1 SHA512 e3479869c86a46604368cd3ce642c67bc9d04a4c3588988de8d9736ac254ebc0b1bb62446bc431f542c1f9bccc93a7450a16a0fafb5902623e9e8fe3219e093a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.3.ebuild
index 0f5fcea8dfba..475a41133221 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy krunner plugin"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.0.ebuild
index 849a4ab66492..0f5fcea8dfba 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy krunner plugin"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 446c6f64c263..d7f36529ecb1 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-desktop-applets-18.04.3.tar.xz 43124 BLAKE2B 53af20f4e3a1a51aa09b3dd8061b16ad964ddf6efec4bb7982212e7312bd2cc07cdf5265e29e900e7e2aaeb77ba8132031ff331a0b5090f6f20819655a7a8f14 SHA512 865f8f983f7434f32fa8d598c815454ff7cebce935fe9a72e35173b5e560aeb91f380e6cf60441f57eca7251b5fdecf8b5e7d0fceef289136fb91dc01750eeb6
 DIST ktp-desktop-applets-18.08.3.tar.xz 43120 BLAKE2B 3c1e1350bb50a515724d6b80e7dbe4a2e7dc6aca7c8c1a3b7f60bdda3aee7e87e51170b708fadf59d5403e943df6c549b3eb16d43429bab8352da7a7966fabe4 SHA512 3f26fe03a8431cdffe7c0c86a63a3767b8e8ad192a1e5b11c7856d5d51af9e6c497cabe24033521f1834a3dc766d60547437453674fa8b5a1bc8c3b9ffe24659
-EBUILD ktp-desktop-applets-18.04.3.ebuild 572 BLAKE2B e2dd4ee48db45d71f005e75677cde0fb38304368dddfb448870ee5aeca7a68ef017d45fe215a8f6a264390a48747d2c62b93f45527b1e976b2ad0461343c7f68 SHA512 2da8ae5261b2abec7f5286e308e31a048a2d794b6fd40071bc192401dc320ed1d87e78ba865cb7496b8c614063e8f557c7c097abf416a6ca4bfab962636d2eb5
-EBUILD ktp-desktop-applets-18.08.3.ebuild 571 BLAKE2B e205cd27cebed4fb8ce9018ba3283def31ba284baa813fa5c05cbbf1298ee2f17b2879e3e91719c946a45faba42be310fccd1cfa79ae5da91bf9b56ce405c7c7 SHA512 5f46385c411246b3ebd33fc92a2ff7752a41c7fe9f05cc6e73feecd8fea4634484439aa09686a7f771a84ef2b50d2d7f68029f188f984b9c1faa073350995de3
+DIST ktp-desktop-applets-18.12.0.tar.xz 42672 BLAKE2B 3e81feca393c04d6c9ae0283e5ea8afa7d689f5608ec3009a8090798c5a41b037d12cfd43edd90f7030fd1f4f8a9d98b710d7bcd27bbfbeb977ed455147e692e SHA512 ce79d4ae3150342678cbfbe753647fd99e2ee180016f85ca0fbf7840a5c4f501697d57c80e88728f8e2e75f47d79923b22b9a6d021847f0710292bd6d6c722df
+EBUILD ktp-desktop-applets-18.08.3.ebuild 569 BLAKE2B 11af9fb208e27fc251e00ac3cf90a8e3a08ba7933e15b04fe285d57607d6b9212c54dc55850868d5246dc6749186f9eb4f33fb3cb1a2c4d84f44a476168f45d9 SHA512 714eb5b68bf22e0fc05703ae6f0b0a1bcb82d4b8bc6896092f98d533a9fb11c54be9f7a7c137a252f85811001c601e6c52598680fa15a620edfae9a0318780f3
+EBUILD ktp-desktop-applets-18.12.0.ebuild 571 BLAKE2B e205cd27cebed4fb8ce9018ba3283def31ba284baa813fa5c05cbbf1298ee2f17b2879e3e91719c946a45faba42be310fccd1cfa79ae5da91bf9b56ce405c7c7 SHA512 5f46385c411246b3ebd33fc92a2ff7752a41c7fe9f05cc6e73feecd8fea4634484439aa09686a7f771a84ef2b50d2d7f68029f188f984b9c1faa073350995de3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.3.ebuild
index 8426d18576cf..b1af79c70bb7 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.0.ebuild
index a87326bbd06f..8426d18576cf 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index efb045d49d95..446fb635ce96 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-filetransfer-handler-18.04.3.tar.xz 46224 BLAKE2B e3882799897df59030f3fdc841c5495735c1531cf09ec4e98629e450d77721296c2cd28a4357411b0e13ce2faf2631fcb75c93c2ca2a0bb71899ed68adbbc6b2 SHA512 61410a03d2da650f2d92dc734e35546d47c39818273be6a49057570f2ecfbd06d58b67d05a88f5e8df7ad0b34e608d8dab64d1aec716d7db8d699d68de190204
 DIST ktp-filetransfer-handler-18.08.3.tar.xz 46196 BLAKE2B 6c19d323ce21415f5ddf42f67373427df768f00c60492a5f50b40060c5db524e2a736fdc4c0f378f2655685a0fbdcc9130aa5cd379e2ac7d9d457e31cae01d35 SHA512 b88763ceb61553d0fc0920514d3a845b0f7bfe03fab6006be6e498f711a657b5c1f240bfcff6eb75a6d1f7bd7129147415dfd39d2ba83104f7790e34ea2fad32
-EBUILD ktp-filetransfer-handler-18.04.3.ebuild 618 BLAKE2B cf226ea7a2f1f229bc6d48fb99dfb341fc1fc8f3f5fd8fbaac9c21ecf0ce7a39fc1abe20a65e799517036ce2bf158daecd52428b6905d31583ab422cbf46e89a SHA512 f441d634b4b082e5456777422ad0c423d5f5931dd2b7f3af04fccd1fc766989244e4427241bdd1e76841def3a1f32437a6833897d8dfa20de1aaf4343b3266c1
-EBUILD ktp-filetransfer-handler-18.08.3.ebuild 617 BLAKE2B 93fd6b3ffc8aa9a720007f9434f40cb2b971ac0cbe33c804db536623135d900ce25e6925c1683a4568b3caa9e8663478d27a6a59baa8c6b64b710e58b1620bc0 SHA512 ae122f3ba295062c8997ef55b251c92a3d15617724220a84cae6d395853914fa5fc20bbc2606d8350a59ba780ea68967f03aaa1adb75c9b4afaad195a19c22e3
+DIST ktp-filetransfer-handler-18.12.0.tar.xz 45756 BLAKE2B c5e30b4c1ceb1c2c2b1809147a046d3dd76ea6b76775fc51c3d74e1e89b388f69b3fc0b358468bdb452b4a48a01dd7288210ab37e2bf63f8a0aa3d207d70ab85 SHA512 89fd24b534d59edf2f225f2772cfda10d7940aeae4a1a75dd75d909bdca4c494bf5b98fb87b4ab363b3a0218aa52275309a467f5ffcba390c1ea8c1d750c8475
+EBUILD ktp-filetransfer-handler-18.08.3.ebuild 615 BLAKE2B 9e79de0e4f3e693b53733ca9944bc1e4158abdcbdd6fd43c8e61fad9ce372cb88c14868a5bbcb0839fc8bbd04340916bbcb63427ceb6bbee4debe33f5c5bfa6f SHA512 17a88e409ea72fc3702e6cfeceac7cc7da3196916909e971189802e6b83351762010a1dbf801439f7366e320f74d6fe6ea3d1d297a8e9bc670ef7d5d4c448272
+EBUILD ktp-filetransfer-handler-18.12.0.ebuild 617 BLAKE2B 93fd6b3ffc8aa9a720007f9434f40cb2b971ac0cbe33c804db536623135d900ce25e6925c1683a4568b3caa9e8663478d27a6a59baa8c6b64b710e58b1620bc0 SHA512 ae122f3ba295062c8997ef55b251c92a3d15617724220a84cae6d395853914fa5fc20bbc2606d8350a59ba780ea68967f03aaa1adb75c9b4afaad195a19c22e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.3.ebuild
index 5ea88316f8e9..00cac4ba153b 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.0.ebuild
index 455f5d3bc4e5..5ea88316f8e9 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 98ae9d959d92..ca191542e7c9 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-kded-module-18.04.3.tar.xz 94540 BLAKE2B 7c6119a638ae191407ff6ce8250365e177a7fe3c48edc1a8a20facdc7c8c79f7d10d68d1fe0bd587b433f76ba4a617ada28bbf59d90351553a12267f6cd552e2 SHA512 8fa78a3af4a17e345ec6e4c096ba86646cde8e4b67be847cb61ca3d470fadbfdbabdc24d3c4c61fb4a9f98817ab02c5d963b382b9747c79748110f1e24022fe9
 DIST ktp-kded-module-18.08.3.tar.xz 95168 BLAKE2B e446e541d010e9b7d9f3e2b93c83bd5efc3cba6e2c036a1d3884df7c88796ad16e807aa919d6e093056d3d009f0f1cf6093b7a548430d100551d27f884815c54 SHA512 2607f690e3545380e6088a63f215390e06a134b939d4a229d50987140a06cec65a9924a18948186b98d5f91757ac548865e2391dcc1ace5a0c011133df6a9993
-EBUILD ktp-kded-module-18.04.3.ebuild 977 BLAKE2B ff58345e59fac7e503b76fc1a3a290c1447d4c3791a9227296749d90b0e0d23c6ba689e32ff2623298df2f0ea3eae7d83562c6ffdb693b8e19ce94465f660807 SHA512 1a911854ecc01b8955542d1a0c0e416a23cb7455b06d0840371d79a27f3fa29418f82f52b86656a037832b2b09b05797eb8c40a23c5b5e4c7bcde0c2e35e519f
-EBUILD ktp-kded-module-18.08.3.ebuild 976 BLAKE2B 3cabf1b0da0c9ec4dcb778fd6ad48c303e8f8d19e796500cb54e7baed7b9a0da8108f861fef51a39e1cefd74dfc86466d41b1286aaf368bcb808744d66a7da8c SHA512 dea9c3e29e2b0112fd3687411de553e1d1d454b1d1e472ffb750b4a10d91ff564b79b7e47bb6743b47f00646d2dcc2805463c18315ab9b5f1f4202a27af6d334
+DIST ktp-kded-module-18.12.0.tar.xz 94680 BLAKE2B bf673bea75ecbfec84522e4c16f1ba6cb26921600c448ab27be7f8d55f9fbce0caf99061154162c60bf2e589ef4cbb7ede5a51c527b60800cd92077d5aeac24a SHA512 59f21ea6bc38a2fddaaf0d613c1b7f8ea4bb7b9fcac4d65981a5be16a8535426f753cf8665caa846f309a17a7006e4cf2a1f96acf2e158357dc15ac87bd593a7
+EBUILD ktp-kded-module-18.08.3.ebuild 974 BLAKE2B eecf2dd205309dfb6eead77e182d828c7e2a8711712f0ed0bdf7e161818b2b2a207dfbcd8249f037e00d6d90a9a00086ebb57d21e905e6a040d0a89b532fecff SHA512 666a152eb553839e21f6f3287f1d3e36aac35a1ee67002275a6dd1c9e2797939719411fea5f3f8153bfac2f3f3912fa51cbc098cab9ebd9734ce6c42138f0b91
+EBUILD ktp-kded-module-18.12.0.ebuild 976 BLAKE2B 3cabf1b0da0c9ec4dcb778fd6ad48c303e8f8d19e796500cb54e7baed7b9a0da8108f861fef51a39e1cefd74dfc86466d41b1286aaf368bcb808744d66a7da8c SHA512 dea9c3e29e2b0112fd3687411de553e1d1d454b1d1e472ffb750b4a10d91ff564b79b7e47bb6743b47f00646d2dcc2805463c18315ab9b5f1f4202a27af6d334
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.08.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.08.3.ebuild
index 4bde594adc2b..39574299b9a3 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-18.08.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy workspace integration"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.12.0.ebuild
index d7f970e100f5..4bde594adc2b 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy workspace integration"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 404859bbe43d..ded234634c46 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-send-file-18.04.3.tar.xz 28800 BLAKE2B 8bc11189a37537c073338c84792374919242e64738440f63cd47ffde61a1b8764c3b8487054e307b810199b62c406ac559717e39661d5a125d88265eb64f94c0 SHA512 a0644f8d0e8bd71ff29a60895f2e28fbf9dd80f82f208930fc816b358c953009bdfb8052359900476446129f1bae4be71b125cd50f335b432c8857b396686fc4
 DIST ktp-send-file-18.08.3.tar.xz 28832 BLAKE2B c98dbda9a8ad7e41f9b17786bf44189e8075812b84b948f59a2635647807525924d54420507a95b04200b5c7fa9e77da2fb945f19631ab5d82425a9f4f879cc5 SHA512 bbab4e17f860d3388ff07f7c29aa24c547674c7e39c2816a938541f440c8d95731f47ac905b962748375baf7ecd84044bd6646792cc9e1c1b4d1e0df19e25c01
-EBUILD ktp-send-file-18.04.3.ebuild 825 BLAKE2B a70d898988364281be37568053a6177286bb6156b18031a317e0d17514a40f527e3dd3f104ec3fcfea6a3057f300f9942b8ce8e2619cd05d250dcabb103294ca SHA512 93249abba02c9fe9d9b9e9d990b4497d4cea760dc8c41f0eda35ee701c5a64818bfa5ce67f5e0d2ce082309f26cc53556cc79508c84ca9ea6313a8d0700172df
-EBUILD ktp-send-file-18.08.3.ebuild 824 BLAKE2B a662f6b809d1a9ed9b8918db5898486850edf5edf5c4cd93100868e4a6023d36dbad173b0d280189666f06c31dd64f1f7ad33281322e419d416dcdce65a7b03f SHA512 7cdb3e1882102b778267ebfbe93e41be3313874aabddb04d38dd41488cf6c8860e33936567a29cd637b5e077cda507d5112e1f4608429a48c69e4646cde69011
+DIST ktp-send-file-18.12.0.tar.xz 28556 BLAKE2B 25a23727d4de44991e8cb75d755a3ae2417c7887f2dd8d3e5417e53d6661b0c80f3eaf578d49a27a3746969c43688483356cece39feb443a85cef90813c2b085 SHA512 f51d17c74e0546941ac6002a5ed9bc432c0ee0e4692f73149c0b818d7333d1873ec0d97b6ab889e0ff6afbf63b8089af37291c6eabca4043d075ac2be705b760
+EBUILD ktp-send-file-18.08.3.ebuild 822 BLAKE2B c952500be37d9bbc26e256c17165d0814c598d665a4808a68d7ec0c874d3121959c6e9d6c847b52c7fb91106aa47cfd47b8cad8d1458134b0da6ed428347508b SHA512 b16247354f0da86768bf16ee1d9e598a695d2cb08f70fcafa1e77927712bca06fea859a11084e9761c4fad5ae4abdfebf9c01cb1a1e7dfa42e3091c48293f51a
+EBUILD ktp-send-file-18.12.0.ebuild 824 BLAKE2B a662f6b809d1a9ed9b8918db5898486850edf5edf5c4cd93100868e4a6023d36dbad173b0d280189666f06c31dd64f1f7ad33281322e419d416dcdce65a7b03f SHA512 7cdb3e1882102b778267ebfbe93e41be3313874aabddb04d38dd41488cf6c8860e33936567a29cd637b5e077cda507d5112e1f4608429a48c69e4646cde69011
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.08.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.08.3.ebuild
index eb1c70033e4d..a88226a53597 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-18.08.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.04.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.12.0.ebuild
index bc535441e01a..eb1c70033e4d 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-18.04.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index fb24e2d7140d..bd33b4057a77 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-text-ui-18.04.3.tar.xz 469688 BLAKE2B c1e43957d1ae541eb3371bbcef1da2d876e00f6db932861ca8154d448c134f05a9a4b2de1fc2efe791bddb7bdb0aab4dcf5409ba7f502fc07540bc4ec05d6d51 SHA512 b4b620d3a25307c027cca61fc3b814bb6f511feb10ae3baab176a9c0f86a4bb7101dc278b278dbaeb0d6556bd6fd7c42db3ac96c64178ee5c6db3ce47740c519
 DIST ktp-text-ui-18.08.3.tar.xz 469856 BLAKE2B 27bdcdec15cdaeb692194f1e085dae0e8d2d3a6f913b5631ffb7195b2a62ca8b37dd02971515ad31024704eedf8f5b1a4e3225f211461021ff550651a27e62a7 SHA512 a3d46895d501156ebb6727e3b5bd6b4c0b6f202a77d5cdf557c6a15658d514ea692cc3f1cdeb59e18d45cdedc1387225816655e0c6e129b78ed8e7a6c1cd5444
-EBUILD ktp-text-ui-18.04.3.ebuild 1487 BLAKE2B cde9527f6ec6e11917ac0e4c0f747658f3f680b313cc969ab4e839682849cd0d93f4419e96067838901bf127b8c114ae2956bf344c872c5e8796d3fdd5b8b4d8 SHA512 562849c9bac6ed0c34bbace3ddeccaa36cfed9c48ec957640d2fdeba30e6ee64ee46a67c9e689ab9100a20dd7a1e00a60ca88c73b3d37550ac1901e19dd32884
-EBUILD ktp-text-ui-18.08.3.ebuild 1486 BLAKE2B 2224766b83116b4ad06c2a37fce4237739d7eeaf222a31baa0149274e7da3fc75c39f36da3600fab5e694e580b3c6ba2d7e4598ddc7baecc96298aad8d5e5e83 SHA512 4df1063a7b4cf87546f85796c015c115858bf6e13a62912793b79589669d4f23b5d7e16e7fd391043e5078adc1eddab36bdb99a292ddd055698bafca3a50615e
+DIST ktp-text-ui-18.12.0.tar.xz 465828 BLAKE2B 8f80c009fe405bd7398b349d78e53f9a57e097a8b7e6fb9305af6880b4a016a3383cf58858b99166ca0fad9ebd2829ec4133fe068506a603ba07d084464a997e SHA512 db11b82075c5a3ad6416445e427268a590fe51f5d94e010a0b72413cefe711a1a951fe2c4677cfd912a5d038bce2e32053f524c08bdbf3f44406c6678ddb10a5
+EBUILD ktp-text-ui-18.08.3.ebuild 1484 BLAKE2B 28617a89ec2a9d08c6a45315708a28b87383bd0fdcdf7594f561009de8c9ef785a00f03287d9af6c3e763701091477b99cf719b9aaa229822b2143cb57f1f79b SHA512 9da1607b603317a8e3594167e4d7609a5833f5c1bbbc83911a42e8eb3e2ce1d4977073c34274a87d80ecc50b7f907bc61e7a1f853a13c8da134733ddfce6c89a
+EBUILD ktp-text-ui-18.12.0.ebuild 1486 BLAKE2B 2224766b83116b4ad06c2a37fce4237739d7eeaf222a31baa0149274e7da3fc75c39f36da3600fab5e694e580b3c6ba2d7e4598ddc7baecc96298aad8d5e5e83 SHA512 4df1063a7b4cf87546f85796c015c115858bf6e13a62912793b79589669d4f23b5d7e16e7fd391043e5078adc1eddab36bdb99a292ddd055698bafca3a50615e
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.08.3.ebuild
index 81ec19d08b27..4666d08ea4a0 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.08.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0.ebuild
index 7573ce56a650..81ec19d08b27 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="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"
+KEYWORDS="~amd64 ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 1b351a9ef9df..9677fadbe7bb 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
-DIST ktuberling-18.04.3.tar.xz 32797016 BLAKE2B 92d52365bf712d45fd2a6195eb5e9072de5427952ae7b268de352acc85b5cc25509891835c5ded1bbb8d81b743ffcdf589a2dc16956ef68a6854f7c14d0ffac4 SHA512 7f8e26b681389d50194d85c08a88abce6d96acecf8b668e966eb4a61bb9129f9d9ebd667e3021eb83f681bdf5476a0c60fdd4716f083456be5b5d0e24c9a57d6
 DIST ktuberling-18.08.3.tar.xz 32797600 BLAKE2B 8a088390b81ce08042a7e42e30418b31613d79daad1abab9c671c69785be8298dc7918e1371f4f00010d50ac0d0bef07c8664fdac8de73241b51e0b33aa9f604 SHA512 cb6974bd426b23da04399110528a414ff8af512dcf8c9ac7c2a45279c827233eca4e8995bfa5f54a815baeed35f9c567b762d752c0df453532a6bf4aaa7bc180
-EBUILD ktuberling-18.04.3.ebuild 975 BLAKE2B ec8f1d47106ecaee3fb5fb1d87a30a65e0015031bd4c0721b7038e9a7546b230e3e68374f856bc6d9e19820290c66cfdc401a4e3187952ab92e05664a9453f49 SHA512 4a8c6fd5a2492d094eaf7dbd351630b8224ba8529d16a026e9f99883f3f0aa4492372c2f14e2d8cf12cf47fefa4a36075c74b49c4ecb5de51e437a490a68dba4
-EBUILD ktuberling-18.08.3.ebuild 974 BLAKE2B aa9e6937b13c20af0e96a041133c529692cecda0159006973ca7ab7f6b76d8f05aff3d5c5f5af83446fba559fef5fc15eb25b5e45f29353d7ffde6d14f047ddd SHA512 3746e66f68e4d381a1dc11081276f4d8df9f13ecb3fc0422e0e41dc3d4452bb06fabb3d97aced36850cd8a4e7aceaecacfe9e58b39fc594c453bb78f67b9e21f
+DIST ktuberling-18.12.0.tar.xz 32799512 BLAKE2B 001415c302ed974afc15564b26435cb7cc5dcd0e1677bdf610748989820e5f286c5cc5dbb9643ba5118b9fbce27d6eefb6e3f33be9c3afd5ffa44106e5645873 SHA512 1825978b38a0791a7535c97e31e537cb9dd157627897b1de0403124e0776474afaab9763eb0adb71bd16a97e04ecf87d04b27d4bca95d81915e861315b7b7eec
+EBUILD ktuberling-18.08.3.ebuild 972 BLAKE2B 75e1570dc04ea63b7795609b0b5b8067352cc139a0edac36593f86fd0d01cd5fc7cc3a71a2094e21a77d9591fe881b3e84b4f98565df687ad2bd77a0ef38752d SHA512 ec6e82666f15ad391e15f0a42f6494b378831c69fd2bbd3b518622701292caed76a893261c00ce4377a8980b68feb53d46f43bde6ebdb9cc137db48fcbf8567a
+EBUILD ktuberling-18.12.0.ebuild 974 BLAKE2B aa9e6937b13c20af0e96a041133c529692cecda0159006973ca7ab7f6b76d8f05aff3d5c5f5af83446fba559fef5fc15eb25b5e45f29353d7ffde6d14f047ddd SHA512 3746e66f68e4d381a1dc11081276f4d8df9f13ecb3fc0422e0e41dc3d4452bb06fabb3d97aced36850cd8a4e7aceaecacfe9e58b39fc594c453bb78f67b9e21f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-18.08.3.ebuild b/kde-apps/ktuberling/ktuberling-18.08.3.ebuild
index 2af7e0f064aa..abb2549ec030 100644
--- a/kde-apps/ktuberling/ktuberling-18.08.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ktuberling/
 	https://games.kde.org/game.php?game=ktuberling
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktuberling/ktuberling-18.04.3.ebuild b/kde-apps/ktuberling/ktuberling-18.12.0.ebuild
index 34792267dcde..2af7e0f064aa 100644
--- a/kde-apps/ktuberling/ktuberling-18.04.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ktuberling/
 	https://games.kde.org/game.php?game=ktuberling
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index aac46efd54b8..fb273e01cd80 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
-DIST kturtle-18.04.3.tar.xz 1608732 BLAKE2B dbf1c0ccf1b4c0efeae57d0c538b9bc43e2ce82b689fa862e7beece84a504276eb3ef7c41c8d8ee46d156dfde537d13cc804438903590490099860e80e5c5b82 SHA512 c4d3a20b7a399f4ffd2e8ed6975df6732fe33fe945694a8eb94410c2d80923f3156d7cae1658edbfb48692ebf86fd19c17040d8fbda877c86d12e939eba98ec6
 DIST kturtle-18.08.3.tar.xz 1608276 BLAKE2B 4ab93cae322fbd4ef8dc6d314a3ccf760eb5efcbbc86058046dcaeab34a0c0686bc23eb9f35cd9885a8a852afa00ad32da259a20e5b95e35e08c32f4d4c620ba SHA512 061cc40fab9a99d65cbe20ea6ad65ca37da3df51773224a6a4f6339b3d4bca3ce4bc49b77c88a78e17c6dcb52f01e82d303babb106519cb23a0af5e2d1678d2c
-EBUILD kturtle-18.04.3.ebuild 843 BLAKE2B 0efee60c3bf185f01be78b64a97e73d630ac9d194c4211b9baba35551de7994e120832f6b4615490c678029b5be3a715378c76d2de1b913ea8c82279a1c496bf SHA512 e61ee8e395c453417cfbfb1cc7f6f1b6fea53b02f3ae2046700f42e3e5129e9cf081cba65526f358c7a43a3133bd3997362a2be5911ffadf1256d59958f0b684
-EBUILD kturtle-18.08.3.ebuild 843 BLAKE2B f58d4c3b9555683419a3fe6013d0f99d565cb665f8ab9c6edce9831a206ca130c64c124b12030982fa75c4bdad50e19209dccee6b0a39bdd11d6ef71e400c30e SHA512 4e13670832142ab4f62527c83493058b84b2f5c01c20075cad0900e70aa538ef57b602b37620e7129811efd6b7298371f9100ee46bfd5dc1ea6597f0ae95f802
+DIST kturtle-18.12.0.tar.xz 1608508 BLAKE2B d0139745ddcaeb16535ef36b13bd7813130e40bfd5af016afa7cbb570a5e562c45fed14cab429fe7c36993b345d6c92fb8a91482f4ab291c657371add3b15946 SHA512 52e383070e3ec2442620f72a1146b4bb9ad3afe6889b4cf1e0421a14d948c9cabfb8f7da86e7a5f29bd4333f6a76de5437450f9131410dd7bae34553229aa962
+EBUILD kturtle-18.08.3.ebuild 841 BLAKE2B cdb59fefffd311d38e6d355f37aee43a45a1f86f71818d20aa24d576e36bbb6955c1b8d89af282e138849cff735b9f953b4db018d13bfdb2c37d558bf704d6e4 SHA512 1ccb710ad75b91b101f623a7656756e1df1129ae46ab40496e52f804995954860f39a36b6e2239fab18aa0c99a6b12476147a01710b475f1a33356b2cb28ad43
+EBUILD kturtle-18.12.0.ebuild 843 BLAKE2B f58d4c3b9555683419a3fe6013d0f99d565cb665f8ab9c6edce9831a206ca130c64c124b12030982fa75c4bdad50e19209dccee6b0a39bdd11d6ef71e400c30e SHA512 4e13670832142ab4f62527c83493058b84b2f5c01c20075cad0900e70aa538ef57b602b37620e7129811efd6b7298371f9100ee46bfd5dc1ea6597f0ae95f802
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-18.08.3.ebuild b/kde-apps/kturtle/kturtle-18.08.3.ebuild
index 373a6e397356..bc089201a74d 100644
--- a/kde-apps/kturtle/kturtle-18.08.3.ebuild
+++ b/kde-apps/kturtle/kturtle-18.08.3.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-18.04.3.ebuild b/kde-apps/kturtle/kturtle-18.12.0.ebuild
index 106310e9186c..373a6e397356 100644
--- a/kde-apps/kturtle/kturtle-18.04.3.ebuild
+++ b/kde-apps/kturtle/kturtle-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ 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"
+HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index fa91c04f5ef1..28b33c3aa923 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
-DIST kubrick-18.04.3.tar.xz 308328 BLAKE2B 544061d358993a7f924440b1aa1b33fc53fbcbb331c66072fc44c5a5d8ce7f29c8737cf1f613e43692271b1984a72b236ab53d3f6e942e7f3d991f83cd024e46 SHA512 a2bc2bb76150a60b7e85173899eb112eeddc91748c412bd2f2281d72ca83a6b418edfb693d4468de125ddffff280a9bebd3412bda0a331b17ce494c0b5610d57
 DIST kubrick-18.08.3.tar.xz 311100 BLAKE2B 13168ddbc588b2563268d0416286da2166efb13006ed659578919b45fca47ef50e1d4ac22e8643bb39d7123dbf2f51f962876e771be7803a99527379b0d0e9c7 SHA512 7070f17a6aa1a2bc2098bb619569356f06afbe8c84207d69a437cbd06cb0a24836619151c408f1aaeacb7d98834a3838d8ee50b5b5f0828c3f364c3b823d8d8f
-EBUILD kubrick-18.04.3.ebuild 749 BLAKE2B da0554f2e3eab3029a90b6d791de0f008d9f16f2d241da6943c3cb526ac3bc620e0ecfb9b96e760d35805ff3e09c121fe0bd71fbb291bb1b79a326da4a5f95a8 SHA512 d0a1c727665ec7b34e12d3970f109d31187a0e54ace76dd7214cc9f1172b9581a61af9791a4f12830c6a5b9714e40aa65611da6032d826771dc18253b5e2b89b
-EBUILD kubrick-18.08.3.ebuild 748 BLAKE2B fdc2527330cae88d393c6e6f2331ccbc39a113a40e2c147495a921f76c9e288f7b87911e51cc67a17d158be132ddd51d743dbf482073ea55b510fdf143c0ead3 SHA512 c02aaf9edb61b990e31d8a2c803642f45cca1d2f19e2bd0aa804eb7d22b2592fa81f564a77daa17944fcaacbbbfdeb998a9f13c3e27d287d1e91e3507dbd7c8e
+DIST kubrick-18.12.0.tar.xz 311300 BLAKE2B 304b5ba8a5615b38e8f1bcaa0a412f759b5543d90ada81c75ec3fab3a5e50f0868c24ca7569ff835af58aac0479a97e3287283e42cb8142f8ab068c50fddd375 SHA512 6296329e34a7259a8347367851811c097d882d818808d17f6c44b0b5063157e41d89029a99bd593266d693b0e421552e15af98be0c5fe306cf980df4dcd79e9e
+EBUILD kubrick-18.08.3.ebuild 746 BLAKE2B ee605f73138642c6893d91e103b9c4d67f17c2cef1e6a65fadbab6c5dc405c0af3756dbf0725b219a3255cc5991674e01190cf6440fc243108cca5c7fb727f2b SHA512 fac9634815c6ff016b0dbb1d45e2a52bb29fe28b269d25a69fac848762c5796a03409f508668325524d3e4102d53d3144b721d90e11c37efdf9fb71facf78faf
+EBUILD kubrick-18.12.0.ebuild 748 BLAKE2B fdc2527330cae88d393c6e6f2331ccbc39a113a40e2c147495a921f76c9e288f7b87911e51cc67a17d158be132ddd51d743dbf482073ea55b510fdf143c0ead3 SHA512 c02aaf9edb61b990e31d8a2c803642f45cca1d2f19e2bd0aa804eb7d22b2592fa81f564a77daa17944fcaacbbbfdeb998a9f13c3e27d287d1e91e3507dbd7c8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-18.08.3.ebuild b/kde-apps/kubrick/kubrick-18.08.3.ebuild
index ba7f19dfb475..e842660b8dba 100644
--- a/kde-apps/kubrick/kubrick-18.08.3.ebuild
+++ b/kde-apps/kubrick/kubrick-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/kubrick-18.04.3.ebuild b/kde-apps/kubrick/kubrick-18.12.0.ebuild
index 905e2a86308f..ba7f19dfb475 100644
--- a/kde-apps/kubrick/kubrick-18.04.3.ebuild
+++ b/kde-apps/kubrick/kubrick-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 4aa5d21003dc..a72cd0c29584 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
-DIST kwalletmanager-18.04.3.tar.xz 779004 BLAKE2B 7220e472946cd61e1b7ef882e3e8cc92e285d5fa5696a5d4e9703e5077ff9ee70fc68f78b662a952a1d733ea2ca3a7f7c1d482ed728b6e3ff6d772124bd25917 SHA512 54cc68ad34419703092cc53fdfe19e48ab758377b47feae405d2a094950501195cb8a39ce863d37204b0d2a0019100411ad73164c00bbf1e96bc2662a9a79b44
 DIST kwalletmanager-18.08.3.tar.xz 787060 BLAKE2B bf53fa995b131264bdb1a31b1bd0171232c63d787298b4140390b576e9e7ecddca3647bc75757404ad39fa1c1fada6f7346c30fa704baebd45c222a544a68cb5 SHA512 5b0a8256df7bbd7d82b167311030c8ddbe9870ffc9f7fb5ef5f523729d7c9ec11bc3a934462a6c645c1f3abd9ffe0e69c76ea3e9b118cb7534a9f702e626c5ac
-EBUILD kwalletmanager-18.04.3.ebuild 1246 BLAKE2B aac270c42cbeb8fb891dd9d65a8de55d51993e296ad3e56ae59015746f6d19bf3b6fe70e857ca2a575c94b21ae69dba5c1d2b6151457a8027faacfc177e54450 SHA512 18f35758834e8b4d9dc2f32d87d998ce4b36f278c6f24a76dfb9c38501382bd986abbf0181ad68c632b303855c9d882d6b8a09a89535965e9dc7e2779673766c
-EBUILD kwalletmanager-18.08.3.ebuild 1245 BLAKE2B 393f512e1ff092105cf61cfa2009b4372490c8d54fc8cf4857113e53b2924dad004399dda32391d61cbc5b98070aaffed2d3fec978d54ebf32476676d88334c7 SHA512 571bbfabb0397180dcf1ab0e9785b9133dc3e5b6814124d5d5c30205c800c5e2b0528d2d8a6f9bee6bda208611f7e0cce37effef19561f8e477b395eed5f1002
+DIST kwalletmanager-18.12.0.tar.xz 785372 BLAKE2B a553c54bcfcf7f2bee8142b46a87c6beb62d5c0300987d4a423ea2dd3c24a526dc9685b9e3bf5573af2a994d2996b7bc7606ff38f009b2bcf53602c4e051703d SHA512 4937e72ddc0f1a4ea3221d69467c87dc77d05f21d5594df2f99b9ddaf9940553b3b1bbb6ff1f45f17e96e277f954f9823c79922d2924a9e03c90af73eb90d740
+EBUILD kwalletmanager-18.08.3.ebuild 1243 BLAKE2B 00e28092ec40302567aa3637877ebe388c19fdf4bfc84b19076b60048d20a30de70c0adb4eac90246eb7e40b2a7b41fd5852e362e682a06f76bfdd9fb5c3e3e8 SHA512 20f29943ab1abcc24a95b1219ca34d0c2c2fb5a4401065cb7dce151302f5f1a2a73b8ac45ede575acafe08880abca90cbe59923fd35237a6f90ab2cf703ee62f
+EBUILD kwalletmanager-18.12.0.ebuild 1245 BLAKE2B 393f512e1ff092105cf61cfa2009b4372490c8d54fc8cf4857113e53b2924dad004399dda32391d61cbc5b98070aaffed2d3fec978d54ebf32476676d88334c7 SHA512 571bbfabb0397180dcf1ab0e9785b9133dc3e5b6814124d5d5c30205c800c5e2b0528d2d8a6f9bee6bda208611f7e0cce37effef19561f8e477b395eed5f1002
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.08.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.08.3.ebuild
index a240ff823f21..7750c5a4afc1 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-18.08.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE Wallet management tool"
 HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
 https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.12.0.ebuild
index 2aedae9329f5..a240ff823f21 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-18.04.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE Wallet management tool"
 HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
 https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index f4a8b0023d82..aa8a7ef7ca2c 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
-DIST kwave-18.04.3.tar.xz 6186388 BLAKE2B 4c6d4c9d2beeacee09535930e5660cde084105a9bed21ef4df400fbe8f5b0ccbdc5eb0152f08a92bbe60b7eb164b268964f6b386af0740677d99c2f1abe2dc9f SHA512 30fdfdf681bdf2f339a0b8ca91899e4b3e447075a7454f352f897745af2b671a5412c37ff372563a5f80cb3545295a5c4849b3243386ab86831e325867f7ef23
 DIST kwave-18.08.3.tar.xz 6214600 BLAKE2B 1ef161d62de71d60ff2e8507bf5ddf2a8e778c2ae62b08669d481f41223ec2e7273257440aaa21a53063aa4c072a3303901f2fa027318b21a3d7f33e825ecef7 SHA512 ddce5e748403e0678fa6713521713b5320b3c8732e5e70cb056b3c2da63e6480e47a47112521266d9df31ffd7750fa6c29485ee45bfdfbc215e3b3013173e469
-EBUILD kwave-18.04.3.ebuild 1987 BLAKE2B 9b5d443154717b131c0f807a64f76e16dfc38b993c268003f778ae80d285a4fb63b124b54b0762b81dfa84c8dd69e722df52aebbd218c2f4761363f2890ef612 SHA512 c80dcbd90fa9b0aba14d7d007c940646c477a8be7d3d7f97449bd267628676da6f72d44c0af285220b5d3d64ee6fd958a6239f52e6600e345cee4ef77ad2d7d7
-EBUILD kwave-18.08.3.ebuild 1986 BLAKE2B a656d8ac7de996556c2fe9d1e943e99279b6a7d3cc9108b9da417cd6cbb49b47b16922aca77d561e53e9839bc9d47c10bbb8de7e592a67342f8b794ae645d36a SHA512 e42c034788958290db2d4ccaad5d1c61ee6455460e45402daa1b36b6c4d11436a0e1ad6e67127d893de9346d987289bb6fb93425246cc87f53a1539ee43f8a15
+DIST kwave-18.12.0.tar.xz 6212188 BLAKE2B 516593f77f3b060b5e94ccf426daf6b2d44d830de88bef2da88855e185b23af6e91c5e993ea1c470fd1eed64a3dc2a8c61bb15eadc27bfa40a16674368847ccf SHA512 078c173e7838e52a161263c3a995f0036097e8498077e229a6b0ce9fe73d06db62e2e1d5c88dba6b0c724ea58c6719a6519644d38a4ae5953c13a8b66dca3e3b
+EBUILD kwave-18.08.3.ebuild 1984 BLAKE2B 4659071cd80507db8f8390d3480af80c8286509b7cf0f5a668c76125f1d18bb3d33da722468a7651a3c8e0a8806bf5dc872f1c02fd86eca2e29feca971d07950 SHA512 3f828db563fd6c898c2bda265e1f371f0f3681237213f615babf9906cc83610c17d8ef4278b337565c8188165343d2c1cec5333562f391831e976ca29566af6e
+EBUILD kwave-18.12.0.ebuild 1986 BLAKE2B a656d8ac7de996556c2fe9d1e943e99279b6a7d3cc9108b9da417cd6cbb49b47b16922aca77d561e53e9839bc9d47c10bbb8de7e592a67342f8b794ae645d36a SHA512 e42c034788958290db2d4ccaad5d1c61ee6455460e45402daa1b36b6c4d11436a0e1ad6e67127d893de9346d987289bb6fb93425246cc87f53a1539ee43f8a15
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-18.08.3.ebuild b/kde-apps/kwave/kwave-18.08.3.ebuild
index 5332d69756bd..74bec6840701 100644
--- a/kde-apps/kwave/kwave-18.08.3.ebuild
+++ b/kde-apps/kwave/kwave-18.08.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="
 	handbook? ( FDL-1.2 )
 	opus? ( BSD-2 )
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 RDEPEND="
diff --git a/kde-apps/kwave/kwave-18.04.3.ebuild b/kde-apps/kwave/kwave-18.12.0.ebuild
index a2dc825eb15a..5332d69756bd 100644
--- a/kde-apps/kwave/kwave-18.04.3.ebuild
+++ b/kde-apps/kwave/kwave-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="
 	handbook? ( FDL-1.2 )
 	opus? ( BSD-2 )
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 RDEPEND="
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index d862d6c59c20..31df262a59e6 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
-DIST kwordquiz-18.04.3.tar.xz 4168840 BLAKE2B 4bbdcc0119f31a5645e6c77e2d4c4bb424ff6572dc8e0192cf26972761ceef2b2fcf9d03b3453bd4f254148a77c3157465c7a137ab0d10d8fc1f8a57adc6146f SHA512 9b8fe36ebaecd49bea700fe74338aef430a2d0f9449eef4c3b1ca3ef84915e49e1fa22a8aa4fd72786cbf0631cbb39477170b0b5ba4e5f713722dd591b55fb55
 DIST kwordquiz-18.08.3.tar.xz 4168392 BLAKE2B 1b6d0641e4ffc3c5c806bdf9a3ee364653c106548f942e5d0febc1dd8226f20471ca9d39545420b85debd262d3512ca8ca64d3f35948119a8f11db0da5580933 SHA512 889f6bbc34cc7d9f6ffaebfdeb0e7dd07c166cde237e8d2cd029ead5ce8a3ca0e78df6de546e1eef0a822ad716135206aa0b11da5f21b31e61d795a2568ed01c
-EBUILD kwordquiz-18.04.3.ebuild 1062 BLAKE2B af1b796b5bdf1ee2b0768e8fc2dc796923f3c7aaeb103237dd2b960b4d122bfa4f6b89fa2a8ea8d56ccbed138b54703119e21131ce289291a120e1e90a4165be SHA512 29d5c304d3074e6f46fb31b8bdfe161d6ffba70793c133f2658d11e3a2af0e41d2fa121b6f9b1cec1769cf375b7a71785c89ea9509d982b364bee0bccc5d92f1
-EBUILD kwordquiz-18.08.3.ebuild 1062 BLAKE2B a85c4707685342e6597564efa207fafd8d8dea36b7047d7fae226f93c109a2e71ab60a87fdeee15debfc9dcf778d4eef9ae3cc67aa5f7fbe792e779e3fe4d380 SHA512 012e40ba58b7a0291dbbedfa1e740f0f3ea4c3a9b5ab3874faabbb4b9aab5223e84f3142c2dd5c4c49c1e8f2ee492eaac5f378a6941c5a1c5caf480940d8a0d7
+DIST kwordquiz-18.12.0.tar.xz 4168980 BLAKE2B 1c3bb13bfb985d3d6c851256f3c228159194bb919484863e62769311ab88d80ea4694d0548ec44ab8329fafb04eccb6617c85edf407c88fc7fb33b901ec7ff86 SHA512 0d8b5e3aec1273357668a254556cade8fd47697783fad284a6049af2f393c2b9a03657733aa44a09618f6194780fbd79deef69768ccd06a56d67ddda1a734345
+EBUILD kwordquiz-18.08.3.ebuild 1060 BLAKE2B 3a4693a5b8ab103f140f8f2aa3a6ce423435a899599ece72153eb966a8fd52485a13a2bd307352f00dce8c0104b53a122455e62f758a419884d6bf834b76b371 SHA512 9dc7bbd79c716e0f031baf833b29f97e279e0f0d750f2246a41937848a1dcfd03d2d2fa0906a87624e12f40c72fbb90a4c1e203dda06b44d97ae1daeab9945e3
+EBUILD kwordquiz-18.12.0.ebuild 1021 BLAKE2B ad641ac8b1044970d9c286443f75e0977ff188e2d88643564298c60e0066608ea44bdb15ef0c6ba637184a2ce08751c88c066dc13eec25ccaad44b82fca62305 SHA512 2de1f9a7f3a8b16ee472defaf7f08e594140130609b51501f90ec387e4c59ea8c7476e1ef912ad1133da755364479916f1f17c092e1f5596942712baa0edff9d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-18.08.3.ebuild b/kde-apps/kwordquiz/kwordquiz-18.08.3.ebuild
index f2d959eea649..36c36b42a658 100644
--- a/kde-apps/kwordquiz/kwordquiz-18.08.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-18.08.3.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-18.04.3.ebuild b/kde-apps/kwordquiz/kwordquiz-18.12.0.ebuild
index 03f108faee3f..95d3112b902e 100644
--- a/kde-apps/kwordquiz/kwordquiz-18.04.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ 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"
+DESCRIPTION="Powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -16,7 +16,6 @@ DEPEND="
 	$(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)
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 44d82b56499c..52f626a66def 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,6 +1,5 @@
-AUX kwrite-18.04.3-root-user.patch 2791 BLAKE2B 504d19baecc1a31c00fe32ed25c4f5c42400b33e788a94559a0833dad0dba0600bf5f763dffbfb4868c213d1825d852c988cded0bf2937f8e5614e5edb953b84 SHA512 b8d71b7e609ae671071419d75dcc6fcfb1577e25d4dbea5f62baafe00862fb45d4d91b01e90cb874a849897a9fe4d3ce50b02ff1b7ac7faaf6f5fc5b9ccf3634
-DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
 DIST kate-18.08.3.tar.xz 5664744 BLAKE2B 6645600156844c52ca8162bec98f107b45f8f4040aa94adbcf51470fb0102c300fb6755b6d6fb6bd856e6792ce770cae72d3675a2ac7fe0519f0c18d4df70e7e SHA512 08eee6b06d0fc0272b8ed73b6100e9afce07596ddab09337309f31709db4dac022e36591228eb1c06e65c064f7ea8bc18bf77fca30962fd277560b35081402a3
-EBUILD kwrite-18.04.3.ebuild 1244 BLAKE2B 560f4a9565e365369c3d03e37ceddf14b15b4676b214fb2b54b30975c3e3f44ea5503336bbaec6f3ed413075bf508767310b6f9c06a47000df5bd00e9cc650c3 SHA512 7f57248d3385701220f03f7a3d5737a388d407cdb5d5913200284822f76e8151d9ab71875cf45838e319ecc2ede69a1cb84ab5174eb9c8aaea8d1c3864864c91
-EBUILD kwrite-18.08.3.ebuild 1186 BLAKE2B 1a701254e0f3a90f196da08b9a816e9fa5221b9144259ebbc54985638721a3740c80e159258433774b5f20caed802a786d748184ec955f088da21e673277db21 SHA512 63e9ab92825b3f9fdc65d64fc60d231720443764022200bb2a5823c6096d905dd6172ec5d7582128ebcfed6ae213a9c6b8899a5e62ebdd755a741614a160b22c
+DIST kate-18.12.0.tar.xz 5770752 BLAKE2B a50b755497bc1adcc4c117c39f942f34ff2c2b80ed4b5e3ddb28942b11b0e823fd2865607949ee6aaae714dd0974611bd99175baec5f524e701dd8e7f4bde5cd SHA512 72fcec478a3beb789cbb6fa104c11191a8389866a4cb15e0a10d91392666b16f8ff6620827dc4756306fa58dc392c2735c1a683decc725a2ab477f8b421c53b1
+EBUILD kwrite-18.08.3.ebuild 1184 BLAKE2B 23fa41c246b1ae097d7ee090a3c842551633b46e07a03b60ae22d46c9f6a1a0a00ac86798037cc9ebf8282e1a21c7e50f5ad5c05c24c13b66a5859621f44b902 SHA512 6046dcd2fbd951faa6da692a1bc3d896d88452e25d692afc081a3ab6255e1d50c7d8665a64b35c1bd2743a0499979649355d76918d922335172c8d4fa740a6d9
+EBUILD kwrite-18.12.0.ebuild 1186 BLAKE2B 1a701254e0f3a90f196da08b9a816e9fa5221b9144259ebbc54985638721a3740c80e159258433774b5f20caed802a786d748184ec955f088da21e673277db21 SHA512 63e9ab92825b3f9fdc65d64fc60d231720443764022200bb2a5823c6096d905dd6172ec5d7582128ebcfed6ae213a9c6b8899a5e62ebdd755a741614a160b22c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch b/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch
deleted file mode 100644
index 5bbf2da605ea..000000000000
--- a/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bf6d5b7532968763bdc629aa90426c53500af13f Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Sat, 26 May 2018 14:50:24 -0600
-Subject: Re-allow running Kate and KWrite as the actual root user (but still
- not using sudo)
-
-Summary:
-The original change (9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e) to prevent sudo usage broke the use case of running KWrite or Kate while logged in as the actual `root` user with a GUI session. This is how the Kali distro is set up by default, so the original change amounted to making Kate and KWrite not launch at all on this KDE distro.
-
-This patch re-enables running as the actual root user, but keeps blocking usage via `sudo` or `kdesu`. There are no negative security implications associated with re-allowing usage via the root user, since if you're running a GUI session, you were already exposed to the original security threat and Kate and KWrite do not increase the attack surface.
-
-I have submitted a similar change for Dolphin that has been accepted (D12795), but @elvisangelaccio wants that to go in at the same time as this, to keep them in sync.
-
-BUG: 387973
-FIXED-IN: 18.08.0
-
-Test Plan:
-- Log in as normal user and run `sudo kate` or `sudo kwrite`: you get an error message.
-- Log in as normal user and run `kdesu kate` or `kdesu kwrite`: you get an error message.
-- Log in as the root user and run Kate or KWrite normally: it works.
-
-Reviewers: #kate, dhaumann, cullmann, #ktexteditor
-
-Reviewed By: #kate, dhaumann, #ktexteditor
-
-Subscribers: kwrite-devel, elvisangelaccio
-
-Tags: #kate
-
-Differential Revision: https://phabricator.kde.org/D13138
----
- kwrite/main.cpp | 14 ++++++++------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/kwrite/main.cpp b/kwrite/main.cpp
-index 62f4f2d..d3f3ca9 100644
---- a/kwrite/main.cpp
-+++ b/kwrite/main.cpp
-@@ -50,13 +50,15 @@
- extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
--    /**
--     * Check whether we are running as root
--     **/
-+    // Prohibit using sudo or kdesu (but allow using the root user directly)
-     if (getuid() == 0) {
--        std::cout << "Executing KWrite as root is not possible. To edit files as root use:" << std::endl;
--        std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl;
--        return 0;
-+        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-+            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-+            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        }
-     }
- #endif
-     /**
--- 
-cgit v0.11.2
diff --git a/kde-apps/kwrite/kwrite-18.08.3.ebuild b/kde-apps/kwrite/kwrite-18.08.3.ebuild
index 7452e0dfe13b..357d5b74b061 100644
--- a/kde-apps/kwrite/kwrite-18.08.3.ebuild
+++ b/kde-apps/kwrite/kwrite-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
diff --git a/kde-apps/kwrite/kwrite-18.04.3.ebuild b/kde-apps/kwrite/kwrite-18.12.0.ebuild
index a4c814923cc2..7452e0dfe13b 100644
--- a/kde-apps/kwrite/kwrite-18.04.3.ebuild
+++ b/kde-apps/kwrite/kwrite-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -30,8 +30,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	# delete colliding kate translations
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 6901f9322e83..c440868ee4bc 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
-DIST libgravatar-18.04.3.tar.xz 30448 BLAKE2B 1d13632884be127886eef875b8672954d926239f796156a4ec8616a4ff887c3487572c1bd24176ea37ea05c66a00f5906985a31d0193f1bfed78ee78690592db SHA512 ffdf46a77b47287dd6cb761f2885aaa0e8e9426ab721d8e28bd6b4269b4834375643c909400deb19c7e7db2096bb185540a7bc18d06350459fcf2c6fa84db504
 DIST libgravatar-18.08.3.tar.xz 30400 BLAKE2B ca9fed0045a2166182dfd6828b6dda01054253a907c2774ecb2c44d61c3fbee738439322be716f716bb185910c79343e8cc89b13bc9fa458d6886f530df15ca9 SHA512 d3ca400ad36d8beab3df177b8862c6887789aa4e85bbe9391d8dc58d11208a052d3b4d9fd185c7300023dd169622c31948001c0f87855c682efb2972bbc8a64d
-EBUILD libgravatar-18.04.3.ebuild 723 BLAKE2B 0f5d2a3d1a7011380d42421b390af600d9467276583fb75c8840b83d8841ce32146fe9ffa296245107ec8180b554b9006a6d254f73260134803f139b28b7873c SHA512 bc6df3e5eb4efe3fd4c312ecd077d9e40b291f0c19f280f5074fdb5b46449009cfe95592065f1e95ad2df7a7ee9f3b2a9d867ef7616ec190006fe890e94afc80
-EBUILD libgravatar-18.08.3.ebuild 722 BLAKE2B 3b594245d0a45d4630b6773bbfb7fe141daff064992faab0ce5705fabb2e1d126f9ee7b878d2e28a4046073aed29d381a4c271bf908ab80765a54c951171f5c8 SHA512 1fe18961ae422030bc10f1e1bc846d4e73d748e3b24de015b621fe965441da2fb5e2e78b320187fa0059b9168ffed9bc6473f34f153ae8647f2c7619d2f17bfe
+DIST libgravatar-18.12.0.tar.xz 30180 BLAKE2B 7ecb1f71543d025d0e719de73c6bbd57507e21d7cd522f75b1ecebd8ca5001bedf1bf1e5be6f61faedf91c3e5e7706f3bd11480e2dd613f9c3812a6f734e9873 SHA512 eec1da8c0251b30a5fb15eef019429ab5e48fc1c6138bcdcbd3ad322ce120df9d4f8b417599cb4e48f9a3599f01f96e505fe8b51cd129735747a6c42ec0e8c4f
+EBUILD libgravatar-18.08.3.ebuild 720 BLAKE2B 4658b570ef54b5a84ca0703da005ccc54d0558c6008f244e591db99adb23710e78c4a6108f2d2a949e4da8533a6e49cdde488c5a54b1bf1610334f7bbd4182cb SHA512 d4dc57a30bef90f8a92f569c8e528c4c8f3e0e0ac7e2f4a27cf40d89d86c93154d60a1a6093b0d3076f7afcd97e1ffcf0e9a64bbf00dca7b7c1670b7628a2089
+EBUILD libgravatar-18.12.0.ebuild 722 BLAKE2B 3b594245d0a45d4630b6773bbfb7fe141daff064992faab0ce5705fabb2e1d126f9ee7b878d2e28a4046073aed29d381a4c271bf908ab80765a54c951171f5c8 SHA512 1fe18961ae422030bc10f1e1bc846d4e73d748e3b24de015b621fe965441da2fb5e2e78b320187fa0059b9168ffed9bc6473f34f153ae8647f2c7619d2f17bfe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-18.08.3.ebuild b/kde-apps/libgravatar/libgravatar-18.08.3.ebuild
index 3ea83cb004df..8c5b502f7e55 100644
--- a/kde-apps/libgravatar/libgravatar-18.08.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for gravatar integration"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libgravatar/libgravatar-18.04.3.ebuild b/kde-apps/libgravatar/libgravatar-18.12.0.ebuild
index 8123b790a6be..3ea83cb004df 100644
--- a/kde-apps/libgravatar/libgravatar-18.04.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for gravatar integration"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index d0f644750f07..b2d8cf2c7abd 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
-DIST libkcddb-18.04.3.tar.xz 426936 BLAKE2B 417919ebddc5e837920921b31c85034bfa89916526cb180fd2a30066ce0c845d9bfa31921bdbdeeb71a07274f65b5d01e6d56e44d204a9bca28a59d0ef7ba109 SHA512 b89db360c2e2abea9a347eb8b3a4dcf9f6d8a4ade689aec7bef7ce674706cb28e078ce73440f320f855b1db80c927c3bd6da71554393a8948ecd5e99537ade8a
 DIST libkcddb-18.08.3.tar.xz 426900 BLAKE2B dc5267b33ae715b95b9b40f36737e2c42ccbb6686580eb087ce86b7e156109bfc6f605b4a32cbacbcb01e0aff76ca26790173f64927f8745d16826b251e5c0d1 SHA512 07c91d8e53c2b30bfc2ca1e13aaae793ff88fc79d57475d32aa6cb392c6cd36b174ed8b5ab185a2a625d1fea29067b813b46985ecaca15510d8094fe32a5193d
-EBUILD libkcddb-18.04.3.ebuild 1069 BLAKE2B 0d275ed8bbda299bf0cd8b9178ce2062e2e8a85e1d98b0c01ef93285955c3905caaa4d30a6fce1cf0a7fb1730a68db6b4cafce6b85c53c8b7e3b6ad4c2551da6 SHA512 52eae08f381c5726122a9f41b123dccb1aa39584519962f187f1de2572ab169991e1a8eab62faf08c98a02565d0cd6152b2438d68633466f560b52cdd3a7765c
-EBUILD libkcddb-18.08.3.ebuild 1068 BLAKE2B f495d468c5a8b016be366107d59be9c4559179033190db780ca657848d1dc36ff7cc0e215be600e20c57e36421c1f5d97a8e77c2a429d1ae2f9ab68f1cd83a29 SHA512 1fca8b4591693c8fd38653658d72cb2e882c9e2c896856861be124777b9d579835dcb14cb9e46694b92e031031eddbb022d04cd7c29057a5c212505008af3c39
+DIST libkcddb-18.12.0.tar.xz 426692 BLAKE2B 73976115a2dd6a4a27ab57687acf0b3e34cb6955d8b57f30abb81b7a580c24db7b451d0c7a121218db01e8e0c0c826aba63eb68db2296db6e18ae323c3d98be7 SHA512 4256267faf4ca3906c7868e4de2345d6917241551c9a6554781174cc67f2e199f80fa78c063de1e4daa811684dbd8fd88e108b794ec6c20c411f4e127a4da465
+EBUILD libkcddb-18.08.3.ebuild 1066 BLAKE2B b08147e1b8011b9b70f7ad8470696e57490fc7655bac53abd1e2fe5295aaa35beb12d36f1153fcf0a375f9dc9156bc870f585cd82f6bddc4fcb1b9852f206f30 SHA512 1d9db467c157da80c77f594b695cfe669d5726031af80b39073bbe21832b7f34d7736de17e123712edae196648bc91a678b5f1d5920bb952e6a8e2bba76ee78f
+EBUILD libkcddb-18.12.0.ebuild 1068 BLAKE2B f495d468c5a8b016be366107d59be9c4559179033190db780ca657848d1dc36ff7cc0e215be600e20c57e36421c1f5d97a8e77c2a429d1ae2f9ab68f1cd83a29 SHA512 1fca8b4591693c8fd38653658d72cb2e882c9e2c896856861be124777b9d579835dcb14cb9e46694b92e031031eddbb022d04cd7c29057a5c212505008af3c39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-18.08.3.ebuild b/kde-apps/libkcddb/libkcddb-18.08.3.ebuild
index 904641d3237b..6765ae84b62a 100644
--- a/kde-apps/libkcddb/libkcddb-18.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE library for CDDB"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="musicbrainz"
 
 # tests require network access and compare static data with online data
diff --git a/kde-apps/libkcddb/libkcddb-18.04.3.ebuild b/kde-apps/libkcddb/libkcddb-18.12.0.ebuild
index 9eec8f7438f7..904641d3237b 100644
--- a/kde-apps/libkcddb/libkcddb-18.04.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE library for CDDB"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="musicbrainz"
 
 # tests require network access and compare static data with online data
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 07fbdba9eae9..3e77837dabe2 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
-DIST libkcompactdisc-18.04.3.tar.xz 88456 BLAKE2B eab93aef5bf446f0c3dcda58ad06fbe6b3a3c969036f2c344635c3203e42aaf2e4b4a0657221f2a9ac838a5ebf20506329fa3e36c1b01d06e8478a48d4a9229c SHA512 b91212fffa3f977bcaf15476abec544dfeb1af82cd9315d338965e000713a8ef43a41e72f07b9d24932f9aeadc99f08737b300cdb9a5df7ddcb5b6087b9e5410
 DIST libkcompactdisc-18.08.3.tar.xz 88620 BLAKE2B c07b100d5dc40ab2b4b78790f7c88c5e83b29938ae45de4f304219bf465ff8a21b4485bb0a6e77f0a66c0460b7e2808c045a78fa997ee2f0edf776f62c14def6 SHA512 c734044ee96dd1bbd386fb95e5b277d7ec1261af484185d9237ed9b2d6937c7035dd28038dfa3e1eaed1a78a80fe4c814efa45a72da34827e38bf2448d7ee438
-EBUILD libkcompactdisc-18.04.3.ebuild 574 BLAKE2B ae958c84b73a13ccd9041222779ebccc2a0c3bdc95d6a2f3e9e7240e75a957e9692499202364a0c92d6da8df44c6ac3ea17cccd3de0643df32d249e6fda3642c SHA512 9167faf732377f25cc22b616da9f5fd8b41e6e9960cae6635e14bebef73084a5d74a2cd6964f3c8f48855db1451b225d2ab13e6337e82dc72afdac3e736cdbe4
-EBUILD libkcompactdisc-18.08.3.ebuild 573 BLAKE2B b5ae1bec5e9410ccc1f0687d9daf8026a2b37d4cfc9da576065ed168876723d6576ac60d2ff30da43bf31998b9a876725c4375a6cb251807b97e194aa8660cec SHA512 74d3e063ec9723106dcdf83297758ab3b8efeee2ba8ac183fcba3e13c8b01f8668938b1a0b59943d975e4135e6d0dc004a4d4e3a7e8291a26a74c0c666f668f3
+DIST libkcompactdisc-18.12.0.tar.xz 88580 BLAKE2B a4a154931b218d9827308e6794d8ee5c96ef899302b50dcd85aadf6a0bf2bb18bfa09deb102e61963342fa74e319abdaf4110e2cace376fe8cd49d4f67d1e625 SHA512 f2906aa2a5d67a13a89a7900ac201d5be726e75a36c1ef93bec04eb9dfbe05c9cdbad598496e5167c7cc26360625c5665a2feab7aa40309bcf188d1f629a8911
+EBUILD libkcompactdisc-18.08.3.ebuild 571 BLAKE2B fec2b5df6041776ede3870d4e5003f8e081e45a0d40631460a49bf64597d42c3cf3b74e8b6d9921c50e0ed65f7b607152a1f0ed0d56b6f4f522937645e36e6b1 SHA512 600b8877f984eb324f5b2a375642e0a7aa3e38b6b7136af3af0bdcc3d3fb48038d9ee151acde692507c4b031dc31c3b2729da014222b6cd555db2576474090f0
+EBUILD libkcompactdisc-18.12.0.ebuild 573 BLAKE2B b5ae1bec5e9410ccc1f0687d9daf8026a2b37d4cfc9da576065ed168876723d6576ac60d2ff30da43bf31998b9a876725c4375a6cb251807b97e194aa8660cec SHA512 74d3e063ec9723106dcdf83297758ab3b8efeee2ba8ac183fcba3e13c8b01f8668938b1a0b59943d975e4135e6d0dc004a4d4e3a7e8291a26a74c0c666f668f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.08.3.ebuild
index 5fe56a60fbf7..9accc7ff8747 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-18.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for playing & ripping CDs"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.12.0.ebuild
index 1e0358334e14..5fe56a60fbf7 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for playing & ripping CDs"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 4aeb43349ef4..5b87fcee7705 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
-DIST libkdcraw-18.04.3.tar.xz 42080 BLAKE2B 70d8aed9021c193564152f10016acc327710b2a96abd8f9ceea8ead2e467f51659e68888b8942aa7f2bf7b756515ff4005f5966db0a52add5fb5ee9118b0ccdb SHA512 2544319d3b393e7fb2e21c357f0a602a1a3865f6111d18d301e1eeee5a38b14377e6e3c347eed4af88fdc652122611bacf2c2a32f4debacf7cbef12f270b86d7
 DIST libkdcraw-18.08.3.tar.xz 42180 BLAKE2B b33c0b12b66543c23c2ad072d8553c722cd9234d19bc028761b3adb9db530cf9450c988e4e2426c7159a07f6d00edcf4df3aeecc2aa0ce755fb98cd3e721853e SHA512 415607c40efa1449a59a07e087b20cf88cd583e5d8e69711f337692f1df6350ecc316ec1d7ff24bd757a6e50c0ed42d0625d144b110387c06ed1d415d07013f0
-EBUILD libkdcraw-18.04.3.ebuild 335 BLAKE2B ae7616f589ffffed7ca9359049803e5093e7efdd43abe3fa7fa9b3ddd091b303e1199021bd8e981bf8d9b1aec9039e13eda7daf9334a7956b62ef52ebf3e23c3 SHA512 455ff7b3f70c7c8354e83f738f6d442c6331eba752d2079807d01c42c94d8581fa33708c5baa5a800eed348718e2f206628777f8ddf9f9f16a678cf53d442c38
-EBUILD libkdcraw-18.08.3.ebuild 335 BLAKE2B da0245514d1b831efaa2dc2b120b800b9fbf5ac836eaa6d720129f7f7f2f1e3858377ecd7f99e07e165fb12aeaee508f7b52527f9e1a395a1002e4a51380ee97 SHA512 066f41bb5dd0e45ca1f42d7b5cfbdeeb6e4010a9b4c90c23d96fe41e0573f6c8acc4e4afd803494820390596bd5e2244c3b99d243247b0e955f1aca48378394f
+DIST libkdcraw-18.12.0.tar.xz 42096 BLAKE2B 892ff12b8b92e3981328ec6574986c53c3c8aa4fb73c811cd62e1a5d382639e1c1320d9227ab43542ea77a53904103dc34e9f7cf044750f3e5bc8fd57f8f9ca0 SHA512 4bbf40b896df3b8abf31f1f4c34ba2fb7693a7612b4fe889d796a329d5f3697e8bd173a708a44592612e2276210c7dfb9fa1fd89af949cb41e48b49280347963
+EBUILD libkdcraw-18.08.3.ebuild 333 BLAKE2B bdd77f2886a9b0f004d6ba7e7bb977df49b42fe70bd3fb7b8fc77c9ca32253145c5ee60df8c7826d73b8c8ccc16230b58cc05e26de16aea1da9048fb007049b0 SHA512 1d8a08bf81278901b1b47d27759139004f221b95d501af52de587b27cf08aa6e05ba07e1d9067fafb6e6ef1719dcc1226330aebf27e8ad3b0a890bc4e810e83b
+EBUILD libkdcraw-18.12.0.ebuild 335 BLAKE2B da0245514d1b831efaa2dc2b120b800b9fbf5ac836eaa6d720129f7f7f2f1e3858377ecd7f99e07e165fb12aeaee508f7b52527f9e1a395a1002e4a51380ee97 SHA512 066f41bb5dd0e45ca1f42d7b5cfbdeeb6e4010a9b4c90c23d96fe41e0573f6c8acc4e4afd803494820390596bd5e2244c3b99d243247b0e955f1aca48378394f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.3.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.3.ebuild
index 270d7fc13614..e793fae326e3 100644
--- a/kde-apps/libkdcraw/libkdcraw-18.08.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Digital camera raw image library wrapper"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-18.04.3.ebuild b/kde-apps/libkdcraw/libkdcraw-18.12.0.ebuild
index df8d8a33e856..270d7fc13614 100644
--- a/kde-apps/libkdcraw/libkdcraw-18.04.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,11 +8,11 @@ inherit kde5
 
 DESCRIPTION="Digital camera raw image library wrapper"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
 	$(add_qt_dep qtgui)
-	<media-libs/libraw-0.19:=
+	>=media-libs/libraw-0.16:=
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 479bbecd77a4..b3e5c0a67a7b 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
-DIST libkdegames-18.04.3.tar.xz 5950408 BLAKE2B e0f02dff36e4d906c48da59a5b43271bea58aa2606980a31aa1b0f2c11741eae125c3e82a4a75eb391162a8b54248cc7ed687c17ced2a15a2e3f30e3040cb36d SHA512 ac31eb0c7308bfbf9d55f2cbfaea6a50d3f6b1c70420c17e2dcb9269b67831738bb1ddbb254f30bf4c6e34b90272b6c254d2bb5387452d0e6615a87a7be40c46
 DIST libkdegames-18.08.3.tar.xz 6385140 BLAKE2B d1bc45615de6ea3d4ea74966fe9e9006101b2a9c1d957d371ca8f93153f1837aa7f20dd407d79334b25ced8a617c0121d26d8831bf58ac6e01418d4e466bf622 SHA512 614c3428593f005401f98a975884015f7647da303e67d03440685aaf70302fc20f34997b14bf8b5661d6b83fd291e181accf6829432ede259d122ad73f01ac67
-EBUILD libkdegames-18.04.3.ebuild 1278 BLAKE2B cc571e37412a87bef3391d21cbbecc7a374f56202910e10d59179e7ebb68f61a91b7cee5d19487d5bd56206e8a21e8072f372244ae62f0df80c5f3352b2a8987 SHA512 e8e8cb5dac8db9f01df93954ac12013ae64cd91c30fdeb240ae164613aa7848f9419323b5385ea544616fbf3cfe49377a6454fff04a26061b1b2f2f8cfba3b7b
-EBUILD libkdegames-18.08.3.ebuild 1277 BLAKE2B 805c1981e95ad4ed0be28cc335de70b5fa86c3c7388a19d37959610c0548cd0f202e833ac8324d3a01c56946a3dcd4beef99c5b6bb399c4e963bfd70b5d6048f SHA512 70cb7d3a2edfa7f5ac6c931b1e98681d2e31cde9187e4f4f8d854852228dcb1f0e22da8cd097c4d3e3e6d755356b0caf7a4689ed29a0cf8fb817c0ca4fc9af05
+DIST libkdegames-18.12.0.tar.xz 6382788 BLAKE2B f86537ed8f4bcbc7ddd9c13b9ce6c84fb66a61bf7d452a0bdaee96e73cc1c409bc46c948675d2e83762be149d4f77fc6766131c0eaab39ad3b77578cd8601f72 SHA512 da6ace43777125349b59977603e136862c1bd8e7375c24f5aadd37968cf1c5e2412c502aa702b4903212b15d91d426da30384946fa6e8dc642406176a03865bb
+EBUILD libkdegames-18.08.3.ebuild 1275 BLAKE2B 405312a586473c6cecb25c88ebbab78a14783740dbf63fbd481b1ea6a5ebd08739466ab8df7631c65e5527756a7d604bdfb18bd083b23b3adbcfdb64739d585e SHA512 3379c9fbdefd64343d978b19d690111255803e29f444a0b4291eb20b1eee6cc5f32ebc0d91eaf4ad271617fa978322b2c7be80358b992c7bc065c6bb6e691e93
+EBUILD libkdegames-18.12.0.ebuild 1277 BLAKE2B 805c1981e95ad4ed0be28cc335de70b5fa86c3c7388a19d37959610c0548cd0f202e833ac8324d3a01c56946a3dcd4beef99c5b6bb399c4e963bfd70b5d6048f SHA512 70cb7d3a2edfa7f5ac6c931b1e98681d2e31cde9187e4f4f8d854852228dcb1f0e22da8cd097c4d3e3e6d755356b0caf7a4689ed29a0cf8fb817c0ca4fc9af05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-18.08.3.ebuild b/kde-apps/libkdegames/libkdegames-18.08.3.ebuild
index bab24896e647..28d59d564f09 100644
--- a/kde-apps/libkdegames/libkdegames-18.08.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-18.08.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-18.04.3.ebuild b/kde-apps/libkdegames/libkdegames-18.12.0.ebuild
index 4896ec57cc15..bab24896e647 100644
--- a/kde-apps/libkdegames/libkdegames-18.04.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 29d979f6997a..77d8da809713 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
-DIST libkdepim-18.04.3.tar.xz 341360 BLAKE2B ccb6ee69a1110717be95bd305178f5e4ec017172dff4066779094f3def40d08551f855dad12c794d0c61c6076c1de4a0e1856b579eb687e2688f42779cee9d1d SHA512 0f2cbb71c54ed8477159a2d628222b36e791b9e626c736dcc5318ca9ae2c77a1958efbd3f535ff772fba9606734fe1017c2cfcfb18786694946fa7be40755ed0
 DIST libkdepim-18.08.3.tar.xz 336668 BLAKE2B 57038366b90f29833fb9a555415483e67081db15413bfe4377348c7ab8289a30ef3551690629423cacfe4910d26610db5374a41b9a56a45d628c3c514d8b1c75 SHA512 87bdb505bf79a4a92ae261d781bc5d99369c957483f8783c656b7a50c1c71955d520854cdf5fcfe8985eb9df9baa5d9fd0b58b3f225cccdfe89373165c72120a
-EBUILD libkdepim-18.04.3.ebuild 1065 BLAKE2B 81cf1c504eec9b5df7d634929733a64b718ac73fd33f9392e85302259581c4b764c593e03362517a1fba2097ed7a110e66469faa34e80011697b6591e9dfe73e SHA512 6407762a57ee1d30d4d853e93914c59c0c6781a49eba791386de97b1114cb1067b27e919d0cc57c506e35aefe3310b272b9148a0061fa10f0133b0c1965ede99
-EBUILD libkdepim-18.08.3.ebuild 1064 BLAKE2B a4baed8c32672f8285e68dc6dcf7abc0a7b17d197a4b9e0a252ec7cd757b823d08a5df1221c2f6ca8391c2b5e56b73ed5c14cfddf93b43e66b86f1f16bcf4d95 SHA512 6d1e5326959567997e65e30264f8710c52e9867845f07489105300451b3208afb5f8f8a7653e40e11fa3a1774c2785c7044700de58829a6e0310bee0c5df1df9
+DIST libkdepim-18.12.0.tar.xz 336228 BLAKE2B 3d8e2877039a6db1cd05fdcb4ae4220bfd6f0c9bf15bc95d1f1c5a7c625f6fdaae455ea11a2ceb2dfdc4723c577450754c04b7f4f4dc3e58702f6dac97452727 SHA512 c4a98ecdc1296bad6981e58aafc3761496a2c887eb73efd0ad1461df0a06ef40cec1861f3600e3d04858e6a06a0d759b3af0855e72c81077919b17e0513e707e
+EBUILD libkdepim-18.08.3.ebuild 1062 BLAKE2B 0ad4a23ccb9353fa75e6b2c4e85c5dd417df752b4556b9b272f390ed8cd738fd9e4256ca59f104caba1002b3299679ca673720f3bb396903752b0ca30ed27ba5 SHA512 2b84b80e372c465efe07826435c1e5d4e40d4ed9a82e5dc2e305896201a306c94c3147eb7d4fe187e1d409519ae81afcb1092023e6e23f3eb82e8af0750efbfb
+EBUILD libkdepim-18.12.0.ebuild 1064 BLAKE2B a4baed8c32672f8285e68dc6dcf7abc0a7b17d197a4b9e0a252ec7cd757b823d08a5df1221c2f6ca8391c2b5e56b73ed5c14cfddf93b43e66b86f1f16bcf4d95 SHA512 6d1e5326959567997e65e30264f8710c52e9867845f07489105300451b3208afb5f8f8a7653e40e11fa3a1774c2785c7044700de58829a6e0310bee0c5df1df9
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-18.08.3.ebuild b/kde-apps/libkdepim/libkdepim-18.08.3.ebuild
index a97de1a8b4e2..0bd41d6a9b95 100644
--- a/kde-apps/libkdepim/libkdepim-18.08.3.ebuild
+++ b/kde-apps/libkdepim/libkdepim-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-18.04.3.ebuild b/kde-apps/libkdepim/libkdepim-18.12.0.ebuild
index 4767f37268b8..a97de1a8b4e2 100644
--- a/kde-apps/libkdepim/libkdepim-18.04.3.ebuild
+++ b/kde-apps/libkdepim/libkdepim-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 7c4d39cb0dc4..b3721223990e 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
-DIST libkeduvocdocument-18.04.3.tar.xz 210388 BLAKE2B 5026f210d3fabccb2b980596cbc98e48ddb2a0f26636e35075f414fce131a12c052008603e8683b13ef4ada53b9763744f2f2a08bb51c71425cf4c5bed65fcc4 SHA512 a703357c2444ee20ad38620575e07d6dcd8f49c45bc2e5b5fe464738d829df4d3847fc1f79698d309d88d6a652fe38ebf9776ce4d39dd11ddf774e77ef1dcfdb
 DIST libkeduvocdocument-18.08.3.tar.xz 206796 BLAKE2B b35a16375e91694c1b18034ffd59181f6c67dd4f5d7874a84bc287928a6f09e810f7922f5f7b190f143dd197bd25f78c03d1d07083a0bc6175172c12d6df8230 SHA512 9cec451a939414654efb559f38ed9a42ce673dd17e2af016408f60dd98d7b8cc4c08b75d8fce8c0d680637b123ec14c85a1a4a8c54f0c9617d4b8afa8baa9fd0
-EBUILD libkeduvocdocument-18.04.3.ebuild 599 BLAKE2B 3b0c2e79516e1084349d8088ddc01bede11ef22d9b5e439b5c86e9cd7ba3b7800d1089aab8c9357f0db802ed8bf2f00b509190c226241867567f317bb085d0dd SHA512 5cf55d956909d21739659cc8f2951d93a665e87451e6a30775ccdaa1358cc0302b2c59c3efcfc3c3a27141b05de42dfea553908b68dd22309e11077edecdf26e
-EBUILD libkeduvocdocument-18.08.3.ebuild 598 BLAKE2B d764bf8ecd51113aadad9b692894fe8a4204cb1d2f81f8ed93012a052ac987a96b26388b2e054818bd2b99ea04c8864f10d8e61387cb70bb655aadf653215bc6 SHA512 36f9d326aa27ada8d553237d6233480b10c8726d57d81a91e781218c67ba438fa932bb5ee5dc9265231a057a331385603b5b417c7f04104be663858a317f81bc
+DIST libkeduvocdocument-18.12.0.tar.xz 207028 BLAKE2B 07ba47dbcb3fbf70f4810ae326f13ba26c2f686ec63abd4cce996fb46af1dfb7558c720e1ea45bdd8840e9c3dc554b1930d975ad08dcfa2337b6593c8f7d54ce SHA512 39eb41bf0d4ac6428e45d77049da875e392c13b27b28f5aa8c7fcdaaa63009191e75ec7bab393da5046258e66589cc9e73a64f194382b1a20dd5d60fa8ab6d92
+EBUILD libkeduvocdocument-18.08.3.ebuild 596 BLAKE2B 91bab23098f6cc499a342389360770a7b23b49414f99f9cf12945a3c39b8f11c10916ad85cfae915fc2114d70632fc5234274087ab288db7392fca3f0edf4425 SHA512 073b7aab21c8590005e074786b644c11545ff99ab1d47d05e410fd06d6facbff5ac8bf61a1588962f24a8de3f4f1baaf59bb06dd2035e08c2551e0433cf8a0a2
+EBUILD libkeduvocdocument-18.12.0.ebuild 598 BLAKE2B d764bf8ecd51113aadad9b692894fe8a4204cb1d2f81f8ed93012a052ac987a96b26388b2e054818bd2b99ea04c8864f10d8e61387cb70bb655aadf653215bc6 SHA512 36f9d326aa27ada8d553237d6233480b10c8726d57d81a91e781218c67ba438fa932bb5ee5dc9265231a057a331385603b5b417c7f04104be663858a317f81bc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.3.ebuild
index 247314dcd806..79c127a414a7 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.0.ebuild
index 4b826a7a8405..247314dcd806 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 446c6c05dd10..a420cab0c58b 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
-DIST libkexiv2-18.04.3.tar.xz 64512 BLAKE2B fbd31c115e7292be62aa656c3b8c3b37a34b1740b1658b8d58f5a725d890abd55e2fca7cc646ea74af2adc30279b077ccca6e55c09ee0cc0a3207c5af6203ce0 SHA512 29c8295510d9b07204ab870ce86f5c9aede03459a906e356e8a1b63a89b24ff4d5f93ef13ea6080e1fb88e91e4694885892d88b3e822cade7cf09435f49d115a
 DIST libkexiv2-18.08.3.tar.xz 64504 BLAKE2B b29645239bc1523bb363e04ab0449563f4c9550887c359b9a55414682e850289f80e85088c043a756d34dc83bb3b0c6cc9975cd4e5a513b80fbf4d6f93870d6e SHA512 eef3fbb5942823d23d276f56a1e9187b5142331485a4fb7d7e419f4af5504659c5a755f64e4cdf2a9bef6ae499126672ed5627c0fca7ef56fac7dc6a12794143
-EBUILD libkexiv2-18.04.3.ebuild 356 BLAKE2B aaca5ff52a0b87eb93324ef09899225558c281b241cf6b11aa08a2d16b57118dc3d94a45a6bb5b0475715e205994c646ad54eccb0aa5fcb8aa779ce803f86a26 SHA512 75fb0fa4f9658956aabe61b4b25a8d2cdcd175c9a42d1d33f1a997c142df35243c49f4a9f1e9e94f10db251da8fcecd8bc11fd85e54dd016f868e9b4e0046c8c
-EBUILD libkexiv2-18.08.3.ebuild 355 BLAKE2B 3111ec03b5f3cf1752e53c68f44b3d035be494acf25711ea1b5a3178fa064e217944ef9d0fbcb88f308c3dd9e861dfd1ade03391e0c3faebe9de652c1f59fb3b SHA512 7242a7128c1b56d3ff203e4cabbf0c64ef9ce93aa105a9e26aa447926b506cb23637e3e9dd12c71330fa257ce64bf1b85a8c5635b51bf5ddca43e65ec88a20c5
+DIST libkexiv2-18.12.0.tar.xz 64528 BLAKE2B 697c88fdf36c04dc874ad3625eb7bf699604630d35cf5f7e81ee40f269a54a2e03e837479b0e66c50f79aa9a646128f0b4588e2a7d5ffba091bd3c2f30a410a0 SHA512 8fc7a46b5814e6ac2013630e41dcb209074ea7765dd65343ed8e0d25216987f5262a77dbf1736eec31dfbfe05be730efab3474ac3689ca20ac94f363976a9d5a
+EBUILD libkexiv2-18.08.3.ebuild 353 BLAKE2B 2e6b4be08764403b6fe046b37908a1684e3a95f4f23a9c5e4fbc3f1c2e870362f43b7528d8e433940c6b40879eab4820616f28a1956dd7ef6d05dfbd6237b7ea SHA512 33ba8badebe5fa55e2dc648ddb2a304274ebf6a5ab71de0ea23712757ee7e8e9133027d77b283cc46e45f07a1779eb325e7dcd33c03979f370c6ec10ee769fff
+EBUILD libkexiv2-18.12.0.ebuild 355 BLAKE2B 3111ec03b5f3cf1752e53c68f44b3d035be494acf25711ea1b5a3178fa064e217944ef9d0fbcb88f308c3dd9e861dfd1ade03391e0c3faebe9de652c1f59fb3b SHA512 7242a7128c1b56d3ff203e4cabbf0c64ef9ce93aa105a9e26aa447926b506cb23637e3e9dd12c71330fa257ce64bf1b85a8c5635b51bf5ddca43e65ec88a20c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-18.08.3.ebuild b/kde-apps/libkexiv2/libkexiv2-18.08.3.ebuild
index d1c1eda8fde7..9f208b504471 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.08.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-18.04.3.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild
index 0c719468faa7..d1c1eda8fde7 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.04.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index dc1258add048..efd63269bf21 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
-DIST libkgapi-18.04.3.tar.xz 176268 BLAKE2B 2f276af969d20bd22a4e19203499c427cf4d7bdfcaa95165b11449e96f733231dc0d208dcddcf310ca77a8ff380e11dc46d9f0068042d13da44d1e58dce59eaf SHA512 ad60348967b04b050b7809000633585a0a45fc7a8bd6627e5aaa7c62da5b158a6f7c6b46e5144358e7e6e7d427b65b4e6c6e9edf8625fe76f57cee7ed2799817
 DIST libkgapi-18.08.3.tar.xz 215880 BLAKE2B b731bac02e575fbccd3e9587e540a02b8395dbb71d142a6c84ef1bec725d1168e1a1ac6c14ac58011af6244829605484d13909ff486b202f9e434b9fdc09ef8b SHA512 d42df6c4a845782334ea34085564e7b0b7039e86236fdcee9586a3cd9bf2f53331b63c08b78db7d38f8ed904041a69e1b8b8de0f44c707196b33f74c56d25494
-EBUILD libkgapi-18.04.3.ebuild 755 BLAKE2B 889eb43fff87414830fb430940bbe90357414780485b0c45d2b9ae39caf3dba7d862c06c45074873acfed8f4556561e17a9c7367bb5da72a9f6b53380abf17cd SHA512 0bbc2a10dba06b6a4d19f32121ef32026f90fd5a50638ef24563409103de7f90b62b639d536dcf6499619357265cd2b48afc1bc3af64b9cd6aef0e845db986a1
-EBUILD libkgapi-18.08.3.ebuild 815 BLAKE2B 228d2cde63d65286e5958e1fbe627203bd1ad64c0b16d88ca04f2bc2766b147c3c8d77332c0f9f1a234e4925d79cd494f3bd2ac7de02d105022e848f8e20e110 SHA512 cc53e9f8085c359796127cdf343f2de1b9c4a9a7741a58753788acf4647ee45ae01b9049fc4774eb029a20b0b414970f0f184bc1ec4f0becf72febb4cc9d10cb
+DIST libkgapi-18.12.0.tar.xz 215000 BLAKE2B 35850b72cb4741554cb59cf8af1f05aff86a524dd8fa7c258f9e99ff56eb9f5d131924cd14f9d234fd790b45008478cc3ff19c5b91e95b0a93cb26b9ad55c1ff SHA512 1567d25103a120c4639926317d68f8f119fda4c003d896a47f834a0628dce0a61e64f70073976e3da2ae8abb714081aae13e882ceb3150d23b1b763d094296bf
+EBUILD libkgapi-18.08.3.ebuild 813 BLAKE2B 5dde628bedabefe6499e9d715e7f072243286a81af4a4f233e70010bbd173d842fb7280e6d4a7ac7c6305405ae241022a2176be7fe7a5527795779886fb67d20 SHA512 7fd8bbad015d23fa38a7f3cab6afaa2b383c1582a736ea8577f1888cf241913521ff1d8c1d0defd458a4792ecbc01e8d186420fa267575f5c5a7959e48d59ea0
+EBUILD libkgapi-18.12.0.ebuild 815 BLAKE2B 228d2cde63d65286e5958e1fbe627203bd1ad64c0b16d88ca04f2bc2766b147c3c8d77332c0f9f1a234e4925d79cd494f3bd2ac7de02d105022e848f8e20e110 SHA512 cc53e9f8085c359796127cdf343f2de1b9c4a9a7741a58753788acf4647ee45ae01b9049fc4774eb029a20b0b414970f0f184bc1ec4f0becf72febb4cc9d10cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-18.08.3.ebuild b/kde-apps/libkgapi/libkgapi-18.08.3.ebuild
index cb1e7727f859..8d1a9418730f 100644
--- a/kde-apps/libkgapi/libkgapi-18.08.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-18.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for accessing Google calendar and contact resources"
 HOMEPAGE="https://cgit.kde.org/libkgapi.git"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 COMMON_DEPEND="
diff --git a/kde-apps/libkgapi/libkgapi-18.04.3.ebuild b/kde-apps/libkgapi/libkgapi-18.12.0.ebuild
index 8a625686a4c9..cb1e7727f859 100644
--- a/kde-apps/libkgapi/libkgapi-18.04.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Library for accessing Google calendar and contact resources"
 HOMEPAGE="https://cgit.kde.org/libkgapi.git"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 COMMON_DEPEND="
@@ -25,10 +25,12 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl:2
 "
 DEPEND="${COMMON_DEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.07.80:5
 "
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index e8b1a3a212a2..f434a9a334e4 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
-DIST libkgeomap-18.04.3.tar.xz 150240 BLAKE2B 08d712df6c6d49eb82b21ef4fdff3b6c601f8b289167029c5c673e379e17fb904aceeb36062d437c1e4c5285e8b73a0df8d5485465e228fd4454847df818c3d9 SHA512 37ef1e70742c11e074cea9dab9d96e398637819ad87f6c422c62fab963bfb128c6fab49422135790fb09d2c2db6e920a9e1fccd5c901b460fb4afb567c65e0c6
 DIST libkgeomap-18.08.3.tar.xz 150976 BLAKE2B e9e7c85e2c4711fb6a68829644de2e99b47c417f915cf734928da1d93590a2b61faeef4b895d970c403dc40e844274e73204ba4fb00164fb295d13a43cd442e0 SHA512 d7b014085ba2a89d77802202878c58286307c20c25a024d748aa1271b61c7f31ade7e066f02bf44f66fbc6ab85f5cd176e09a21fbca45a3095096b4cee9ca275
-EBUILD libkgeomap-18.04.3.ebuild 774 BLAKE2B abed07263428ec8dc362d01d70e992a05d9fe46fcca1649c5f279f84aa78cdc8ab14188e6945179449e42c588766c323129f6854e4f1c7310f7858c62dd72c74 SHA512 98576e08eba5a37853eb64bc01c523f615eacbd2a3fa008592cdec9c94c19e06a6e0763b5d3203f490653678d5496407008d2134eb567e630d2cdaef5820f7bc
-EBUILD libkgeomap-18.08.3.ebuild 773 BLAKE2B 192f6d06d438f986c996eaddebf8e2772e64117628848da2a2ae2bc760341b820c0e964f3af4f371954b0e4d5209f7c2fd1fa279428de1631eb4873e13e3e9fc SHA512 5a43e8063ec37ad0cc9d070a833f87ba06b010cc9bef638fbd7c44a1507091439328a768a7bcebb4513a4c8f46d99632cd358c181c829eabb4700f7c7cc5aa6c
+DIST libkgeomap-18.12.0.tar.xz 151164 BLAKE2B ed83f92021363c1538b8501efc1b4a90f671a1127ff6f5118e61fd8a63fa8576d31ff96b42a5929c10c86e7ff18de6af8fe799152fb593983216fc886c336d84 SHA512 26cc0e96dafdae906d5f30a4e06cf39ad97972785064b615171124c38f006c9e8828c3ed5bba42afa85a7d7172cbd70c2878b60f77207349e43c3620848727a0
+EBUILD libkgeomap-18.08.3.ebuild 771 BLAKE2B cac391cf6f4e71333afec08c058f2370a24bcc15814ee731459de82c3851dfe866287b0f6f4031e8bc666890ecacced152f005901de99f34a897b28ce2ce7b37 SHA512 2a773f41e6b060a8893b96a2b9500ddab74e20f7ba57153874db1f1f3f3d16e7d95f6aa8d7e7502c1b07f6e5afc7e2995b0c7e99deb3bbd115016268f66924dd
+EBUILD libkgeomap-18.12.0.ebuild 773 BLAKE2B 192f6d06d438f986c996eaddebf8e2772e64117628848da2a2ae2bc760341b820c0e964f3af4f371954b0e4d5209f7c2fd1fa279428de1631eb4873e13e3e9fc SHA512 5a43e8063ec37ad0cc9d070a833f87ba06b010cc9bef638fbd7c44a1507091439328a768a7bcebb4513a4c8f46d99632cd358c181c829eabb4700f7c7cc5aa6c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-18.08.3.ebuild b/kde-apps/libkgeomap/libkgeomap-18.08.3.ebuild
index c0d623de9443..666ccc69d84d 100644
--- a/kde-apps/libkgeomap/libkgeomap-18.08.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-18.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkgeomap/libkgeomap-18.04.3.ebuild b/kde-apps/libkgeomap/libkgeomap-18.12.0.ebuild
index e76edb873914..c0d623de9443 100644
--- a/kde-apps/libkgeomap/libkgeomap-18.04.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 7d96492ebb40..b05567ad31b3 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
-DIST libkipi-18.04.3.tar.xz 103600 BLAKE2B a8bcea9d85ee198eff9530d3cca2b5517db6c33d9746a3cea5e21fb651de5b13260e6ae0036f1840633b434c865d28c85cb846dda21e60a777ac3d7262811dd4 SHA512 3fa2fe8bbc5158bb1b06812ba708ce11feacacee9c9e39030bf4ef570177a8ff13962c02fddf33a6253f8db5d60805c2e1a65fc6264c7ca5d62e81abe3b44523
 DIST libkipi-18.08.3.tar.xz 103640 BLAKE2B 9396803a51994e6ce36452085434be17153ceda3bb6beeac1c4fb85b8048c41350f750b7f9ca27e6475d8307983ebf00661919baaeec289c8c00232547814701 SHA512 6cda4e56e6c879471ffd8204ef13e817a8d34b8161c6bbe66dd898f02cf215a53df8537447f7dba3fd3a812e52d62a53dd423bf30fb2bb9cf76ae32a917e51f9
-EBUILD libkipi-18.04.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
-EBUILD libkipi-18.08.3.ebuild 564 BLAKE2B 90490e716e6b9356b6b7c67199e64c32cf93127ff3ab11e5f12953b5fc0b9d977c70ffad49a85f517fb41e03c6407db0177c9044748024831b8025e4562f125f SHA512 911d8f8ea0b45b6d62fa2add532dc1026b68ff5610083c7edc85eb37b3b8cd12e9e22e4866fd15fab8a69cd967965a010e9686b8a2ff0d77083363dde82e88fd
+DIST libkipi-18.12.0.tar.xz 103444 BLAKE2B e38e2b36f1145a83624be25357693062053f9c0b845fbe04b19ab2c689d5483c51b5aa841c94a7ab74db101bd12001da92b47fd99b67fc08df05f3956850d2b3 SHA512 fed4833a7b94359b9c5ad4e920e1a68d9b421c786d4b7a123bedc0c7796667678a72db499864528683d757a1a84d38aed6144b27247507508ba5b870af6ac1c6
+EBUILD libkipi-18.08.3.ebuild 562 BLAKE2B 1266b0e79ea3bcc7b2495bd6de03dd1c891dc3c8721c9e1c414e614fc6417caaf7d5dc0535ee917ad690a8035a167a3b3a23baef6e65a6f229a7acfd7193681a SHA512 ab6ee60e04fd1347f65bbce67a7c3ddecb65b47751b435ae0784e7d3da7fbcc994cda865ee306ce5dddd8a3fe146de74077be2fb5d5baa2e67b5121941a3d1c6
+EBUILD libkipi-18.12.0.ebuild 564 BLAKE2B 90490e716e6b9356b6b7c67199e64c32cf93127ff3ab11e5f12953b5fc0b9d977c70ffad49a85f517fb41e03c6407db0177c9044748024831b8025e4562f125f SHA512 911d8f8ea0b45b6d62fa2add532dc1026b68ff5610083c7edc85eb37b3b8cd12e9e22e4866fd15fab8a69cd967965a010e9686b8a2ff0d77083363dde82e88fd
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-18.08.3.ebuild b/kde-apps/libkipi/libkipi-18.08.3.ebuild
index 8d81c5f0c2d9..96f582d5be81 100644
--- a/kde-apps/libkipi/libkipi-18.08.3.ebuild
+++ b/kde-apps/libkipi/libkipi-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="A library for image plugins accross KDE applications"
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkipi/libkipi-18.04.3.ebuild b/kde-apps/libkipi/libkipi-18.12.0.ebuild
index adf92e370e9f..8d81c5f0c2d9 100644
--- a/kde-apps/libkipi/libkipi-18.04.3.ebuild
+++ b/kde-apps/libkipi/libkipi-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="A library for image plugins accross KDE applications"
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 44d0a7950959..cdfe01e25f67 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
-DIST libkleo-18.04.3.tar.xz 318624 BLAKE2B d6a218e686994a163a3217c5a2d3beb8d471e484eb5ff917cad3d0f0a8d7ff336090a6a26beb1117dd09f7283e368d1bd91395d0a562eccbf128bb96a53ef702 SHA512 678c68fdc249dfea337f6f262da1d4e3b20482ab5c4db859a5fef04b8d544c0709e9dcb59fa33bab89a6de550c81ba14883c3d31122849c83674b3dbca00b545
 DIST libkleo-18.08.3.tar.xz 336012 BLAKE2B 26f9a7b59a88f09f71e7047a4274a80971b3e5fb220e194c0663a59fa8f5411569d8a4b4038b46dee28f7622f0167447dd9a9516bebcb225c221d30ce968c2cb SHA512 5bd2aac755e6dad05e05e1c49b83cccf8b349c9231533dc821b3ba1dcc4da3fb66f7e8aaaeebdd1c080a28d94b9646afb248b5bee44e3bec8447d1293dda5f10
-EBUILD libkleo-18.04.3.ebuild 736 BLAKE2B 9f3303689ba756680690c9760ba4a506b84dd0e08b868130113a5618fabc45ec2648cf8a3c3081a75f124e76a727dd836b8813de6b0950cc5730252e2b62bf7b SHA512 d1cc5597530ec2f1dc6d986835a67aea42a02cf03e4c60d1c893edd4a68fc253c3a06e9bc155a66d8f2e33862ee4657be279a6560e8a2262364910497b3b2366
-EBUILD libkleo-18.08.3.ebuild 735 BLAKE2B 00df41060874d558ddc74020b58a49a39e2ab2d96910fc8f5538ef6096f928978012e5a5e30fa549d5e0b33c8d2428e3898ce5d26744aa012e5ca2a811646aca SHA512 0277314949c09a8bfcc190a8846088638f8b35edd9048df8af7a8eb269d42af84e6f84fe5a7785cf6f53a358ff027b8c3395fbc188e9a12e278b26b127bd4463
+DIST libkleo-18.12.0.tar.xz 332952 BLAKE2B d16b9483752260e51ea0d4bd17e4bfd4203fa5afc65225da87f22cc30551dee4ab428552e6351c42cc607b31194c29c4e08bfdedb6682f3a96d7c96fd5a50287 SHA512 4569bb0c954235760b1803d56099a4ffe1d2e4e12d61a2e9c2a59bc36aee1cc06e7c16bf6a367e75a9f40659ad3cbde4eed76c0526bec27012ebc196613bc931
+EBUILD libkleo-18.08.3.ebuild 733 BLAKE2B 005224c0d5f5743cde2bfb6a54bee3893f909dc6f99206f9e3da017d11604368b3abbb5d60a2c0637788e162adc1c615f67a80a8f2120ec8104ad4212321fa7e SHA512 5b871b428b7e7e09457cd0bd0da5a87a05b20f35100ec583164727e6820186298d80cd10ed64fae506029dff094152b668a9f3f9783eb585b5a57208b857d1d9
+EBUILD libkleo-18.12.0.ebuild 735 BLAKE2B 00df41060874d558ddc74020b58a49a39e2ab2d96910fc8f5538ef6096f928978012e5a5e30fa549d5e0b33c8d2428e3898ce5d26744aa012e5ca2a811646aca SHA512 0277314949c09a8bfcc190a8846088638f8b35edd9048df8af7a8eb269d42af84e6f84fe5a7785cf6f53a358ff027b8c3395fbc188e9a12e278b26b127bd4463
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-18.08.3.ebuild b/kde-apps/libkleo/libkleo-18.08.3.ebuild
index 208b8b525845..fa9cad25bb54 100644
--- a/kde-apps/libkleo/libkleo-18.08.3.ebuild
+++ b/kde-apps/libkleo/libkleo-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for encryption handling"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/libkleo/libkleo-18.04.3.ebuild b/kde-apps/libkleo/libkleo-18.12.0.ebuild
index 6da54a9c04f2..208b8b525845 100644
--- a/kde-apps/libkleo/libkleo-18.04.3.ebuild
+++ b/kde-apps/libkleo/libkleo-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for encryption handling"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 220db5409193..c87c798defdb 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST libkmahjongg-18.04.3.tar.xz 1683728 BLAKE2B e821c23da691408b9f6c5fc8ad222317c497a27f221030e830201bfb180ac547269b9a2a4b095b7fe5535aff2ff9fba4c143eb4fd5ddd1ea349870f708b0ffef SHA512 f8ef97f0bf5fbd8c1dd923b26c42138f317a8b87df50261318ee438f29d53a99aceaaf077e24b36ab46e9f564761dcf389160cc657c6bec5ddf1c1ff3eddc87e
 DIST libkmahjongg-18.08.3.tar.xz 1684004 BLAKE2B ad3e6da9e0c7170a7998ffd7c30435293300456df4ecba4717ab60bcc6e49494973ae96b60d5cd5d571a4ea2528f974913f34a48002eca852c351efe2308e9fe SHA512 655211a0e79d5671bfc9579a42c70f11c32b322ed987635ec1e2f35ed9a5e24ceea73619dfdb30db8d1c0b0e197314a2279947149819c812013bc3f51b86d15f
-EBUILD libkmahjongg-18.04.3.ebuild 546 BLAKE2B e57ea6057346bd3e9da580787aa6687cc0a81c075412c2b10d5fb4e6eb06bb5e8158430e71325f0ded62c2bdc14088d6eb4d015e198b6a71e46edf5c9faa10e8 SHA512 d3ff2d9cba4ab97be8ef283af7b2e2c140d86a9a36091806d6723779b7200027e16fa5f9f7dd4a452f8484e800105af77c3cf1c5820d9bf570eb077b2253c9d1
-EBUILD libkmahjongg-18.08.3.ebuild 545 BLAKE2B ecc3a913147fe120c67f790f6901d04d0ce7f7102c1d4c709f326a77dea7d0a755169a871bdbeb481b5ca1ce3c03f7b50395ab5a5c1f006834433febd8e8e62e SHA512 98ba4acbbb730a24274cb507d85be2d6b00f96292e70d08c3a8958af347b8400bdf4248270315618dc09fddff5b00c42e3df12071f87befecddedda739b5603e
+DIST libkmahjongg-18.12.0.tar.xz 1683336 BLAKE2B 308305b13220ce4ac4bcc55ea0dc9e1b65ae2297698c709e6deef9ed5000e5c0d82ee1a854ef85ee9b67fdfef50480c0eda9ea32ce552b3e5d0928837d135bb9 SHA512 3ea223d166d0505f9d7cd41a0210df595fe02d4c1f70520744b678d1fcfff940124c43ec3598757ba43c405444530a564d10c948b3accc819d601b8817c884ec
+EBUILD libkmahjongg-18.08.3.ebuild 543 BLAKE2B f70ed51b66b858017a7fa7d2784bd83b87e87f4e31b6d8e6ce2de691c72aaca3ca477538ed91974c53b9be149f11f0d735fb0cf020e2fe1470561672279112ef SHA512 b3533f32a7bc83af0560663aa0a103d44c5ba7ce2ad0eec6a2e7aeda7cecec6076f48bb9fa0d96571a0d2ca6398d759af63dc68eeaad2c09e1f006b6b9146ad5
+EBUILD libkmahjongg-18.12.0.ebuild 545 BLAKE2B ecc3a913147fe120c67f790f6901d04d0ce7f7102c1d4c709f326a77dea7d0a755169a871bdbeb481b5ca1ce3c03f7b50395ab5a5c1f006834433febd8e8e62e SHA512 98ba4acbbb730a24274cb507d85be2d6b00f96292e70d08c3a8958af347b8400bdf4248270315618dc09fddff5b00c42e3df12071f87befecddedda739b5603e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.08.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.08.3.ebuild
index 34598d762dda..f35b891789d3 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-18.08.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.04.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.12.0.ebuild
index 8de9b83ae94e..34598d762dda 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-18.04.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index f8ed984d2dd1..4da069faa181 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
-DIST libkomparediff2-18.04.3.tar.xz 176752 BLAKE2B 7747d0332220f7459b735b2d1def2ca6bbdf80923530164d447795e8a3a1e01673661e1918dcfc11a8b8081ec8157990bdc53758455332c9ad92e6b1cf7cca24 SHA512 ad8772a7f1aa85b3c0d5e6fa7720df1399f7dbcc84a5be23da1a65106e139dcd8006f7c99975e07f8b8b1c8d706a89ac4718f10569f419c15e54835dd8e41931
 DIST libkomparediff2-18.08.3.tar.xz 173644 BLAKE2B 4d158b886786455dfe098df469361dba9e6a18ac965a8e522ea23719498fc67dcd7f77cb155880a6b5a0f0bac48da286ab34a07c9e9bdc7cb316d6a44a454978 SHA512 670c06b2179ae4402a9e80ed88262d1ec6d7b8b3df7b5489f9395d222b2b428795b067c61aa2459c4dce253fe8b2733cc7eb1ce8b3aed69d290541c177f5c48b
-EBUILD libkomparediff2-18.04.3.ebuild 530 BLAKE2B d8b0ea58712bf6f90fcf89a5cd3a6674c7cfe1639c7abfcf00159fdabdd868679baf6438d03fa6d24811dee5222c11bd195996744a1776e702f71ce2f417902c SHA512 eb1e7e4ffa3bb48746d6032f6b4d08756021609cee91f1fab8aeb81ac3a9135a7bfeea3980ee8bf930813af2e7b8ecb6b9734894b92e9bd000b22627acb43601
-EBUILD libkomparediff2-18.08.3.ebuild 529 BLAKE2B 9d0fe8e96e88b2a0d5c4485e1bf9e61793ac1547fac2d65e493e25650a8d337efce1de43e6948351269879e746a00e49b9de5dd1973343d551d4c19929185216 SHA512 09a81ac4d5c476fd0988b152bf3f3959cda9b9500145d82722ed93e606687519309599b5443e3e2e5ac52dab9f13261da8d797b1890c6cf12e89db8407f98213
+DIST libkomparediff2-18.12.0.tar.xz 173444 BLAKE2B 182120cdff29d7f3247e049bdd4e28ae896b11e7a93da38d26e3e24a20bb850e0c152aead391eda665db836b48bf81c549dc368520071beb6229a71c77b3e1fe SHA512 8e5744cf37b76fed5624de9c0a8a3c6611593e254415e6fa62521dc4e585fe2337f6003c345d2747cfc5bc9e9fa392ca48aebfc4f3461b9b8ca28a9add4a4edc
+EBUILD libkomparediff2-18.08.3.ebuild 527 BLAKE2B c7400142c94985196a911383d402eae99acba5bb125e84840f3af485871e89f25648a8bfe6e20e514d499f1ae549ce44428c27139ad377e54214fc55c37d7c51 SHA512 74eb62eb88000c518a955b064f164183bbec287089800058fb49722bdf020dd8d105d6ac2bf234a4bdd46a7e30a01333eb05a145208a05b84c93317c2767c935
+EBUILD libkomparediff2-18.12.0.ebuild 529 BLAKE2B 9d0fe8e96e88b2a0d5c4485e1bf9e61793ac1547fac2d65e493e25650a8d337efce1de43e6948351269879e746a00e49b9de5dd1973343d551d4c19929185216 SHA512 09a81ac4d5c476fd0988b152bf3f3959cda9b9500145d82722ed93e606687519309599b5443e3e2e5ac52dab9f13261da8d797b1890c6cf12e89db8407f98213
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.08.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.08.3.ebuild
index bb1ae1b7b0f5..8f14a0ce31ef 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-18.08.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.04.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.12.0.ebuild
index 11867f72f524..bb1ae1b7b0f5 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-18.04.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 1b1ee950da44..e0f429ee3bf9 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
-DIST libksane-18.04.3.tar.xz 137444 BLAKE2B c7f08d7de29e4a5672de8fe588e768ac7088b204782528777835adcd5b021cb261bc421a271bcb6a2e2a18918b4c04dd396a395123a6ebd5fc3878849f8d38bb SHA512 1e9dcc5ab7ac5a8df0bd20db589da05f067e6611d19b796208fe8d08e92568661707a7e36a84e9bd361a57231652baba5ce23211aff41a7db69ff0aa3abe200c
 DIST libksane-18.08.3.tar.xz 137556 BLAKE2B bf0acd88271a70a7156802c2499eeae8bb960f480b0edc0790b8475871615918228e1a1aa6d0959b0855806d74c555ae07b94d64052180f89f4b44b72ca57084 SHA512 f2aae62e445d3cef43e2d974fd2fe080f0504ed4415b08427b65d4e863ab8e4284422c5607db987d80ec68ddc6b9fb28ad9c512fc50f2871f51f89d0d3e63d24
-EBUILD libksane-18.04.3.ebuild 710 BLAKE2B cad1599dbabbfcf697b9972b16f897064d05a6a1a4e10936f3680fa3b75b532f2e3bb11aae1a4218f38f9a0c0c2bcd23a9fb5266a190addbc642db8876254df9 SHA512 c141f44b4008aa7f9434431cb3e903943d79363cc62377a24498639f4c4268d342737052168ca6b70af9099c512cc0277519cfa51d88e10c7df3ffc7cf979d29
-EBUILD libksane-18.08.3.ebuild 709 BLAKE2B 96cf0cc91b6903ebd10b7a55cca38365e52d6ee6c2c17bf5f8387c2540a111aac3eb90305dbf47a64c3479bafde88c79658670d92d9859b43b37a22f2d310a94 SHA512 7c0a93a74dcb9981a97aedf849818cc19bf0cb46fe049db02265a867edac9c0bf9e715370eb7800e6b415cc138d2697f20fe70368b2bfb9a6625c9d453f499b1
+DIST libksane-18.12.0.tar.xz 137768 BLAKE2B d3b6afdd1bc8cf3654f10de3e1f7fd8b85d005318eddcbd7a86f76228ce6ad3e592f789bc4ba280911f013b750091e275058509497f611de99145d2f81afa761 SHA512 d351b55ac4548b36d3eebf9028f0171d564427d89789629cd19d2908b92b58bc170e35874a2d9a64ba9db375041c4b8d9ef2c8ab0217768428c9029a5879180c
+EBUILD libksane-18.08.3.ebuild 707 BLAKE2B 1e2a1d8dcab7d67635d6b81e07bdb90f2241d5a3b398f75590c39f1615fa32b16ac91d87bfee5c0cec2757aa2a66fed2d644ee788770d5bc784eb3921dacd407 SHA512 06e6b795c9d703d590003e1abbce0a80d4b3d4b1d2bb6eefabe5410a845a1770e5757a54ec36d2da41e700c795d8f1119a4ab47afcedf4315f570adff931a3f7
+EBUILD libksane-18.12.0.ebuild 709 BLAKE2B 96cf0cc91b6903ebd10b7a55cca38365e52d6ee6c2c17bf5f8387c2540a111aac3eb90305dbf47a64c3479bafde88c79658670d92d9859b43b37a22f2d310a94 SHA512 7c0a93a74dcb9981a97aedf849818cc19bf0cb46fe049db02265a867edac9c0bf9e715370eb7800e6b415cc138d2697f20fe70368b2bfb9a6625c9d453f499b1
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-18.08.3.ebuild b/kde-apps/libksane/libksane-18.08.3.ebuild
index 57b2af94de3b..a5f49aaa4323 100644
--- a/kde-apps/libksane/libksane-18.08.3.ebuild
+++ b/kde-apps/libksane/libksane-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="SANE Library interface based on KDE Frameworks"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksane/libksane-18.04.3.ebuild b/kde-apps/libksane/libksane-18.12.0.ebuild
index 02c4d343b193..57b2af94de3b 100644
--- a/kde-apps/libksane/libksane-18.04.3.ebuild
+++ b/kde-apps/libksane/libksane-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="SANE Library interface based on KDE Frameworks"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 26aad6d83255..970d6a9ddf23 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
-DIST libksieve-18.04.3.tar.xz 550564 BLAKE2B 0821a88abe282d7d1d5c250088305ae392f0eedc26d54dd727ca1e3fc42769d1e9d1fd6fbaa22f6ca01a5bc817a39fb9eba983de2463516123cc5d669fb8a4d5 SHA512 65bbf4b13d98f7e0f8f01d4f2a2f7631e8cb72c448f8c46d985d5aed7fcb33bf03dc9f5eb7b7fc57b7e6f092b2360a0ddc8a605b4a130d18a5f73aff3cca93bb
 DIST libksieve-18.08.3.tar.xz 550060 BLAKE2B 06a255a05e691d4d4adc6e3ca0cef98a041f3dbddd3a01084257a1c7a11890fca6f717970ea996641b9a849a69e181539ecebdd8304807a95d33825d72c4f2a5 SHA512 2fc52ab6e2277b5d09038b16757428ee931f5b26f164362751e71e2a42d81d6ad3aed26eef3f036b4e3adb0d28e08d9259039403439a2be813a37b5f5267c9fa
-EBUILD libksieve-18.04.3.ebuild 1464 BLAKE2B 812989087ef5e61c75a37c632fb6a11439d3b444b8fb3403f12310cd46c872b3ba5f6295b340be65717fbe55e91bdcdcd9e63904b057b956935cffbfd63776eb SHA512 27610bb20a24088bf895302ae1e08280ff9ce2681170283247a2420f150ab019f51ad9c742d4391c300533d2bb764e3db6490d2374cf939ed1536a1b109bd049
-EBUILD libksieve-18.08.3.ebuild 1455 BLAKE2B 98406b5c85a071974185467df266ca4f4becdf4b3d660c244e201850d745973e2ce244749b18af0b4a8fe8c733d99b2bed0ff235d1f8f361a3cc17cf12267e42 SHA512 9b2df81854dea9f19bddb181268ec4cde99ab250b053563050b2c9519e9935bc7a5fde07722c77842d46cfa72c2cf8da3d8226cf425548a794705ac328fbd651
+DIST libksieve-18.12.0.tar.xz 550536 BLAKE2B 66f6152caecde64b96b9c40982567eef85b433c76f750c6dcfdbda897788edb7429d36ec4ced4fa6d34c453323b0216269a2a5648a7a4647596aea1c1485cb21 SHA512 17e6b15b3048d0dfaee61d0a8bfe3e1caaaaf9111e7f536e5050a738158932b648213187a3af2938cfa2de8ac752d0f59bbf7e161170cfa53dff2501f3fdbbf7
+EBUILD libksieve-18.08.3.ebuild 1453 BLAKE2B 0b80f24d23008d8eb56a3652767fd1c9323d5e80954c8944b61e08d5abde9a0b87b8928746e179b65c27e4f63ea704738b7d04011e97dcaa4998bda283fef198 SHA512 3c6368edd5b26fbf67d67725a0c12a47e01a30f2621a2659ce80e678c779c04d2eed2d1d243fc49148c0687273a690264ef406684df8aa4b24ff0fdc0c38a654
+EBUILD libksieve-18.12.0.ebuild 1455 BLAKE2B 98406b5c85a071974185467df266ca4f4becdf4b3d660c244e201850d745973e2ce244749b18af0b4a8fe8c733d99b2bed0ff235d1f8f361a3cc17cf12267e42 SHA512 9b2df81854dea9f19bddb181268ec4cde99ab250b053563050b2c9519e9935bc7a5fde07722c77842d46cfa72c2cf8da3d8226cf425548a794705ac328fbd651
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-18.08.3.ebuild b/kde-apps/libksieve/libksieve-18.08.3.ebuild
index f4c909585471..26db34ab1c60 100644
--- a/kde-apps/libksieve/libksieve-18.08.3.ebuild
+++ b/kde-apps/libksieve/libksieve-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/libksieve/libksieve-18.04.3.ebuild b/kde-apps/libksieve/libksieve-18.12.0.ebuild
index 53f6b57f3aeb..f4c909585471 100644
--- a/kde-apps/libksieve/libksieve-18.04.3.ebuild
+++ b/kde-apps/libksieve/libksieve-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -53,7 +53,7 @@ RESTRICT+=" test"
 src_prepare() {
 	kde5_src_prepare
 
-	if ! use_if_iuse handbook ; then
+	if ! use handbook ; then
 		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
 			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
 	fi
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 8a02eaf89726..6dc6b3557aef 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
-DIST ktnef-18.04.3.tar.xz 300348 BLAKE2B f6b0498917e74b102e6996916609e80dc60f3515bb83fdc4ac8730356b47ebb1e97c5dad6b813f72177ccced00b6594c394b5650e0328aa11f0d2745079de1e4 SHA512 532bd7ea26676ca523fa1a0cef924badfef71e7ffe92eb95e8581de250b219a8efe97300dc9b80cb7a4cc777cb8c70f39f0ecb4af850db0f1214c23c87cf5c2b
 DIST ktnef-18.08.3.tar.xz 300340 BLAKE2B 2aa2157de3f10f21098430d7da4a760e2d44c15d7c15e2457f138925f36be2e666d506043ff0ee1f5aaad32f9a198ccd8ee8072ef3db665d447a7fcc78e3985d SHA512 8c783631c21ec74487eb127a5f79ea67e2575efb9c65861beea2b494cee204657f025115368cc594916fd7c2b4621f39746d0fd03c01003386331077a9496d12
-EBUILD libktnef-18.04.3.ebuild 451 BLAKE2B b0818698561127b95312c67c06dbf836f350874c1433518ede4a2f26eff96a781e1886fa14291c9e936cb95d8060563f0a30d675a7fd7fcc5db4c971a2e4abd9 SHA512 89d2e17a77c1be864b7dc9f5ae11578046754fd0550ac42668918f2838bcf29a98d7e7d9148cbc458048572b114b517d1cbe9d1adc06da168f7f4dcaaba63ebe
-EBUILD libktnef-18.08.3.ebuild 450 BLAKE2B 146ef2620ceb34cea2599ff3aa7ee40715f22ce944b72e60c2b298526609b93b3ad7869b3e1d58ca65190bf9d502ed377376a23b39451282e35a1c6aafdb6121 SHA512 d7695a33956d0e4cd09bc618d6d7edeefe8e42f01004f324b0023830d2d3f2e86fe8019dfa11468da1a7a63938da73658a41aa6e92cfb4d67fe73fc20daa6f63
+DIST ktnef-18.12.0.tar.xz 299572 BLAKE2B 03de8877129a63c4b1d83f4e3019684c4e439fcc5cbc286e600ec171114491ef999d7a6e9bb1f7d85465fc136b10f7188d2b4d49778c848f3fdec01be5344211 SHA512 5f046fbffaef99d24d4779ff196a06820832912c7cc9f1d1bc2dca8dc46ac88a16ef11374911db6ba7c123e57ca1e5d344932fee7b97ca8f8cd720de27c93f0d
+EBUILD libktnef-18.08.3.ebuild 448 BLAKE2B b1e4d79d0dd0f363e4464afc9da6c2909b9cc92dd830f44551c1c4b3c6da2488e94a56d265463959b49e1206967d9f7d44002e3bc2acd7eae7c6cea3eeb0fca9 SHA512 c392a3d9ab5f3a1308e43f4f5cb5705b2129a5a81ac2e7c085b9490a07846414e1908c7d3cbf19d06fc05fcc42ccea22cf3ba000bde0f9121cb651ab4dff795c
+EBUILD libktnef-18.12.0.ebuild 450 BLAKE2B 146ef2620ceb34cea2599ff3aa7ee40715f22ce944b72e60c2b298526609b93b3ad7869b3e1d58ca65190bf9d502ed377376a23b39451282e35a1c6aafdb6121 SHA512 d7695a33956d0e4cd09bc618d6d7edeefe8e42f01004f324b0023830d2d3f2e86fe8019dfa11468da1a7a63938da73658a41aa6e92cfb4d67fe73fc20daa6f63
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-18.08.3.ebuild b/kde-apps/libktnef/libktnef-18.08.3.ebuild
index 9faf657d2166..c3409bd8d4d9 100644
--- a/kde-apps/libktnef/libktnef-18.08.3.ebuild
+++ b/kde-apps/libktnef/libktnef-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for handling TNEF data"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libktnef/libktnef-18.04.3.ebuild b/kde-apps/libktnef/libktnef-18.12.0.ebuild
index a9739fedd47d..9faf657d2166 100644
--- a/kde-apps/libktnef/libktnef-18.04.3.ebuild
+++ b/kde-apps/libktnef/libktnef-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library for handling TNEF data"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 353c86179350..520402738333 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
-DIST lokalize-18.04.3.tar.xz 2862704 BLAKE2B d90e23be2796915baea2ee6b9e40c4bd1c737e80650b15e47d97e55fc70f4b7895478e5929223929e174249f1e2842ab98301223f6be91a4010b1ad591826a48 SHA512 888aad396535c6f81c1d2e0546eeb4033eddde985ad4e956ff95bfb4fa5e197ccaa0337f29e724175794357846efe6e2cdb7cd22ae0860469b01359ad506d757
 DIST lokalize-18.08.3.tar.xz 2894260 BLAKE2B ecf28734baeb920bf690f25fb507eccd60d73ebe69c64bcd80c04380aa213371d0bd52aeec6e745f924672c1c1c24122c9f790860ea27c8a434f6789959ad29b SHA512 d7686f2e7804f01761f7786d560270450e0cea9d88d26c8993a6f0b3efb4b8e099e25b38178e5dae3a52ebd2aaef19cba6ddb9404136947f5533f40f80abf844
-EBUILD lokalize-18.04.3.ebuild 1553 BLAKE2B 2dbb0cf7df0e481d385543cb1c9ea084cfb4520d464ad67f5e02391a624e0dc159cb9514ecda449a193ee9c20f6f5c580e0ee636762d1760d364e9e3388b1ed1 SHA512 baff4358fef9dca4e62a7fcb37c053a6a792d5a07143995b518049414ed8f162e57eae23378f25fb2bd1ee583a673636efe960fb7ba6cf7b76167735359d553f
-EBUILD lokalize-18.08.3.ebuild 1553 BLAKE2B 2e52e6597030289ca15a33ad72a2806683ee55dc2c51cb2d25e9213a0677bbf6d4de54339796998147e23449d630e1b07726636eeaeac6bbfe45ca5d028fe73a SHA512 e334949cccddd351700a796a83d8586880ead0a32fdba6b50a68c8e1fdcc2533999c8bac9bb57a865ed37512c07abd323c37fa19d8ef2dcbdedb22aeae33908f
+DIST lokalize-18.12.0.tar.xz 2714584 BLAKE2B 40c7113d3badac3cbc862ea099fc7fb087dc2d9ceb5618211f110b77275cf6baf7070fbac7dff38834747a2669f113f76e3832e11172130a8dd8b7b41ca56ff6 SHA512 30d5812e17afd2697c7fe55d16f3dd5249eef534518f561d96c80d57867eb916f4ff73b1ceed7bb30993239ddf0174dbef751a5edf966a299eee2c181f27fa1b
+EBUILD lokalize-18.08.3.ebuild 1551 BLAKE2B eb0d9934f3d1310ce6ddee617721393238e68b6f80725b95e052788a90d8952b6d0f24f5bed51e39ccc8e05fc1171d6ae6ef3f27c2709fb2c273da768f800b45 SHA512 aa368929d129a2c1b3ed8ef7186be6c85e3e306d6e702d86c430136b8dc5e09e26a5dbf6a94fc9a18ad9b9b26507bed8efea7aa27d57f53075412706abedf01d
+EBUILD lokalize-18.12.0.ebuild 1553 BLAKE2B 2e52e6597030289ca15a33ad72a2806683ee55dc2c51cb2d25e9213a0677bbf6d4de54339796998147e23449d630e1b07726636eeaeac6bbfe45ca5d028fe73a SHA512 e334949cccddd351700a796a83d8586880ead0a32fdba6b50a68c8e1fdcc2533999c8bac9bb57a865ed37512c07abd323c37fa19d8ef2dcbdedb22aeae33908f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-18.08.3.ebuild b/kde-apps/lokalize/lokalize-18.08.3.ebuild
index df43c30aacd6..f0fe472a7583 100644
--- a/kde-apps/lokalize/lokalize-18.08.3.ebuild
+++ b/kde-apps/lokalize/lokalize-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 kde5
 DESCRIPTION="KDE Applications 5 translation tool"
 HOMEPAGE="https://www.kde.org/applications/development/lokalize
 https://l10n.kde.org/tools/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lokalize/lokalize-18.04.3.ebuild b/kde-apps/lokalize/lokalize-18.12.0.ebuild
index a3d0ca17b468..df43c30aacd6 100644
--- a/kde-apps/lokalize/lokalize-18.04.3.ebuild
+++ b/kde-apps/lokalize/lokalize-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ inherit python-single-r1 kde5
 
 DESCRIPTION="KDE Applications 5 translation tool"
 HOMEPAGE="https://www.kde.org/applications/development/lokalize
-https://l10n.kde.org/tools"
-KEYWORDS="amd64 x86"
+https://l10n.kde.org/tools/"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index e1e9d6d56ed9..9a0b8c8b4d6e 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
-DIST lskat-18.04.3.tar.xz 1217296 BLAKE2B 2a4da1c93a88a1eb9058c110ea33828e463c1f063396768b8f14302f0ab67bab090dafcc7d209c287522225513dc0abdb4660993e5b05b6d8dc2f181fc75b3df SHA512 8951df28673e51f48ef2002049e34315b8102db2099cfde1d3c671fb2a332f4c44691a771ce9dcb23b46942304bb60a6e80371011fb7340e6038d887357048c9
 DIST lskat-18.08.3.tar.xz 1217664 BLAKE2B 85ab3c0e34246ea17686f3be2bbe40c92a4fdfc9f3fb38f1691d6a0028077ee9023a02dda4edde3b132083ff36d3034411d71d382744fc967cf52cf639591e14 SHA512 a5c1407cb2b53ae3e8621c5f44da8e6868f7a1f1db1b62b9c904a657249bc01f5ebc8a550f66161c7b022a87317e8bd91e35b81560802cba8fcd1d6b16b7a6f6
-EBUILD lskat-18.04.3.ebuild 796 BLAKE2B 40e1547e786609fe9e352ff783d788e6007c6f53b483f544d1f4593c10c0f0250914d036f8d6850968090f144ea3e2b2869d82fdca94d6456918eb09035b31a2 SHA512 0604573d1451f30f17b9b7a4e3668e710d2e92ccb1f450273ba52d72d4437570c2c5b53cefd08b0222d12dd0d2c5f5a0e3c8d7fe967a7f23e4651a1cd529b28c
-EBUILD lskat-18.08.3.ebuild 730 BLAKE2B bbde7591b902acb01d0db47081476fd59708add0e19add4f5bbf4575f69d4c00b3b13507496cb46480823f4b941ecdbd0424ee763696a36511d908d27b6f6d34 SHA512 729ba8076e8c41629f21c980e6cec7386701fbad4948fa25035c4d9d4be428b69bcb715fdb0fc061a06f6d33c3523098249616a94eebfbeed0dd57550f0bc8c3
+DIST lskat-18.12.0.tar.xz 1217688 BLAKE2B 2406c6c2d437246624ead24c7c801c03eb4a0ec06fcdd9cfaf43e98a83005cbdcd358e09f1a606c10d962e693cf5c68e58cafd26eb2e701b43b95af5be4cd15e SHA512 9cd3b93dfd75f8d848551f4e6575a07e680fda6577b8d5a4be615e70c49b45befa27ce7e7b2ac55cce4b36ad7dddbe92844a6a5444b5ee34b69d0d3eecb8dbfb
+EBUILD lskat-18.08.3.ebuild 728 BLAKE2B 320b7ee46d13deb20cf3d60d22a063d78a558a3dac6a5057eea4933087ee0f8d03590e99fa7d9ec29a8c9a848710f3e43607c0b52f262b89826c406b86cbfb12 SHA512 fa0209a1f0d783c08ab1996fdd910f068d0f0f9069b0f67e96f0aa818608ed1d24e6f2d867e607129534490117593a5aceb7ac44a85e25a3c2f351c3b2591d6b
+EBUILD lskat-18.12.0.ebuild 730 BLAKE2B bbde7591b902acb01d0db47081476fd59708add0e19add4f5bbf4575f69d4c00b3b13507496cb46480823f4b941ecdbd0424ee763696a36511d908d27b6f6d34 SHA512 729ba8076e8c41629f21c980e6cec7386701fbad4948fa25035c4d9d4be428b69bcb715fdb0fc061a06f6d33c3523098249616a94eebfbeed0dd57550f0bc8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-18.08.3.ebuild b/kde-apps/lskat/lskat-18.08.3.ebuild
index cc6f36064459..2591d4fdeb87 100644
--- a/kde-apps/lskat/lskat-18.08.3.ebuild
+++ b/kde-apps/lskat/lskat-18.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/lskat/
 	https://games.kde.org/game.php?game=lskat
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lskat/lskat-18.04.3.ebuild b/kde-apps/lskat/lskat-18.12.0.ebuild
index c0113157d5bb..cc6f36064459 100644
--- a/kde-apps/lskat/lskat-18.04.3.ebuild
+++ b/kde-apps/lskat/lskat-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/lskat/
 	https://games.kde.org/game.php?game=lskat
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,8 +31,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kde4-l10n-17.07.80
 "
-
-src_prepare() {
-	kde5_src_prepare
-	punt_bogus_dep Phonon 4Qt5
-}
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 5fad4e36280a..113c36d06569 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
-DIST mailcommon-18.04.3.tar.xz 692256 BLAKE2B f216b27717513fd034ebc22c392520d24379d317a383a1ede3a7b7be19b163bd104b45daadf75a2986d049d6db3695243c5ff9a5169fe5b75eb525ec20e2fae1 SHA512 0e9a815346ab4fed073b11cac2ee7d9e3612ae494e35937f6c0695e2572f7a07c17a0595274a4f806ee48f79192914506c6c6966811458cdf0b6d7420d8e0bed
 DIST mailcommon-18.08.3.tar.xz 691320 BLAKE2B 776ea337b6f2ccacbe721f1da2df68cf16a69e2bb8b1deb86d97c7420c3a5ca74618b4024c37e0709fda3d9e58e2da2b8b71fa3afb8b18c19522668d9fc57d72 SHA512 206bdef32f39d5894516964fae58020bb97343507fddc97a60aad456b4364b3bf688d6856d954594f354ec0c6acda814dd911f245b94a8269b01dde63845eb3b
-EBUILD mailcommon-18.04.3.ebuild 1439 BLAKE2B 6afe7626b6cf19240d45ffc4057e3be1eb77b2b15cdba71255b01de6a9c36dcf0f805efde511afa09c38ba1b6562c52f263b12883be15a3fb932608984cd03ab SHA512 9f535e7696aaaf7395ddad6927bfe3e6ebddeceeb6ddbbe37511427a722179850d251646959958e6682055b62f9760d1f803e3bfeeb67a2da0c200b970907667
-EBUILD mailcommon-18.08.3.ebuild 1438 BLAKE2B a13a1853ce23f61a75b0b5fccf5ac93d6205339ea9bf7b7063bcd531454670ef05d7136556067244f3704108ee2569b6905175855699a13e4064df21d9e7d5a0 SHA512 4eca3d74cbd02f1116deda15e9825e611cfa38a30ad31160b8374a8d4200578f9a1f2b1872d506c7f08202299c1fb55729755ef3851f6401f6acfb989c456aea
+DIST mailcommon-18.12.0.tar.xz 693348 BLAKE2B 5cfb59cb8ade4a9b32648071a8b5ade614ef4a6ed7aac1d49b0cf4d89b8891d5302599daf7004e905c4c3c7535313a7438847b2b2caac729a5096a245ea00d99 SHA512 4684c343acd131d8bfecb7285564c2e113edd6d7a814f39dcb4d4797524e14fd2ff1a73dded02f2d4a7aa1863c799c9a3d474c5d989564ff70201756b8c33823
+EBUILD mailcommon-18.08.3.ebuild 1436 BLAKE2B e335245533625057464f9f756a52dbe3e444affc44d8d52a6daba864cf10d25938076daa48ef3abd2077984c8ac23a3faaa9d04d49b6d5a79a8451da79303eaa SHA512 15488013725b82b4fafe8b8135acfd6a9c3254e47e78ccde1c5b02318ed17753ccd261b74125ee19fff2b206b7a076b60a66ced30ba8047ed5f729ef522d329c
+EBUILD mailcommon-18.12.0.ebuild 1438 BLAKE2B a13a1853ce23f61a75b0b5fccf5ac93d6205339ea9bf7b7063bcd531454670ef05d7136556067244f3704108ee2569b6905175855699a13e4064df21d9e7d5a0 SHA512 4eca3d74cbd02f1116deda15e9825e611cfa38a30ad31160b8374a8d4200578f9a1f2b1872d506c7f08202299c1fb55729755ef3851f6401f6acfb989c456aea
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-18.08.3.ebuild b/kde-apps/mailcommon/mailcommon-18.08.3.ebuild
index b8bc39886227..f2264be37812 100644
--- a/kde-apps/mailcommon/mailcommon-18.08.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common mail library"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/mailcommon/mailcommon-18.04.3.ebuild b/kde-apps/mailcommon/mailcommon-18.12.0.ebuild
index 73f5cc14a82e..b8bc39886227 100644
--- a/kde-apps/mailcommon/mailcommon-18.04.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common mail library"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 939d3abde6ff..0bf563673145 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
-DIST mailimporter-18.04.3.tar.xz 541376 BLAKE2B 7a2bd20c220a529642b73f807e11d703cabc9d8cede9d7234611a1e3b63a8aacbbd80e68bd643658db3df82388b474834ee1bf212fe31a908c0089d91b5a11ee SHA512 43428107fafd7c1888249fb77593d1d4476326c2aa31eff5ec5162d042379f2eb92905acbf829955142b3cf6eb191e0f72e5d34725d29c013488bdb334217fbd
 DIST mailimporter-18.08.3.tar.xz 540724 BLAKE2B de0c77c5a48c607b5c08c1c1e2bcd2697303e1fee48547dd68a14302917bfe1768ca37a70df8d4b9b7b86e20a041320cf181c6acb33d008f13c52c3df115653b SHA512 d2ba934c6c32b66bf3eae6a2693215d63daa31cbc0807226779db3d70fc5599c5ada3e17d1835d66380c67d084c76f5eb482700ac7a94f09cec2b40ef02e051a
-EBUILD mailimporter-18.04.3.ebuild 652 BLAKE2B aaeaf5851aff5c9785c614f4229218af0597bae46c8ff3071037df37037e9d494981209f7b2ce9a8ebc95260e40097860ffba31f915f0d5edfe82a25a31e57ea SHA512 6f7383f6b8195bd05773c49ebcaf97d6dafcb3241694dc5416b294e5e6659b03b437ed39688c8015ad7766fa85e97a1b4201d6229644c89c17d572be46c62861
-EBUILD mailimporter-18.08.3.ebuild 651 BLAKE2B 4a9714114fcf5dfa818b0fd8353339bdc1f8f7b68819d020cdebea6558662d2117f2a4fdb336aafc7217dc02a1e67c1a11416d7c1d0be169db4da25c26ae37e5 SHA512 08a331abce4782555bf77b70e52553dd336a2b125e656b780a48917fdec67f8a0d0b911ecd7282cf62a3808427575b8a1a026b9a48b2bfbdfe9efa88ec56f97a
+DIST mailimporter-18.12.0.tar.xz 540688 BLAKE2B d54f647e18c2f7538363503f4da8e4edcaa6ca6c7500652bdf6ea9f098df945ecd92640ad2a21a6d82958a3f6735a74885e724316f13d2fbbaed061146bb1a2c SHA512 4f6a282dae9ae611a8582a45eb226882172054539b0eec82e18522d6976b89d24af87371d6a69f9161c3cb6034ac6919403b455b7b7a4ccdaa0cc94362479a59
+EBUILD mailimporter-18.08.3.ebuild 649 BLAKE2B 2dc83917fa757ec939899020f64d3af255f0c3a655b5756d4ab351c9c96d6f658cdc4069fa120f60dcb32ab6902c49111f36bdc3eff8fdf55f8fc9fbe4ec077f SHA512 14ab8e873981704ca9e6dbf976c1028d2a5699e91dc94ab73d1029b7a392d1e38131b4915c5b929bb8aa745c425f859061855801c48aec71168492d37936fdae
+EBUILD mailimporter-18.12.0.ebuild 651 BLAKE2B 4a9714114fcf5dfa818b0fd8353339bdc1f8f7b68819d020cdebea6558662d2117f2a4fdb336aafc7217dc02a1e67c1a11416d7c1d0be169db4da25c26ae37e5 SHA512 08a331abce4782555bf77b70e52553dd336a2b125e656b780a48917fdec67f8a0d0b911ecd7282cf62a3808427575b8a1a026b9a48b2bfbdfe9efa88ec56f97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-18.08.3.ebuild b/kde-apps/mailimporter/mailimporter-18.08.3.ebuild
index fe7ab6f7ccda..c648fe433fbe 100644
--- a/kde-apps/mailimporter/mailimporter-18.08.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to import mail from various sources"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailimporter/mailimporter-18.04.3.ebuild b/kde-apps/mailimporter/mailimporter-18.12.0.ebuild
index 3d74eb52e527..fe7ab6f7ccda 100644
--- a/kde-apps/mailimporter/mailimporter-18.04.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to import mail from various sources"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 813552791041..ab5866b37dfd 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
-DIST marble-18.04.3.tar.xz 52432816 BLAKE2B 103aadfd9e9e940b6c090f124f29464925c2e5f6adefbeac476ea5f8fc5c5eacf9af4171959f6a17d6d7fd5d287b2db8b246a08d0af045c5529f8eb92b566744 SHA512 26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704
 DIST marble-18.08.3.tar.xz 52419996 BLAKE2B 3b591f4feb4614dccc477bc22b67b4e00ba4a499f63d4cf74d38f98f23094018578793fe93f6e393003ad3bd9ac8ba934b665522e8fe75bf9e48ee92c8bcc238 SHA512 c719f78bbae194760ee41ef8926e88edf727089857949ba40dfb51f1e87f640c3553e1a32e5c04757b705641c354009ce0e0fed3ed31d01eea2005686df0d5b9
-EBUILD marble-18.04.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
-EBUILD marble-18.08.3.ebuild 2245 BLAKE2B 48d674dc5e2ddf57ffa1baa0ca42c6899c9c4caa84daac747db2f4a13fadeda529915dfbe620db3be4172a15fcef29a7898f5c3673b21ca14524e88ddc040736 SHA512 247722856d1efe0f63b0d82040f270dd40b686d58c3556c2c0048812ee252915af7701afb80c45f27b09569156f01340ac3001e9eb8e60500a3b95a1f2b7dabb
-MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
+DIST marble-18.12.0.tar.xz 52415644 BLAKE2B 64a1f229caab03bc1aefdb7dd63a9fb5114c6656a849dea472a586f45f4cebe9ad44c9095aa1c9b1c0b1930af5bdc35f2a77ba4d712fa8959afadb841db1333d SHA512 4cb13b6d4a51d0af6428ce60b728e20e6b6c9f861d27de81aaf258815e7f8114a5571d19a80fb6ebc703cd1e6ac03a2b7e79218f832bd8188a3734b1cadd6360
+EBUILD marble-18.08.3.ebuild 2243 BLAKE2B 4ef171f5aa0fb4b1d28ab9fe80d2ad1763680501255569898e235ed777216e5f8e5240d7d09d24953622644e00edd85069bebb8a5a5844b514e9dc6b0c6c6760 SHA512 8944e1a251ed5f80c14c45a4bd11fa3c8d5c4b9003798222231ae9cd63509b9d7b8bd9f7d1063673fcda1c5a686be4c090f3507d8dac88ad4eb6fd098c6c8a16
+EBUILD marble-18.12.0.ebuild 2276 BLAKE2B 8a175e46d53d7c9c682c65cbb05569ca50cd25ae4452e054689415abd00aa0d0f2b7c9864e7b94075dc007a20522ecd963c563b4fd04ff23af5d6d04c98cdd4e SHA512 b88ddcc0d17867436cc45014b60357c432cfe32b42afc3cd0767411fed79a6b917fb482e4f1e4c88b9e9a97e0a229c9e8c6b3be3c78f6ca71760b2387eb69163
+MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-18.08.3.ebuild b/kde-apps/marble/marble-18.08.3.ebuild
index de3a74c8f668..68e525d428ca 100644
--- a/kde-apps/marble/marble-18.08.3.ebuild
+++ b/kde-apps/marble/marble-18.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
 
diff --git a/kde-apps/marble/marble-18.04.3.ebuild b/kde-apps/marble/marble-18.12.0.ebuild
index a962ad299e6c..f096e9a87d5a 100644
--- a/kde-apps/marble/marble-18.04.3.ebuild
+++ b/kde-apps/marble/marble-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,9 @@ inherit kde5
 
 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
 RDEPEND="
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	phonon? ( media-libs/phonon[qt5(+)] )
 	shapefile? ( sci-libs/shapelib:= )
-	webkit? ( $(add_qt_dep qtwebkit) )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 "
 DEPEND="${RDEPEND}
 	aprs? ( dev-lang/perl )
@@ -76,8 +76,8 @@ src_configure() {
 		-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)
+		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
 		-DWITH_libwlocate=OFF
 		# bug 608890
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index 052f511a6982..565eba075334 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -8,7 +8,9 @@
 	<use>
 		<flag name="aprs">Enable support for APRS data sources</flag>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="geolocation">Enable position information via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 6f6fa11b2588..4c9dd9dc901d 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
-DIST mbox-importer-18.04.3.tar.xz 33656 BLAKE2B 94febc2a7a72db0a5fb9956247e3debf312b0787765f0712c2ac5f364b85cbce05c970343b5fad2b3fff96b69c2e5ef98068a4565f39a065f482e2a91a371988 SHA512 afe51f226326a9b94e81dd65d6cd0fd9ac6e5dd2a50cc6a8ae2b856bec371c8739b375ebf150fb778a76f1d62f175dc80fa9260655d0a9d964fbbf874d9da241
 DIST mbox-importer-18.08.3.tar.xz 33588 BLAKE2B 8434c5cad6253c5e0e916410ed03f6faefce7e5e31970a624227a6b53a0ccbe6e5064a9e8008903b1066bbdefc4c9e1faf55df5e50899a4b16ae1d8262514510 SHA512 c8b480ac2dadaffedca941eb6457dc61738e6c1315a4d92e8a62db2b505ff55d19b3d9b1fdc32410f89181c430b810987973a4ee982fca73a2af2009695182dd
-EBUILD mbox-importer-18.04.3.ebuild 825 BLAKE2B 11afb1b2de82dd61e9d11e97ce26ae6bb992e7258a35e54a81af71a0007a377f31e0c26ca4bba99cbba271788b817f911fa4b49806d189527343aaa0e545c592 SHA512 bcef7a6cf789a20310b5de726944689465a4bcc1263b0f65f4c3f8463834ac1e9fee9024745ed1b0a364b05a2edf42c517f687681f6158bcc3a1ad36cc71a8ff
-EBUILD mbox-importer-18.08.3.ebuild 824 BLAKE2B c9320465fcf6372c7656e35941e7c8f3cd0dfd45f89a8bf4273495d9941e7f725ac60bde240262711cc0a8369b2e4680824505f397cb6c70e3ca31b421cfbb18 SHA512 1cd3d604e8af9283f22d1b241c44932a1daba54bc779707571ce690422ca42e8a48bc9219dab4a7157e276872b8ff5350683455698efa6cd4f382374db96b263
+DIST mbox-importer-18.12.0.tar.xz 33364 BLAKE2B 721d216c55b44e35cf56485927d2efeafcf53933aeebd5aad88d6dd95bd4534ae3dc7958aa2f2f9d8aa65f84e4e69c648479315ccd13cfd29f99aa6c21017001 SHA512 a019f62d35e4580cd2a6d7987d42714f2507aa8904104a414291209f7b781066dc9820e75f2658ad7fe660e334ee59eeb17d93dcc3b2aff6a9a5a83e69a9bcc0
+EBUILD mbox-importer-18.08.3.ebuild 822 BLAKE2B 78eef854bc2d83287163a4c66965a113305ef15477c2334c5e7129a790911dc78bfb57948599611c605756866a52017bf7089d188dfafb76adba47af8c787188 SHA512 54236996b8067085c1672c01388984686193ac73915f6d33d660ceac160b4403c749c6f4fff33f6d383c898f2f135efbcd57b3d12f0abbfc052636741ffa477f
+EBUILD mbox-importer-18.12.0.ebuild 824 BLAKE2B c9320465fcf6372c7656e35941e7c8f3cd0dfd45f89a8bf4273495d9941e7f725ac60bde240262711cc0a8369b2e4680824505f397cb6c70e3ca31b421cfbb18 SHA512 1cd3d604e8af9283f22d1b241c44932a1daba54bc779707571ce690422ca42e8a48bc9219dab4a7157e276872b8ff5350683455698efa6cd4f382374db96b263
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-18.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-18.08.3.ebuild
index 126c640f4148..29d4fb6f5c1a 100644
--- a/kde-apps/mbox-importer/mbox-importer-18.08.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mbox-importer/mbox-importer-18.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-18.12.0.ebuild
index 476a85c1e0ba..126c640f4148 100644
--- a/kde-apps/mbox-importer/mbox-importer-18.04.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 6b36ca2c5c99..2876dffeac94 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,7 @@
-DIST messagelib-18.04.3.tar.xz 10461448 BLAKE2B 812f5679a6bbca72da39c980ce10581b96cc844a7c38b87a9d5ea5eb6b6ec58b26b561fd4abdd782d39012d314aa0a5134683454a604ba28a1cdd301ea53f25a SHA512 4aed5990ccb9f5f1fbe5b6d71a63a2ec2f342a7eee81953417f3ab9537200fe66f95d742ffd6ba4f2a9f794b0b119db2e3f3d0766344c8459e1b23b043f11fce
+AUX messagelib-18.08.3-CVE-2018-19516.patch 1088 BLAKE2B 720f3c72fe0e02b68c2d84a0b748dea6bd992ecdd52f40a0e7d5b6955322539db08ab7b4db2a4276f41d831160d4821cfd7460dbf3122fcdafec78bcf6edff90 SHA512 bcf557ea46ab6ed277a3730eff5560912ab0c55dbf48a8a8cb953916c6af887b9d520cb657a3cd6904d67133cf9a4ec8c99b69b9e1648f3b326d46f51d96e075
+AUX messagelib-18.08.3-newmail-crash.patch 1100 BLAKE2B f3f566f1fe5541d5ac4de5193893696cfce8552058300684ae72f28655062347eba83d5f739cb9edfeef6bd4611586df3bcaa7489e3018b405b825334a4a6bc1 SHA512 10775b6ea3cf6cf144aac6214a192bad891f7cfe44e6c373c5da6ca5cb2b1a532b189a569a2a48127ef569713af3fc040d62ba31968a476a83ad7b712549a955
 DIST messagelib-18.08.3.tar.xz 10417308 BLAKE2B 7b2df9549c5b691dbbf902fe9fc74978d1904d7c4e3c64f67a731cc0ac7590a46e9adb3475ad8324c4752a09e2e8a7626bb9e620aefd4f7ad0b0074d8d3fa4b0 SHA512 b7e26a9588c82ee6840602e712e46394b236d65eec55ced005fe5db2c375f99ad684c0e3c4a50e80315db346def9a86b56c403bf084e3face5e29ef7f2eb028b
-EBUILD messagelib-18.04.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
-EBUILD messagelib-18.08.3.ebuild 1899 BLAKE2B 29d1da4b1d45a544ed77e9093c9b8c1d23020fd1f9f571f7365fd6aa4b693fafc7c207b38faaad4570ffcad10b7d40345090000cb91c9e35f9cf6635e792f087 SHA512 06af0f8e792867f2267cba4ea79d0b4c99f8f2142832d0af616584c26f2bed2f875ba4a60f7dfe73878a24e0ebf1d80f1b8f4c1d628a69d38dcee19b5a11b38e
+DIST messagelib-18.12.0.tar.xz 10428548 BLAKE2B 4c85c1c05ddd3f6fec2cda830b0501589b2ffa5c59b7d650c175d1599169d0d4126ede90f6658bc2930881943de637b5fd1fded111bd37aaa8f256d54c044445 SHA512 71893c5f2aa60940f442854565ccd11a8e2463565d539699b4227d846469286800f671c2adc2c875fcd83c3a8b83bb7037b2b4670b5cfe7b12d7e3e651f95f33
+EBUILD messagelib-18.08.3-r2.ebuild 1990 BLAKE2B c84bc610f23be28f887e0f890b086e5247b4739d35edaadac650b0cae2c284a03ce23e1556537b1b7980aadb725d8962569c9a969378c39272cbed5dd9fe5ed2 SHA512 a6a1b031d1fa88774a1729d00b238063d476b45c95295dd9c71d79988ae09beafb79cb894fa9b170126deaa76d4690e47bddce8181753eb388e34c142bbd0ba9
+EBUILD messagelib-18.12.0.ebuild 1899 BLAKE2B 29d1da4b1d45a544ed77e9093c9b8c1d23020fd1f9f571f7365fd6aa4b693fafc7c207b38faaad4570ffcad10b7d40345090000cb91c9e35f9cf6635e792f087 SHA512 06af0f8e792867f2267cba4ea79d0b4c99f8f2142832d0af616584c26f2bed2f875ba4a60f7dfe73878a24e0ebf1d80f1b8f4c1d628a69d38dcee19b5a11b38e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
new file mode 100644
index 000000000000..21108ae1fb6f
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
@@ -0,0 +1,29 @@
+From 1fd737870f5a9c5bf44ad9fbd153ab4cf44e135d Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 23 Nov 2018 07:37:02 +0100
+Subject: [PATCH] Exclude Refresh from MetaData (Not necessary)
+
+---
+ .../src/messagepartthemes/default/defaultrenderer.cpp       | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+index a7ffe824..d5d41cf6 100644
+--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
++++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+@@ -308,6 +308,12 @@ QString processHtml(const QString &htmlSource, QString &extraHead)
+             return htmlSource;
+         }
+         extraHead = s.mid(startIndex + 6 , endIndex - startIndex - 6);
++
++        //Don't authorize to refresh content.
++        if (s.contains(QStringLiteral("http-equiv=\"REFRESH\""), Qt::CaseInsensitive)) {
++            extraHead.clear();
++        }
++
+         s = s.mid(endIndex + 7).trimmed();
+     }
+ 
+-- 
+2.19.2
+
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
new file mode 100644
index 000000000000..f80f8201effa
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
@@ -0,0 +1,29 @@
+From 32bbd45cdbbb8c60105ced80debab1eb6ed40226 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 29 Nov 2018 09:21:24 -0500
+Subject: templateparserextracthtmlinfo.cpp - deleteLater in dtor
+
+ack'd by Laurent
+BUG: 401337
+FIXED-IN: 18.12.0
+---
+ templateparser/src/templateparserextracthtmlinfo.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/templateparser/src/templateparserextracthtmlinfo.cpp b/templateparser/src/templateparserextracthtmlinfo.cpp
+index 72dddbd..c99eb0a 100644
+--- a/templateparser/src/templateparserextracthtmlinfo.cpp
++++ b/templateparser/src/templateparserextracthtmlinfo.cpp
+@@ -31,8 +31,8 @@ TemplateParserExtractHtmlInfo::TemplateParserExtractHtmlInfo(QObject *parent)
+ 
+ TemplateParserExtractHtmlInfo::~TemplateParserExtractHtmlInfo()
+ {
+-    delete mTemplateWebEngineView;
+-    delete mExtractHtmlElementWebEngineView;
++    mTemplateWebEngineView->deleteLater();
++    mExtractHtmlElementWebEngineView->deleteLater();
+ }
+ 
+ void TemplateParserExtractHtmlInfo::setHtmlForExtractingTextPlain(const QString &html)
+-- 
+cgit v0.11.2
diff --git a/kde-apps/messagelib/messagelib-18.04.3.ebuild b/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
index b030a12737fb..ef7a91078b58 100644
--- a/kde-apps/messagelib/messagelib-18.04.3.ebuild
+++ b/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -60,7 +60,6 @@ DEPEND="
 	>=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
@@ -68,3 +67,8 @@ RDEPEND="${DEPEND}
 
 # bug 579630
 RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-newmail-crash.patch"
+	"${FILESDIR}/${PN}-18.08.3-CVE-2018-19516.patch"
+)
diff --git a/kde-apps/messagelib/messagelib-18.08.3.ebuild b/kde-apps/messagelib/messagelib-18.12.0.ebuild
index fd87e77d18be..fd87e77d18be 100644
--- a/kde-apps/messagelib/messagelib-18.08.3.ebuild
+++ b/kde-apps/messagelib/messagelib-18.12.0.ebuild
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 8d1cd8b403ce..0cf3a7de9fc0 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
-DIST minuet-18.04.3.tar.xz 27786944 BLAKE2B 7386bd7a14dcb96225eb7fe070cd914f8a37e0fae5d0f01559cd468bc3d8ff1f26da4ed5b8176e1107b646bb453e5e9a68d4336fe106de46491db4fe880224a7 SHA512 c602b377323b1bc3c115a9297ef042738f25274e5b028756aa307e9b0951dc853771b9e4031d6ee39c868f2db2459ae316f0691a8f5efd291e89bf9c88c5ee19
 DIST minuet-18.08.3.tar.xz 27789492 BLAKE2B 6f741738815a4672e2c9edde172cab99b53f20523f5c272029d5a47561673603a2f0a3a06f2d71a953c23dfffcaca7c2d82867795c8f164dbd59faa0853f3a63 SHA512 95ae460db8d1d51926a3be0db12159b0256e3817232d94bcbb0400efb0c49fd43298dc83557166585ce29cdf6c46e24865aa104374dacc29ed2bcd1d52ef71e5
-EBUILD minuet-18.04.3.ebuild 586 BLAKE2B e62f58a2382c54cf41dbf6f476c22f6e51ad0d93c42fce1718bcccfd91d0a6825b988d2b906d6865d8750b748c1e0005d58a7e60a8debbf809f3db8cf8e1544b SHA512 45d18600f13c35676b18976ebed1cc6d6f447730ac50e80b9b0d4de05b56f31eef1433c8b947999d8d7da724afd4b78bc9481a32d7f254ed65f3863d1bbee730
-EBUILD minuet-18.08.3.ebuild 545 BLAKE2B e21c99eaca2af49ea870161f63c54d3abc2458e1e962e0113871e513cbd4218e2412531dbafee55b4cd33009a6dcaf895cad7cb9819abcf019348cb60fa594c1 SHA512 13c2f0861fadfa4d3354a7012101d5f9e5b7e86c4460cf83da2b95343067eeb028282a7fcf9133a55d92c0896fa911a8e6e457a453cbbd33aa943ecee502a06b
+DIST minuet-18.12.0.tar.xz 27790124 BLAKE2B c189b5034e23dcd4432b5ce4ad4cb91bc9082226c54855cff414e9e937f22ed5f2a79c62fc78ca0f1d224d0d1e4eb6da10d9f0a1cf3da2802e75d7da3db917e2 SHA512 85b025931506a7919e5c9f253c0593a727224140811a226885b486e8513109d5bfc7fde6ae2a233a6e2b14d6d18aad1ea3597b46f52de421f8925d2d2133f78b
+EBUILD minuet-18.08.3.ebuild 543 BLAKE2B 9e5d21224aab2a9cf03dd4ee437e411ff1f2d481c2b0fc47219e48bca748092fc56f98197fe6cd5c457619401dcacfa69767baa3784190aca18ed28a68c736a0 SHA512 6a3caebdddec33604726cf23b648a3fd60a3cab9e79fb9380bcd6be333671b8494951e39b43da51f81956aa0d2abe24bb06064bafd5c4bee236a049abde67125
+EBUILD minuet-18.12.0.ebuild 545 BLAKE2B e21c99eaca2af49ea870161f63c54d3abc2458e1e962e0113871e513cbd4218e2412531dbafee55b4cd33009a6dcaf895cad7cb9819abcf019348cb60fa594c1 SHA512 13c2f0861fadfa4d3354a7012101d5f9e5b7e86c4460cf83da2b95343067eeb028282a7fcf9133a55d92c0896fa911a8e6e457a453cbbd33aa943ecee502a06b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-18.08.3.ebuild b/kde-apps/minuet/minuet-18.08.3.ebuild
index 519702b71314..755ceb498fab 100644
--- a/kde-apps/minuet/minuet-18.08.3.ebuild
+++ b/kde-apps/minuet/minuet-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="A KDE Software for Music Education"
 HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/minuet/minuet-18.04.3.ebuild b/kde-apps/minuet/minuet-18.12.0.ebuild
index e8f866532e8f..519702b71314 100644
--- a/kde-apps/minuet/minuet-18.04.3.ebuild
+++ b/kde-apps/minuet/minuet-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,10 @@ inherit kde5
 
 DESCRIPTION="A KDE Software for Music Education"
 HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
@@ -21,8 +21,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtquickcontrols2)
 	media-sound/fluidsynth
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
-RDEPEND="${COMMON_DEPEND}
-"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 1fc2c23533ca..1a5df726b62e 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
-AUX okular-18.04.3-path-traversal-issue.patch 1618 BLAKE2B 7a4339189f98e24e2cd85af6cb34efa7858b1e110e504b7957826944f30e7f0a822764d29a734c258b64b5fdc51c6f1d904c8b6c8ea3d15673b3b850afcedf46 SHA512 35fbc65d941cf83d916ff2c44b220f7f72bc9ee4afac2e35652f4a86ed2e68b260a8316d5960a6537152e33b96675870c0dd0afdad45b921036f42af1cb4a5dc
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
-DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b
+AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
 DIST okular-18.08.3.tar.xz 5770760 BLAKE2B e698507b400068abb76ca4030ca57c0c020fe8b0ba7cb4a6e81519ea7cdc24a5a3a26422f4e6b1badeef211723114811ccd81a2180335e37ab0e9e8684f23a01 SHA512 a03775c10d56d8d2740a82d9e44e3fc59259408dde855cb8d5a1ad824502e78a442adfa2c795ea0ffdcc14bd3bef52e1a14da2967b854107027221bf8e32aec2
-EBUILD okular-18.04.3-r1.ebuild 2984 BLAKE2B 1932c162cc3533da8f955f6d885b369bba7519a5168745a2cc9cc16ff019589742b312077783bf785ffc10401a1f9bbf132ad43a920d33a41cd4eb2857537b4c SHA512 2ecde3207633e2cb45c79b3bd3a729a4df124ac50b680519204e0ff398ad75a4359d2314518bd7952d1eb8be19c805219b76c514257ff8ecf6bc6ef82f0590c0
-EBUILD okular-18.08.3.ebuild 2937 BLAKE2B db605187758113b5aa9045093cc7e9b01aed1293c6f46ed0e7918a954ab6624967f4700a3cae88c9f484c8515bd9bd5132541f5fa39773a7c22711e0ce76f4b1 SHA512 d44c495e7aca10e3d09ce24a555a093667a92f59b0e10cf950324f10cc70fa156759f6353a7bc26d442f9abf577b196b07bc76da6ba9362fcc3aa52b3d96b0b1
+DIST okular-18.12.0.tar.xz 6120152 BLAKE2B 2d49b26df64b72ac322ec2d91cc3714a62fdb89e63dd1a826cfc33d6a0c276e4261694738143fa8c55f875f225bb0896f49e4c0fed0dc703e8876c18f281a1e3 SHA512 174b0ee1cdba2d887922c2f432ca873954ccac31c0e668d88d820d5c7c67898fcc20369514bd1efd74e9ec662608d18642ef76e52b46cc0644ac405ef3046268
+EBUILD okular-18.08.3.ebuild 2935 BLAKE2B 9d1118cae65a8cca51a32f14f68506cd6b46138a443069828dd9b550edb939070aca7b433a22df51db89e7bd633849d989cd6082c43518c7f3a6b4cc8d58a461 SHA512 49de57710e5ecec9d70abe83d3edc78a761e26873652c128ecfe7af2ea835b04c8234fc10bef4b385c862a17c03f9a01d0b41962f78a0345f1be47c52ea698bd
+EBUILD okular-18.12.0.ebuild 2979 BLAKE2B c08007698f1051c4387b488014c6f9d8cff98959aa5286485c53e120a5149044e19873678800794f4a1e77de729465a42c7635d14b71560e2fd0342f06603394 SHA512 24e45cbb9a27124c8b572ae49bdc442f7b90b043e75cda1fc1f63c8848e0d2cb5f5b4b9108ad422b0512ae0470975fea703c424e360e979d0a68c23645551127
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch b/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch
deleted file mode 100644
index 216f235d8646..000000000000
--- a/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8ff7abc14d41906ad978b6bc67e69693863b9d47 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Mon, 3 Sep 2018 21:14:30 +0200
-Subject: Fix path traversal issue when extracting an .okular file
-
-Summary:
-With specially crafted .okular files you can trick okular to create temporary files outside the temporary folder
-
-We fix that by making sure the file doesn't have folders since the ones we create don't
-
-BUGS: 398096
-
-Subscribers: okular-devel
-
-Tags: #okular
-
-Differential Revision: https://phabricator.kde.org/D15192
----
- core/document.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/document.cpp b/core/document.cpp
-index 5e3c169..7d46173 100644
---- a/core/document.cpp
-+++ b/core/document.cpp
-@@ -4819,6 +4819,18 @@ ArchiveData *DocumentPrivate::unpackDocumentArchive( const QString &archivePath
-         return nullptr;
- 
-     const KArchiveDirectory * mainDir = okularArchive.directory();
-+
-+    // Check the archive doesn't have folders, we don't create them when saving the archive
-+    // and folders mean paths and paths mean path traversal issues
-+    for ( const QString &entry : mainDir->entries() )
-+    {
-+        if ( mainDir->entry( entry )->isDirectory() )
-+        {
-+            qWarning() << "Warning: Found a directory inside" << archivePath << " - Okular does not create files like that so it is most probably forged.";
-+            return nullptr;
-+        }
-+    }
-+
-     const KArchiveEntry * mainEntry = mainDir->entry( QStringLiteral("content.xml") );
-     if ( !mainEntry || !mainEntry->isFile() )
-         return nullptr;
--- 
-cgit v0.11.2
diff --git a/kde-apps/okular/files/okular-18.12.0-tests.patch b/kde-apps/okular/files/okular-18.12.0-tests.patch
new file mode 100644
index 000000000000..2b617150508e
--- /dev/null
+++ b/kde-apps/okular/files/okular-18.12.0-tests.patch
@@ -0,0 +1,17 @@
+--- a/generators/epub/CMakeLists.txt	2018-08-19 21:34:51.151645090 +0200
++++ b/generators/epub/CMakeLists.txt	2018-08-19 21:36:28.771109586 +0200
+@@ -23,12 +23,13 @@
+ 
+ ########### autotests ###############
+ 
++if(BUILD_TESTING)
+ add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+ ecm_add_test(autotests/epubgeneratortest.cpp
+     TEST_NAME "epubgeneratortest"
+     LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+ )
+-
++endif()
+ 
+ ########### install files ###############
+ install( FILES okularEPub.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kde-apps/okular/okular-18.08.3.ebuild b/kde-apps/okular/okular-18.08.3.ebuild
index eb535ba3bbcb..2042a5330d12 100644
--- a/kde-apps/okular/okular-18.08.3.ebuild
+++ b/kde-apps/okular/okular-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.12.0.ebuild
index 08b241b19658..83bf1eabfd3a 100644
--- a/kde-apps/okular/okular-18.04.3-r1.ebuild
+++ b/kde-apps/okular/okular-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
+	sys-libs/zlib:=
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-18.08.0-tests.patch"
-	"${FILESDIR}/${P}-path-traversal-issue.patch"
+	"${FILESDIR}/${PN}-18.12.0-tests.patch"
 )
 
 src_prepare() {
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 9e3d1f8aac6b..8bfcf665c719 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
-DIST palapeli-18.04.3.tar.xz 2061768 BLAKE2B eb1b8e499be2af52c9111aefce2ae7d9850a6538bf7e4414eb9265916fe7b2ec3f9ed152c45189e8e7d01fb7cb40152605001bbf4d6bb13e2431de1c17a90b89 SHA512 3da548346452020f398229a1c0c7d82062742fb729ca52e6781d809c59d9e7051e3d697dd156e58a4a6c10af04e5beb81609a5c6d70d139cc90ff5dbf5652604
 DIST palapeli-18.08.3.tar.xz 2063968 BLAKE2B 928b5bf39752d4c1f7ea7da657329ed64bd5d0a1583fe9edcf9e652169e4d20e2c5668f679651c365468103ab84111059618190ef5bbd76e84220f5a7f81391d SHA512 fb512f842064755dfb250afc29aa3b7672f350c83c1eeaa9ef0f7d920d87b1f80efd7436b0ea6ff447c307709648009f491e5c403e4228080b8518144b7a23b8
-EBUILD palapeli-18.04.3.ebuild 935 BLAKE2B d6b5a0c2e8e1174f8ad344c1160ef01efc80dbfdd801a2f41521b870b64e4615640c86aefccb24372e620bf6d61dab3ab0ed6a03b6746d0f7794bebcbfd9e079 SHA512 c019e484efbcba665f5a0848132555e341f9447964f2c2d35d963c146b082aa829c98cc87367d00356239a65032a82b48f7bed9a22ba7cac442061cadeca32e6
-EBUILD palapeli-18.08.3.ebuild 934 BLAKE2B c000412be2904638139de351947d1d109353eab522d81640cf5559548df97842a07b53b5c9d53ee16a1c20e029ccd7f87f432416f0fa46f1bee69af1335ac44d SHA512 7387926a962935334338ac705ee6184679e01246e0f0b377794746c04981bb414453543750acd0a28fb9e09a5fe7d8851364fd227a076a751ef1a4d5a507f376
+DIST palapeli-18.12.0.tar.xz 2063840 BLAKE2B ac5b31bd1592b2ac670e2c805ab1b441e16dcf661b43e3872487b1c530dbb958170b8346918a6ebd70ccaf52e7a466891c493f0374967dfee4a837d2d52a36ba SHA512 109f7b4e5457e0fdafef0adc4a9f60817a6675d0a31c24dda1928df12a7a46d2cb4eebfa6d87d96465dddf8d92cf256a19b02eb43d862631e32e496aada32afe
+EBUILD palapeli-18.08.3.ebuild 932 BLAKE2B 875fb7198feb82949a55559ac22d4801224ad9e51b792ae1765f5a40e987456c4237e951c458a851937175c9ed47102ac3b45785cd024105ce65fbe3f190d1bc SHA512 118762bb8343ffe13cd7bee6a6c57308088a00563c5ef4c2a47e711458f589bd431ea558eba8366f727aed54b80f0440df21d13c59c187bf0c2c1419acb3d9a0
+EBUILD palapeli-18.12.0.ebuild 934 BLAKE2B c000412be2904638139de351947d1d109353eab522d81640cf5559548df97842a07b53b5c9d53ee16a1c20e029ccd7f87f432416f0fa46f1bee69af1335ac44d SHA512 7387926a962935334338ac705ee6184679e01246e0f0b377794746c04981bb414453543750acd0a28fb9e09a5fe7d8851364fd227a076a751ef1a4d5a507f376
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-18.08.3.ebuild b/kde-apps/palapeli/palapeli-18.08.3.ebuild
index 818f975ffaee..08dd8550cadc 100644
--- a/kde-apps/palapeli/palapeli-18.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Jigsaw puzzle game by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/palapeli/palapeli-18.04.3.ebuild b/kde-apps/palapeli/palapeli-18.12.0.ebuild
index bc5658603108..818f975ffaee 100644
--- a/kde-apps/palapeli/palapeli-18.04.3.ebuild
+++ b/kde-apps/palapeli/palapeli-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Jigsaw puzzle game by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 0b4bc9f20f66..07767985167e 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
-DIST parley-18.04.3.tar.xz 8829720 BLAKE2B e49cb4d1474a8eb0785b5e868d4cd56cc0c2616e5c8c2f53ebac478e0e561fdae871106c499563c1c3a17f58bd8dfbcf979a4bd4991cfa4fc13934585367e51d SHA512 438648d1b15b170d33c67b5ac3101558da0c6b67b9c8096d5634fcdead737764579276dcfdca6e55d192366b1eaa5536c2f77ae76bc33e760150de401be18fb9
 DIST parley-18.08.3.tar.xz 8825340 BLAKE2B 0e069ed9b7513be6ad3055aee3566b8a4465e5161a1f6cbbd94c3ca356d30ae9012a3e158e4416fdffc68842bed140f2068601912cbe5e875f4b32cc2c212a63 SHA512 c5c479bcc746cdfeb9d2409c734be5f92c3993a504c57f5c48b78a84d52d9621b2b5acbcdddbc3221c5f2abe0056b84e5edf91238de25f76d0824aa81d9c0a42
-EBUILD parley-18.04.3.ebuild 1255 BLAKE2B 2e0d0fedb3759793846d8f2c4e7a25c8a9bca996591a1baf1b38eeca9ab23de3565f6310c85ed404e4b08bf32d22a05e98462cc5af6546a8fb70902f54927520 SHA512 6a1dd8f607503b55fa87cb6b148559f631008a741453703264232268a83f632f5fec0baff9b71c2002defefe5f92594fcaa883867f884f00558ccb9fac6ff952
-EBUILD parley-18.08.3.ebuild 1254 BLAKE2B b37c107190eaf7ed2c707731cee772c72664a9bd38db239a3ded26b5b107d7e94a9aeea34a69ee90b802299721ad6db141a6b0f4ede1120d42ec97ff662bd477 SHA512 86a71771294db1c1ad57239e26b2b8a438d74ab6d30b5e1b26d5c7af7b1b0d7c96305484e9a384afb49849eac08bc6a64c5ebcd30caf65be15d834abefa93f0e
+DIST parley-18.12.0.tar.xz 8823468 BLAKE2B a9a800b0933b80299fe58d07dfc37b160f9ebbfe764c3f55468e27b4dad7190317c94e05653233e30904146a9518ce7e9bad853792c363a31718509bb800338a SHA512 1d406f5e0ca5d9c8656b3d44cf5453cf12e500a753360041617a0d78ef39db10c49a65ede564a51a6cbde6bff075b3214b70b22d2791e53b62aa5343fcfb9005
+EBUILD parley-18.08.3.ebuild 1252 BLAKE2B eb843a1d66c4de47df932b2bc6f4cc725faea55519576edacf056dc133af3a76558f26ab5ce8fa8c33fdee393b7ec4a3bafc94b4669a00c42af4147a77dcfc18 SHA512 5ebe3fd3665c661de3e0200c1b7c7e5aafc1cefaf27117c30c5b05a80358e45b0c0f52aada6152feb62e1d557e3be74a7a750d0a63b0254916786a22f929f495
+EBUILD parley-18.12.0.ebuild 1254 BLAKE2B b37c107190eaf7ed2c707731cee772c72664a9bd38db239a3ded26b5b107d7e94a9aeea34a69ee90b802299721ad6db141a6b0f4ede1120d42ec97ff662bd477 SHA512 86a71771294db1c1ad57239e26b2b8a438d74ab6d30b5e1b26d5c7af7b1b0d7c96305484e9a384afb49849eac08bc6a64c5ebcd30caf65be15d834abefa93f0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-18.08.3.ebuild b/kde-apps/parley/parley-18.08.3.ebuild
index 37357ea9df4c..b64afb577c8e 100644
--- a/kde-apps/parley/parley-18.08.3.ebuild
+++ b/kde-apps/parley/parley-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/parley/parley-18.04.3.ebuild b/kde-apps/parley/parley-18.12.0.ebuild
index 18e915c161b6..37357ea9df4c 100644
--- a/kde-apps/parley/parley-18.04.3.ebuild
+++ b/kde-apps/parley/parley-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index ef2bf7624e86..2de37de89134 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
-DIST picmi-18.04.3.tar.xz 1146732 BLAKE2B a9f64f79c629c6bdf7bf5b38b5aaf2b3ec8b71bedf7c54cc5f9b9cce862401b6f09def37824c7196d9adf7799a8e1739749cbecb6ce09317c2676aeb938c89f6 SHA512 a9eecd7e746d2f64bb4587c88137208eda644a6c6f23f21e6405135397ed3f562d5ac2a4c33a88c99a7191a56a0568f489ca8cdb9ebc68e5ee7dc6552ab3a4c2
 DIST picmi-18.08.3.tar.xz 1356064 BLAKE2B 03b12621df303d08a6bd9f4c7c5f2ff6f93c8fbd6d2db0bfe96c21f80221acf29182fb26390229836ba21cc11b856229f9bcbcb70ae0ee9883b3d3bdbb792827 SHA512 9abd6a4d7c7bd1ab742fbac0bd5483965565943b90bc0282dc0f4be5333c4b510d862d5a0a3cf5c345bb13bfef7e4df8cfc6507513192f45270dc0437a018115
-EBUILD picmi-18.04.3.ebuild 845 BLAKE2B 724f2fc96d2c3a5ea5aee9e9f745e2190c7b30d3622f8810ced762021488873373cb33a37675d0c50d22f1c1a2ca6fe9c483773fbf704dfa40a49f667dcf9826 SHA512 3734ac1dad577ca724d2a7136512cf4c5e99be5f998ff2be871169f3d80196b88c6af53a1ca7e9b5efc8983e418211bc604af7eae4b2b24d0087ce29198f5aaa
-EBUILD picmi-18.08.3.ebuild 844 BLAKE2B ee8948190483de2d69b03f5d543647341fef89255fe2b28bbeed3f9b6bfd0e6d7cf78e065194f47aed590f814ada7b4ef286aeb600f7d3a496291ce2a16ed1a9 SHA512 38ea868ad94a9b17a388d1a97e25d6a2d655742d485076d6d233949a1cf95f53ff245542be1a03de0d1fd62c85a00dfcdbb1af8e80cdde5de8ad43e5ca42e2bb
+DIST picmi-18.12.0.tar.xz 1355948 BLAKE2B ff908012889b4bd7dfb4f28fc3b55150db5200ab2df95ecbf91e5df14605bd90e6cd7923693072c7a032f33b7d3d5330f95017cf1edd280a1be53147c8def9ed SHA512 78ca02b52a9aa3a7762ea87c06c26020708427e690452de475cc61dd1664e0747b88c74381b769b05c96af35da6a5004b7b4d3b8187aa34fa03e0d8d283cf8e2
+EBUILD picmi-18.08.3.ebuild 842 BLAKE2B 8349bf16fccdb2fdb0b33550f52fc03783b22c90ae91ecaac071043d4c41674788065a2177132e4ffa8c30da5b5ce8cea477d812073e46b378b55b3490ee208b SHA512 a412544658ddc2a778fd0bcfaec26170601206f1734d5ae9c85621932b8b1ff7d03c91d1a44600cc53c0a84cb65ada69ae53ce89fa057f0f3ee686088ea608f6
+EBUILD picmi-18.12.0.ebuild 844 BLAKE2B ee8948190483de2d69b03f5d543647341fef89255fe2b28bbeed3f9b6bfd0e6d7cf78e065194f47aed590f814ada7b4ef286aeb600f7d3a496291ce2a16ed1a9 SHA512 38ea868ad94a9b17a388d1a97e25d6a2d655742d485076d6d233949a1cf95f53ff245542be1a03de0d1fd62c85a00dfcdbb1af8e80cdde5de8ad43e5ca42e2bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-18.08.3.ebuild b/kde-apps/picmi/picmi-18.08.3.ebuild
index 9615ae54b77a..0e26628352d0 100644
--- a/kde-apps/picmi/picmi-18.08.3.ebuild
+++ b/kde-apps/picmi/picmi-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Nonogram logic game by KDE"
 HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-18.04.3.ebuild b/kde-apps/picmi/picmi-18.12.0.ebuild
index ebb345334418..9615ae54b77a 100644
--- a/kde-apps/picmi/picmi-18.04.3.ebuild
+++ b/kde-apps/picmi/picmi-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Nonogram logic game by KDE"
 HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 9eab3b105030..f19740ca4570 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
-DIST pim-data-exporter-18.04.3.tar.xz 270248 BLAKE2B 27d8545408ba37ff7790e84d02455785b77b0eb865e5b236fc15eacd81e3df99d37f2c84e40d6cbc5ac9296d0b95a290744e5dc9c2e5103ea9deaa987421cb35 SHA512 29550eca64b6026c900b30303fed29a06b31a7c773f7f387c899afbcd7b735a07efe95cf7366ccbb6ba6b4884d1c1491193ff2f817a032f27002bc8234b82301
 DIST pim-data-exporter-18.08.3.tar.xz 269628 BLAKE2B b3bf6077d2757613215f3a38b24804d32fc987af57740a7aa73b770ef62823d54240c74b2ef1cf0366012304be115f135605434f5167eca8ebd2e41959de433a SHA512 8047408cd37ad4ea25dc42a6d4cf86d71855b68ec611140f40fc3d149894b54c8a4d4317a45b391dab9a265a3249c1ca1b1ac6521f63a26db0d1c0a2a5a8cc09
-EBUILD pim-data-exporter-18.04.3.ebuild 1212 BLAKE2B 57201c91ac3526453e6a96b73d38eda4237d2dab425dd92d2c87671efca4e3f1b40144942f8f7ea35ce54e23000829d0c390e751127c0441382647b92db685b3 SHA512 52cf0e379b1437ce5fe2d05319c148abce6c019f94ca45aaa83dfa634a47fad91e1ee938c54fe234e0ec0b2d3086068b97688b7b987c7b0a0e4d090d3dd0fb84
-EBUILD pim-data-exporter-18.08.3.ebuild 1211 BLAKE2B a1af1f770c9303aae9844c71fd3606111ec71b7a87f190d595d59b8e8f29391305a0b14ddb7ff062a135ddede1d2315b00cedc243106ed71721a1e4677fddb75 SHA512 8e2f95f57499c78c59ea809d3f13df7355c6eeb4955ad5a9233d4e047cc6ff8f5dcd72dbba88726ccdafc5fe69beb411158208cf68301e702d9c807906a3c7f0
+DIST pim-data-exporter-18.12.0.tar.xz 270888 BLAKE2B 8d7bcaab406dbabd4f3fd32c2372e6ff0c99246cccfad78372a7c7451bbc10d76828835addf45c892b283581d4165ffe9d4400cf0d856c897c51f18ff190daeb SHA512 8cf0ab291d0e06b5a412ed2c43f9e468b0276f38663d7c8905d3badf1388f50a52ba0ca93e08f7eb9d66d13b091190783badb13f6df6055caa73199612d18151
+EBUILD pim-data-exporter-18.08.3.ebuild 1356 BLAKE2B a57523729b823a708c2b9dbc9310566729f961d320523f0889beb3eec2578b8d720981241f0c79c5f071ed30aa087915b847d416893a76f6e2754c4738d584e5 SHA512 152285bf96f1f2541311aa7d538f11c61055019f555821a9d2cb0c3114e57442521d5ad914532196b05893be666b591fa01e1076301537967ed8c2ac7819058a
+EBUILD pim-data-exporter-18.12.0.ebuild 1358 BLAKE2B ede140b70d9dd04b37bfb13f6c85a9a26e9fb3e046fa86be70961964e896a5f4b7463c760323f6693a8365f8bfeb75416ef8dd5123d3a9146702c0adaa329102 SHA512 78dc57c9cb7e3ed9ef87e5d6cac5ed46ee0e2362eed942441ae5307bdb131a12c283008f7c25257a628ec7dce2178f9b1808db467c3c344b9cc11a5231f570af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.08.3.ebuild
index 7858494a4dd9..07df369276d9 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.08.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
@@ -43,3 +43,12 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
+
+src_test() {
+	# selectiontypetreewidgettest is broken, bug #665690
+	local myctestargs=(
+		-E "(selectiontypetreewidgettest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.0.ebuild
index 7e889dd2851a..992ba691207c 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -43,3 +43,12 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
+
+src_test() {
+	# selectiontypetreewidgettest is broken, bug #665690
+	local myctestargs=(
+		-E "(selectiontypetreewidgettest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index b6d629f7c6ee..73905924ec00 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
-DIST pim-sieve-editor-18.04.3.tar.xz 447160 BLAKE2B cc28510ee0278a691094c42df113f02299b74830c410f74467ee69b59d2b6a60e5b0861300967c1857c5afa57025d93c1909230c085e1f7caf2ad9b30cd79728 SHA512 344ba01e3f67c359e912e8bbb880aaf7ab1c8a77e793614a1ccc358551e3c163eddef7c48b178678f99d40dcac4a8f1b687084d21d37e39caf98fe75ebb88a93
 DIST pim-sieve-editor-18.08.3.tar.xz 448636 BLAKE2B 9b84bea7d867e95a887f9f1ec024ab6781121da6747422e1070d18f7110b7639e0fe9de465a1a8c1488b64f7b588173137128ca46034804df11d23ec524bc1d7 SHA512 75203cf85d96aced242347ff02072995c1132246d5aed94dfb8a3aba479126be121f6c4988995d7e212f56cf406ea1c65a645b90340ebc28185a1141ec338c52
-EBUILD pim-sieve-editor-18.04.3.ebuild 1147 BLAKE2B 1d382e5e13a982287274b27772e0250fff48428528e706571632cfa50503ce889b8ba4d26472c4168fdbc8c790228de9c2d7cdf87e9ac84601a94eb9b775d268 SHA512 5e496bc3fc0e16dc80eebcba13bfc3a4b0f69d0a166965bbbffe1eca523eb14619d50d61ee95320a11cf4e15af41187793f691924d00c700c71199c6b9bc7269
-EBUILD pim-sieve-editor-18.08.3.ebuild 1146 BLAKE2B b3e729a8910c6bb8212716216cefe27147f1ac575f0e562892483a8630e7d2d95e3b5e9f77d24218ed179d1465a58c827e2800ca0d1a47fe00d7e605bb1c603f SHA512 1538ba5757ebc2943838832bdbd82508db79b465312b46d9b63aa53d21e7a27284840c8b4bde66e429fd30d2ae7c51be2e7aa942cb9caad86617cba433fa5a2a
+DIST pim-sieve-editor-18.12.0.tar.xz 450536 BLAKE2B 34f68c765799522e839860d7ebb325d0cd0a3b1e03f68bda6d9275ef5beda03243241efc701c47b2cec5247ce27a562b60d562f3458668c2a95d5ef97f86dd3a SHA512 d5944dddb22549fb247e7e74b342c348c4e558677b07d21772611cb31681cc3a8ea317a689ff3f4a8e84401dd4c32ce4ca97575d50f03369739fcc363fdd1c90
+EBUILD pim-sieve-editor-18.08.3.ebuild 1144 BLAKE2B 1b3bf5026e7d508bd974a8bfe730730d2572ebacfe3bdf9cb45490f536f66dd516dc5b90982432742b689188e396cf9bbcfc4b7124df9f9566dd3d720927836c SHA512 c6ba36f6367f76d5b69de7107aafc0d553c4beb00703801d8055393d7fb7c85338e3ffc863be0c91ca718000d98bbae09e97819805eb8e757a6b22e4299bf97a
+EBUILD pim-sieve-editor-18.12.0.ebuild 1146 BLAKE2B b3e729a8910c6bb8212716216cefe27147f1ac575f0e562892483a8630e7d2d95e3b5e9f77d24218ed179d1465a58c827e2800ca0d1a47fe00d7e605bb1c603f SHA512 1538ba5757ebc2943838832bdbd82508db79b465312b46d9b63aa53d21e7a27284840c8b4bde66e429fd30d2ae7c51be2e7aa942cb9caad86617cba433fa5a2a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.3.ebuild
index c57648cf491c..b52b7367eee5 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.0.ebuild
index 76f05fe043a7..c57648cf491c 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index ad74b7cb7730..e0571339befb 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
-DIST pimcommon-18.04.3.tar.xz 295512 BLAKE2B ce4697b0e850b7375741e5af2a0abca7b2cd8ded341338ef6f1b358df66d724d0c8f01c45b5d13eb042bcfc3f396545ce68798d37a3009c2d00b51be901e2957 SHA512 c933184da3ce1626a28bc20b851c583e0fc21485855414b0e9c161cbc7eadf7ffe1916dfbbaf9e74fb48eafe152436ac73a5082c2ccbab219aa45497c45f4e14
 DIST pimcommon-18.08.3.tar.xz 292804 BLAKE2B ca220c53168fec1dc89fbc640c13becf96b7115fa36175d46b2457a63beedeb30d858e450c9d86e121ebd8e19b1aa932cf468bb62b7957c69319b64b1e409141 SHA512 212862d77d596d7f94a6685f2fdd50d08f26330933ec601e2b8bf1f1f2077e142f55836b8294b2513bf735a18fb21070e078af034056254a4ed65245c1f217fb
-EBUILD pimcommon-18.04.3.ebuild 1504 BLAKE2B 5601b91b70ea6e371d5861dc800ebbeab61213868904d013550849eda59eedb5a595d94c3598a391fa2f3a4a9d54a58d83fc022712b50d05e60dda253a918609 SHA512 a7b3f5b224e75985851bfb105c7ba6e1d1f323049849827a723f13ebd4df06656746106467a072098970c0a0199bb178dcc55d30e62a8bdf4951439d0722557f
-EBUILD pimcommon-18.08.3.ebuild 1503 BLAKE2B b03b3cc267e30f8fb41a819de4c0019fa216ff0ea0daf71fc6ae8fce278f3c7ffd7224027fd606f0b3b3a80be2572975c373861fa15d4af7423f9b0b0aee7122 SHA512 c50b1c57cd47f8e29e04cb6c919e8323b34c3c9f79bd3ec7eb5e5ee0ec395b2394756247005dddf745532bd08f6df54d1476b5ec82098c3a82ef113b79ae57bd
-MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
+DIST pimcommon-18.12.0.tar.xz 294900 BLAKE2B 7ce13668a4249f51c6b2724d2296de7326a1c221e2ffec19833a879b467cfeac0c8cd75a5531a119ecea0b98909dea0464491927efdcdf0644aaffaedb68193b SHA512 212d1d9e46e834dfa78d780bff0a39452960d98e2bb52743b512c62c15babec25adaae06b57d0c00b02fd7e35ce16090ae5594e2ecaf54b3093a2ba6efd1cf71
+EBUILD pimcommon-18.08.3.ebuild 1501 BLAKE2B ba19c7835d8edc43d49d9cad84667073e7e231de5f9df2719ae2e84b9e8e7dff888bc3d7b904d034c992ee124ff84d9f58b926b1a8b07d251a199627cf37e50e SHA512 9b7ed423a48a0f46e3c19c153b93d564eb6af723653ca8767f7f5865362bc6e73c2dad327fd8a3dc87ca4f0582ae8049479803ffa9add5dee27110a2f30e31c6
+EBUILD pimcommon-18.12.0.ebuild 1667 BLAKE2B f59cca929bff16b5147b9e5a2579f10040eb5689dfbc0e61bc2f266a8eee251097e63ade05b74ce834cb8d547b3abbe4b235c10deb8cc3f56a24adfa335dfa96 SHA512 5f1fca747d882f808b2ec0a77f1cb3be23b141f53632aa8792a73a10c03b3ab2ccc13d9c0037d056af6cdd2daab87af15f572198b26ad296bf6b906ebc432c44
+MISC metadata.xml 440 BLAKE2B c55b83f7b60d3baaddaabe967f26ebd46bc02e8c299bb6a08bd2b2dc637aeb9014d1151401dd5818fa638e35a52af07b4f4a1c26f11acaafb12af39395987b8a SHA512 270a30b21908e27b18090298815c52c80c90a6411f16692bb725449217411932627cc3ac530c2838b539e1692ac00972461bd6b016d92e7299588e71913a304a
diff --git a/kde-apps/pimcommon/metadata.xml b/kde-apps/pimcommon/metadata.xml
index a50ada50ef0e..7ade8e3d0b3e 100644
--- a/kde-apps/pimcommon/metadata.xml
+++ b/kde-apps/pimcommon/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/pimcommon/pimcommon-18.08.3.ebuild b/kde-apps/pimcommon/pimcommon-18.08.3.ebuild
index e5b1ca723dcc..4cce6fb940d4 100644
--- a/kde-apps/pimcommon/pimcommon-18.08.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/pimcommon/pimcommon-18.04.3.ebuild b/kde-apps/pimcommon/pimcommon-18.12.0.ebuild
index cce9acce107a..ac5b5e6bb3a6 100644
--- a/kde-apps/pimcommon/pimcommon-18.04.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,8 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="share"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -42,6 +42,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-libs/grantlee:5
+	share? ( $(add_frameworks_dep purpose) )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)
@@ -53,6 +54,14 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KF5Purpose)
+	)
+
+	kde5_src_configure
+}
+
 src_test() {
 	# bugs 641730, 661330
 	local myctestargs=(
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 60e6cd615e59..10fd046afc9b 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-telepathy-meta-18.04.3.ebuild 936 BLAKE2B 8ba54ecd638b9340f9d950f4a2288d975c3cfbebb2fb9bdd1038e36f70f7156346085aa5c8835eca823fa772856ecdfa748e8fa1277df16befde03790c3a3f96 SHA512 7f6648e8285f603c0d3ace3b178262fb3d76a47dfb4dd65e68aa2d31326f785183b4fead521bd410c75ad65161ed94cbb0c0e09583eda6bf27f8075f225fc47d
-EBUILD plasma-telepathy-meta-18.08.3.ebuild 935 BLAKE2B 23779b4443b734b3bcd76f49a1feaf6bfdd499db1ebfa8c633d61a9eb5f4829889a994552bdd43a5ffe50b967151f306ca779e6c2dbd2b93104ccf5598022bf1 SHA512 1c0379449a870f9d855be7efe23a1c061e22fae0fd9bc2b8ad9b7b5a5f82beff48291bfe69bdcb8f157e03ffd73221ebee8c3c1d890a0dfd717d440c0e367215
+EBUILD plasma-telepathy-meta-18.08.3.ebuild 933 BLAKE2B 266310685994a7995223bef87ad77eccf6afcfda4d8e2d1bf310f2d44583ca5b18469b40060ed3cbf9e2955922a1ddcf0f74f03c4a49a0029a71399e750f52eb SHA512 49cf1f871f8304dc37dbc3847163d32d44729d2ca4575559b511a764c1f8a860dae46c2b3342afed1379b1e1042041bc5a19a7672ad5286a3eedb0bf0e435169
+EBUILD plasma-telepathy-meta-18.12.0.ebuild 977 BLAKE2B a374437b09afd02473a542d401cc7956a918df958a19b540caa1e70edfee7e283f3e83025d48c3d631515ecad75dd06c755c7de513bd1388334f00709c98a7ea SHA512 a85150c704755c91773c1a34ad0f08db46fb37b6a2496cdd7f464f4a35f4a4d92ac8de7afcf8783db2adc23e40a8065d684476ecb17a5b06207cf429bccdec5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.3.ebuild
deleted file mode 100644
index 6ec91e7ee512..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-18.08.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.3.ebuild
index 8fd4b5101f45..088e25776010 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Plasma Telepathy client"
 HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..584280dc8cae
--- /dev/null
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Plasma Telepathy client"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="
+	>=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
+	>=kde-apps/ktp-approver-${PV}:${SLOT}
+	>=kde-apps/ktp-auth-handler-${PV}:${SLOT}
+	>=kde-apps/ktp-common-internals-${PV}:${SLOT}
+	>=kde-apps/ktp-contact-list-${PV}:${SLOT}
+	>=kde-apps/ktp-contact-runner-${PV}:${SLOT}
+	>=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
+	>=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
+	>=kde-apps/ktp-kded-module-${PV}:${SLOT}
+	>=kde-apps/ktp-send-file-${PV}:${SLOT}
+	>=kde-apps/ktp-text-ui-${PV}:${SLOT}
+	gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
+"
+
+pkg_postinst() {
+	elog "You can configure the accounts in Plasma System Settings"
+	elog "and then add the Instant Messaging plasma applet to access the contact list."
+}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 7bc6d6392229..5200f37e4d29 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
-DIST poxml-18.04.3.tar.xz 43160 BLAKE2B 7d54129aea950d4cfc238ec03b31aa5e7f7c016f871ca7bd675bda46baef19224de429ca1314a2cb029a00279dd8022c8975c754f85614189abc262636e4aa67 SHA512 176af4e57c90354c0809d99ac1d5260ccc44eaf73a670ccb7aa205f4e67966d36ed68f857a9ce62660186b738688d3bd53df1477cab9af623660062e42862b81
 DIST poxml-18.08.3.tar.xz 43176 BLAKE2B 3ba27ec9053232c51fdff0e89cc83821cd41f84b3d34bb3ca47e9801f4b03e923543359e8bd6f734ed4e59019eca93127dee0b1ebb3d98620519a37f0aeee219 SHA512 7181f792ba722a79f32c9d46f9b8fd4d73673ef61fcb48106041739543fdbe408aab83f3a31b2d9033bd15e93494a2a7dacf1f488443eea82c133c3550b519a0
-EBUILD poxml-18.04.3.ebuild 340 BLAKE2B 3a45ed2f3c9c6d5e8ae2fa23280ccf1e95e347eb220486ece8e9460db877e225f2f31a5906585f732cf4fca44a716f5b46526dd879db9c45cc22725d73987f8f SHA512 4efa4312b7453dfd5a86cfaf8b2ff1866f237be9cac5a28049d09b2a2b473c9061021f82918d9327c4d083a5513cd4e6a1029f92a87badab392d9df8d23cb55d
-EBUILD poxml-18.08.3.ebuild 339 BLAKE2B c1c3e6ffeaa626304d53f58cff7df18365400d5e8cc288017bf5d75d5e21ee34ea398416c2a96baaf659d03b306b536fd8447fa2173f546df8a8a1af63c9c79c SHA512 36f49ad16efb6b2ea5f836a13b87f4c3fd4b78b958a5ab40465394aa6de0ede1d7a46ca69a8c0257c079240b960d423315d09fbcd378d89fbf0e6b7da51ed7f1
+DIST poxml-18.12.0.tar.xz 43180 BLAKE2B 1c68c04295c97eaae1695f15e1606f5c7f54c44ff284842736a949502728c1442b30b76aa3ac7a25dcace66f1f1fdd38e6c176a4534796d9bc4383b913f4b86f SHA512 b89082d4c170a3c922652401c6afd387993ab0c075ebdbebb1ec50f67bc32f4e6c3d6db6a4b8548a8eea68d4939243026c7c8b23cf872c820284e527644fd390
+EBUILD poxml-18.08.3.ebuild 337 BLAKE2B e9805e3c1840faa8444eace71783f71d3608c926b4bdd0852b40d68dd968cc05a084d637f26368f683750b2864ad75f3d2f72ddca2f0511ed5daf6385f83ab3a SHA512 a51830ef768df22a45eb6f8e636693655b3c10f8bcaf8922677f40b600a70d75ee0dea7a22c652a0eaf1579339e03c9e26c47ce19a34bc5a40997198b23b0b8c
+EBUILD poxml-18.12.0.ebuild 339 BLAKE2B c1c3e6ffeaa626304d53f58cff7df18365400d5e8cc288017bf5d75d5e21ee34ea398416c2a96baaf659d03b306b536fd8447fa2173f546df8a8a1af63c9c79c SHA512 36f49ad16efb6b2ea5f836a13b87f4c3fd4b78b958a5ab40465394aa6de0ede1d7a46ca69a8c0257c079240b960d423315d09fbcd378d89fbf0e6b7da51ed7f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-18.08.3.ebuild b/kde-apps/poxml/poxml-18.08.3.ebuild
index 4ddcd2f7d9a6..ec2000277d84 100644
--- a/kde-apps/poxml/poxml-18.08.3.ebuild
+++ b/kde-apps/poxml/poxml-18.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/poxml/poxml-18.04.3.ebuild b/kde-apps/poxml/poxml-18.12.0.ebuild
index ac31cb59d039..4ddcd2f7d9a6 100644
--- a/kde-apps/poxml/poxml-18.04.3.ebuild
+++ b/kde-apps/poxml/poxml-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 8512d3bc4522..9f8c3ee8d54b 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
-DIST print-manager-18.04.3.tar.xz 238724 BLAKE2B cd372ce2408287ba5c1eff2b614dcd5eac2d44f7a61aeae9c4376b47fbe7eae786fbd1349ba50a436916c36f8671652776464aff4738ab55c2e91b04052adcbc SHA512 0f3ea85c704a596a299e457b0c73afe844c1f2d14a76952e4abc1f3a90a10ff6e28b380a27f383939c0f9f2412c62c1016be2b63220eb664ef5da5ea627ce6e1
 DIST print-manager-18.08.3.tar.xz 238796 BLAKE2B f3fe67bb2a6b7f2e05b7ed8934ba491a829eff842fdd1f76af3cc376e679826e6ae1f332242d278215828b4842a0bf85b6e22d5b3ffb03d61f01c5f575cfa0d1 SHA512 0727f5e125ac2198276a92acfd881077647ab082b5edc9c4e5211f53dccd19e12b9b6934fd696424e029d5f7de373a194f9c302f587fb0c80af42526cd4a04ad
-EBUILD print-manager-18.04.3.ebuild 1439 BLAKE2B 81ab868d0134e4530cb5b9a998946c501eba943c17b2193aff153abd2197ff7974b0b1669b1ddf8464b2660bc4e0646ac0ca7692ce2b8bdfcce4a68c0ddae955 SHA512 6b9979f6d7aa30329cc0e272b7c7ad15c17bfeea61ff516ae4cbeb442f7aa3bfd42144ebff0e0219d45f67c72c37a9b552b4d10584b4be0da3ac49cc3e555e8c
-EBUILD print-manager-18.08.3.ebuild 1438 BLAKE2B c4dc961bba5245a75843c3b41f16a1ce93b7803ddc7d9967bf9b4482bcfddb0cf421c31eba8f88f23431ec5b8af466593267e7f51369147779819b012d1436b2 SHA512 77e2986a195a6e2cba225df42ec83542ba74b5c3cacf6a1ae4e386bce3654b758c7359f1dacabd0be85dd9ed7d4d99f18393357757fb61302744bc40c18d51e0
+DIST print-manager-18.12.0.tar.xz 238876 BLAKE2B 9c80d1af88eb40745774291b5f75175e5efecbbfe8979848b660cf5b8ead44d3b1d01515258ff863434517ca4107712a2e0b47c522027e30a5989b71b477505f SHA512 66652e0644b75bbf16ffcc963fa272901b9130e96998e93c67d6c6914ffe28be581756b7e6b459d0477ed15a7a0ba9f7f6cd1c7938d4124a0443770619cc6541
+EBUILD print-manager-18.08.3.ebuild 1436 BLAKE2B 536af8049cf584e8e551e73687592be1758e586a095efd2b879d0a3789e118636bc931f7a12d0b42eb38de99b982190f401ceacd86255e148a5dcd053fe7ad34 SHA512 8e6d544cff6c081b85a9dc038b1a8774a25990650e1872e897b6878f02333b64c9eabbe2581d32e4b7abbe82ae386074e3d030d56d0eab3fbaf5e851201a17b9
+EBUILD print-manager-18.12.0.ebuild 1478 BLAKE2B b2f2592a423a2716cd44605eacd905a812330025a51eb65334268c505e51fb6c3ea9218c9ff6020c686e013dc196617d4f341f546151a526da3a26094e45b1eb SHA512 d589e806ec3c9521b8d1d13f5f83ff1a6740d70fb3bbcf9cfb253b30e69c1cda320f6b844604db665f10d05d78edddb2cb6a4a544d89570376ba60696cec6a23
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-18.08.3.ebuild b/kde-apps/print-manager/print-manager-18.08.3.ebuild
index 2339cfc9baff..47e28d7f988e 100644
--- a/kde-apps/print-manager/print-manager-18.08.3.ebuild
+++ b/kde-apps/print-manager/print-manager-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/print-manager/print-manager-18.04.3.ebuild b/kde-apps/print-manager/print-manager-18.12.0.ebuild
index e5644599315e..6076351f157f 100644
--- a/kde-apps/print-manager/print-manager-18.04.3.ebuild
+++ b/kde-apps/print-manager/print-manager-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gtk"
 
 DEPEND="
@@ -36,8 +36,9 @@ RDEPEND="${DEPEND}
 "
 
 pkg_postinst(){
-	if ! use gtk ; then
-		ewarn
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
 		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
 		ewarn "an important, though optional, runtime dependency:"
 		ewarn
@@ -48,6 +49,5 @@ pkg_postinst(){
 		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 5a58da9b3c12..67f838d65a2f 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
-DIST rocs-18.04.3.tar.xz 1519052 BLAKE2B 14c2143ff855c2719b311c7824084e5c0597fad0969e7d5850429d48b51bc1629a27f13129afb4cc64e65d00be1a5464923102e4111819d071cc82648ccd669c SHA512 90d7af9934d2eb451882013676dee3d6b9aef421043dc39d17e3bfcc05d03b6c21d1f1836f247cada5e9b78d065d1544828bfc5288df8a1250388e48d26bede5
 DIST rocs-18.08.3.tar.xz 1513856 BLAKE2B 34700188826787a65d1f73e48b44795f2f4a0fe29305c67789a9786983e4ec3100b4a36adbe325904adb7e342c4838df300551dda0a3c501beb15ea5bd6ead7d SHA512 e45cdb2d14d5b488935a5d5d8cba4f7fe26263793500d1e7f93c07fa547314816bb94a8a00226577cc1aa80eb0a94b76174e429542799ce3d6dbb4935ae3686d
-EBUILD rocs-18.04.3.ebuild 1159 BLAKE2B 26a466581221934abb3f2a63d4a953b1acce35d695b9a0b39cc4f4ac64a78f7b5b7506a9523aaa82c50777051309a24d94ce0f42a7163b5ff50100867ba8024c SHA512 f3d82947fe9726d008005ba100f062e9497e1d5cf714637a44945ba233d991b2c9e45ad9085cfd99ab7fcfaeb2c1c610b6ab770da542a35c8489f96f7f578f2f
-EBUILD rocs-18.08.3.ebuild 1158 BLAKE2B 81366523db843c1a4a39c81a2a24a8a897e659270f9ef6794f998cad7af3c8b790fe26770f77f2d667c735e7000b1d6ad505f9a1daa8ce4e5ce4f3b37df2cfd1 SHA512 1624e83a8805062cdc835a66b58b74157d6cdbcd55a91ff42c2e9d8abfa3be14ea7060844597dafadee90de6a555d96f6fba74ca5f59aaeb240c70cbe87779d7
+DIST rocs-18.12.0.tar.xz 1515700 BLAKE2B ba6b96d5908f6b53a8eaefd2e7c0a264a36d8c4366d8cd31eda934e3594e2fe85ede2c85f35da325d4d2207d99bd90657a14e1e7ccdfdb72dd3a769181508a59 SHA512 be69bf9f046344f1ef7acc53fcfca72eaa63d101053cf65aef5143de1453cc61c9f057359ca6ac65db17e2e30e118954fa5e9e10a406a1aa5076e6a284ec7ffc
+EBUILD rocs-18.08.3.ebuild 1156 BLAKE2B 1dff519991630fb5293b20edb9ad773e77914d1fdbf8711c3ee24ee442effa37a65c2dfb34c0683f9620acc9bc20b00a1b5c56be697a0d7c9bf79f99d1749886 SHA512 4abf61e662dc16bc5a5be8106df5dd1b2b61bed31cb1df7cba725798d796ef379ae9f4d82681c2b700d9651f428863dc60b12e49d595f64b84d90e3a443f7e49
+EBUILD rocs-18.12.0.ebuild 1158 BLAKE2B 81366523db843c1a4a39c81a2a24a8a897e659270f9ef6794f998cad7af3c8b790fe26770f77f2d667c735e7000b1d6ad505f9a1daa8ce4e5ce4f3b37df2cfd1 SHA512 1624e83a8805062cdc835a66b58b74157d6cdbcd55a91ff42c2e9d8abfa3be14ea7060844597dafadee90de6a555d96f6fba74ca5f59aaeb240c70cbe87779d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-18.08.3.ebuild b/kde-apps/rocs/rocs-18.08.3.ebuild
index 49645ed5de4c..bd7ee08aa433 100644
--- a/kde-apps/rocs/rocs-18.08.3.ebuild
+++ b/kde-apps/rocs/rocs-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/rocs/rocs-18.04.3.ebuild b/kde-apps/rocs/rocs-18.12.0.ebuild
index 8826630eb7d7..49645ed5de4c 100644
--- a/kde-apps/rocs/rocs-18.04.3.ebuild
+++ b/kde-apps/rocs/rocs-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index bea654d59a72..de215d5eef93 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
-DIST signon-kwallet-extension-18.04.3.tar.xz 10684 BLAKE2B 66907d002684bc81bb004f156c89e44b9846ee9c877e2d5faaab38a7f9bdcb48d245e9819652485ebd12c00c182c280936bc8a055ba687c567d24903e55df631 SHA512 30e770b5b8fcf58dbb856fb8e187ffeba50aafa6a8e38090c37842fb84dd9d6374dbd064919baf16584f7c3bd41f7224e8f0f4d8eb9e00954faa3265b21acf5b
 DIST signon-kwallet-extension-18.08.3.tar.xz 10628 BLAKE2B 81e83a269b010aa2ce0194647dbdcd0a40089b8efac6ea123b209449822d458ac42880da60684682cf4fc9e27b47d78e80c59cbddf44926abf2aef2379349aa5 SHA512 98a6d52277b168b2fbaa09a21aeae7c7c98288f1a6b2615039dec2259ddc0147b9133e2498f017b49e6684e83ede69d143a263dce1ee19e963a66e4500d7e126
-EBUILD signon-kwallet-extension-18.04.3.ebuild 325 BLAKE2B eb4c69958966690f2a85381a81bd7934ab3cbf95711aa7cd7a3c6ae0eb71cec195087ffa317c1a67e9119d4d23886024474f886ab682363ad5b358c3d0aab948 SHA512 ee754c65c63ccde2b638292aea56815f5877c4adf88a1ae99c2a70f45cc332045bb6237e37faece50e0618c6f141af1fef66c9d3d4ae2deb1577455bb728bda0
-EBUILD signon-kwallet-extension-18.08.3.ebuild 324 BLAKE2B d4abdcf0cb633688ee5a498e47f37390e51f3f502351ccc218ea0224f46b899a3c7a4e9a8e090f5c25b3967f6fadd6880a66052fa5ab145db3179e5a83e14332 SHA512 d76f1401a1084d7dde771c2bfffd2a6a2504a52dcd612ed6775f2f24e86c7b4f8de2856e856badf80c74a4e75d0cddb306bec4bdf57b42bd6fc529654bcbc478
+DIST signon-kwallet-extension-18.12.0.tar.xz 10636 BLAKE2B 447a20d60e9277bd8c6570118c190efcb625ccaf9beb735aa87e7b5fca286231cd3147c66bdc951f62ee855f6f4e882ddaf0c9ae518572f528fe12736b4e8e84 SHA512 0a6c2cfa127ff360cbc8eab6f5430ac54e48a2b88ec4f050fa48a660792dae993ce00d4484bcbce35e9fa63610371247cce205b3a740be6d9140404afb3e98ee
+EBUILD signon-kwallet-extension-18.08.3.ebuild 322 BLAKE2B d2e4fb859474831e4cd03615314cab72b334c29bb60ddeccdae8c395796b22fd3aa63cd8b7c1f6d464e5a4e2632b9ae9cc9e08f79d6b8ca8cfee5350c217ff4d SHA512 186d8451a269755e2f6d736940f1072daedb6708aa32896de39f7a937580763f1812cc025c73ebf48c85c19d398fa74aaf4fed484f60efa1d288914b031d1ca3
+EBUILD signon-kwallet-extension-18.12.0.ebuild 324 BLAKE2B d4abdcf0cb633688ee5a498e47f37390e51f3f502351ccc218ea0224f46b899a3c7a4e9a8e090f5c25b3967f6fadd6880a66052fa5ab145db3179e5a83e14332 SHA512 d76f1401a1084d7dde771c2bfffd2a6a2504a52dcd612ed6775f2f24e86c7b4f8de2856e856badf80c74a4e75d0cddb306bec4bdf57b42bd6fc529654bcbc478
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.3.ebuild
index 9adadd52c0e0..32933faa7c51 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KWallet extension for signond"
 HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 
 DEPEND="
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.0.ebuild
index 8246985d661d..9adadd52c0e0 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KWallet extension for signond"
 HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2+"
 
 DEPEND="
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index c23f5e9d0565..8ce23169bf83 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
-DIST spectacle-18.04.3.tar.xz 1073120 BLAKE2B d97d463aee43452ce2a4aeed4f016f29282f509e8fdc110c36b5f98bf7c7a751c100491be06df1d350bd060999c158c70771b2abdcf9c692c5305dee174a85b5 SHA512 c7ac9ec521162fc30a32e16597dd9309481bba1644e75df55e66fe385f27d320015f9ac0193ca333ec4dae201d634a8c99060d1145d28a7a0b5bc69f51e57e42
 DIST spectacle-18.08.3.tar.xz 1048716 BLAKE2B 9d2bf91cad3821ee0a11132b224c992184bf8ba7ac17d6e136bde332bd0e2d2bddd68724d02411e6a393f5c5695f8ea52c4d95a1682cf818dffbcb005178a1e1 SHA512 edf6f5439af917f6beb8d6063b8d7b1567207f3e84b8e07e2cbcd0c25ced4adf58db2b6ce9794a7dd3c31ff6b31c896df92705d01305b25d9164876605be5a54
-EBUILD spectacle-18.04.3-r1.ebuild 1365 BLAKE2B 5ef6f18bb70649547bd949478cfc88b50735b3c31287b3820aadff6be4ad7ffedd536dd4911ca878f810574924b92eba7d98dac10b5560b66eff8779229e3dbe SHA512 8b34910025f44c593757088b6a73aae8d3b117850dcebb9eab330293ae952301fe93d0a358b3ba1afc2b7bf0667f300d7b63cd42fbfcfa32ebb3a91da1defe7c
-EBUILD spectacle-18.08.3.ebuild 1364 BLAKE2B d650c01ea0f134d42e45d8c5f96e5727ab098c1607511abc54de51dfbdb99b9d5da50eb8f9eaa8b0c0ae6cfc0d11fa20be4988b613ba18b5068db517fe318bcd SHA512 e0ae67b59c4871cd4d2cdc79cc7bf5ad0e37c86fc95939fb61bd6e0aaacd31615756d979ce8b379200a967ea165d41da9ea7d092843865d352e45331d7816b7f
+DIST spectacle-18.12.0.tar.xz 1050696 BLAKE2B 650e4939fa88355e634785abfe50aed97c8031acd5c5ee75e357ab2fbeb42343840ded6ab6ce8bef9324f4baa10f7877918358a94287cef048a594ee2c08467f SHA512 8be59f0870314b247c2da76cef89a74a2472936c2bf4790750d150c14d3f859753f8f34ef536ff523caeca2d12adc54a867308e51d2bac90320ee6328133483c
+EBUILD spectacle-18.08.3.ebuild 1362 BLAKE2B b26e6024247206d9bc7b06229f95327ff9d6ee1cf6dc25000fafea0e1b9475c0272ab75e247c096d6d3360d94e0eb66198f7f30d7660d2146ef4fecf741c3d36 SHA512 54bc93a6bba9595e29e94790f8ee1dde1b7096f530cabdcec5f2c7f5ecd16afab2d0732f6a3d490425c56063228a2df14cda17e0457872b77c0ba1e9f4d9be8b
+EBUILD spectacle-18.12.0.ebuild 1343 BLAKE2B 77ad62c93619a4535b22738089b506c5787a64969b148826092c61fa0de248ab827328e2c57d45a900a5f271e088a52f2be3df004bca8cc423ee919418a6a4f3 SHA512 ba41020473cf7cba359abb063aa455c07a71a151114df6549f4f1b9305da8909f55a2febec18598c3c75b498fac3d5845f75cedddc7805f06b0380a82e1cbe42
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-18.08.3.ebuild b/kde-apps/spectacle/spectacle-18.08.3.ebuild
index ce91bdc787db..b4bae83772fb 100644
--- a/kde-apps/spectacle/spectacle-18.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Screenshot capture utility"
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kipi share"
 
 DEPEND="
diff --git a/kde-apps/spectacle/spectacle-18.04.3-r1.ebuild b/kde-apps/spectacle/spectacle-18.12.0.ebuild
index ed9022707a7a..07e70a7e13e6 100644
--- a/kde-apps/spectacle/spectacle-18.04.3-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Screenshot capture utility"
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="kipi share"
 
 DEPEND="
@@ -41,7 +41,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	kipi? ( media-plugins/kipi-plugins:5 )
-	!kde-apps/ksnapshot
 "
 
 src_configure() {
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index d75022d63996..82850c49264c 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
-DIST step-18.04.3.tar.xz 862512 BLAKE2B 7638798a10130f04e219c80dd953f4e226331962f56b8c11342d0181b7f42bf02cb3015bdf60a120d0d8de27dd952bc289438a1dd4196481b35da96614fca1ed SHA512 0634a5e00a8a5e631adbc1090fff41892c6846698706f685c3f4b06457b1ef991fce5539937b2eef039c8e8b13d4ddaf39a40806672d57c16f2c83a736838e79
 DIST step-18.08.3.tar.xz 860260 BLAKE2B 3a5c8f7271288aa6def3656fe711d0fd4a1a7089e4696ea074c2a72b3af16cc3f6269b2bf841294d473e30d7ae77786e70388cd1c065b2a1b9afed052f293d41 SHA512 e9d6af9c9aecba86ba751914d4c1ac18b59da8d5b19ccc45d75461bf63a7730c303ddc0289187304891ed589ee5fcf9504edcc326f4e333e2fd6be391a1b6f9d
-EBUILD step-18.04.3.ebuild 1487 BLAKE2B d162ed0e9feec7a6e3b987fcbd3d756efa7cbce4107a706b2cbd6965ebb938f6f1b1b4ed5a699454761907b1b36e78dc54c417c39e62c33ad95ac2e3e0bfb7c4 SHA512 f062b320c833e096d29f25275d0281cadc5aa32756e41003f4faba2f246bde78f21994854277b506e830e9984c3f835b0a80c594931722f0959a88ba661f3dce
-EBUILD step-18.08.3.ebuild 1487 BLAKE2B d1ff590eaa110d0846b9417fd1a3420281820dca08acdc398a594385d316ea9919d564f6f1b243e4f67e83e7c59816f539eba8bdc9589612b4d6b8a3c7380b18 SHA512 e689cd49542310fc190680115a7dc335947e4104d0f1dd78e2d666f3159ee5098be6f5452ea0aad5bee891b870efbe26bde5b365900996960c78cc604de3a45f
+DIST step-18.12.0.tar.xz 859340 BLAKE2B eb7c670f89267c67537d86033efdadffd93ca475c905f21304c4eac5106a1af94464bba4ffef8cbb8a053a427085859e82a50bea25f461dc2b0afb1b46361437 SHA512 4975a817f562b2b98dec61c50c32dea6bb32e9e210e4292e5f42533b9ad46f4be0128ea4a29606bc1bf850b4a298e2515782bc4c090fc27078852c7b45aa1ffb
+EBUILD step-18.08.3.ebuild 1485 BLAKE2B cde34c082c9255b778098a1a380e935778fa59e8ac4e36371c295d037c0c7f979b1eef5dcbc65c278827b40657cdf06d90df2b8dce6746a419ef5326dff4f7eb SHA512 fd6436eca9a85e79eacdddebfe80ce520d0cc5a922c8cb959bfec514d16a1df6becc46340573d2c2d5ab36cb3d4b41804cfdd2715dfb01b5599dbbfcd55c133b
+EBUILD step-18.12.0.ebuild 1405 BLAKE2B bba850c0c9ba142a269e71895d4e6db750568d5c169715202ad00bbca17bab531f3369e32dd6dad114e108aa2b67f5c7c714e4ce2bf59ae6c9db6ec5d8ef8ebe SHA512 0b01cb1e39934de954ccd5ccfdd010065478ac61b7d851105c0600a6cd1c3ddc1eb6dd6cb93409da719a8bae56f85365615dd49c08f072015205440601954f75
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-18.08.3.ebuild b/kde-apps/step/step-18.08.3.ebuild
index da32123a067f..ec5f17d08099 100644
--- a/kde-apps/step/step-18.08.3.ebuild
+++ b/kde-apps/step/step-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Interactive physics simulator"
 HOMEPAGE="https://edu.kde.org/step/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gsl nls +qalculate"
 
 RDEPEND="
diff --git a/kde-apps/step/step-18.04.3.ebuild b/kde-apps/step/step-18.12.0.ebuild
index e020a4ff8566..98db70a0d248 100644
--- a/kde-apps/step/step-18.04.3.ebuild
+++ b/kde-apps/step/step-18.12.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_HANDBOOK="optional"
 KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://edu.kde.org/step"
-KEYWORDS="amd64 x86"
+HOMEPAGE="https://edu.kde.org/step/"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gsl nls +qalculate"
 
 RDEPEND="
@@ -18,7 +18,6 @@ RDEPEND="
 	$(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)
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index caa0ff4d2a69..da340417c99c 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
-DIST svgpart-18.04.3.tar.xz 20972 BLAKE2B fc2a71498aebaf67966a2edc8129f888b1141520406db99d9e2143e218c2c024ebc5b54a98dcd4f7e923e89aad2c9570922a436e83149f31964057481ecd34c0 SHA512 fad16e4d9841d108cf4450b0de8b616aed3a1525966ed09043d6f83de5822c83496ffd93716c6adaee9387bcc18c95b23b4f8a7553f6d121d0f6587967dc533a
 DIST svgpart-18.08.3.tar.xz 20952 BLAKE2B ef4b8207ebea30ae1da4b55311d78ce614858c058135b16273ed04a2d63f55e3614be39d6675dae2f3bf6fd5c461f39588aefa5669c510ae1595c149d2a6401c SHA512 2bef4ea0f0f14abc1f56492779ac3b83137269730c1b2f240a113a8b85820ba456dc66faa293a9580a44ebc6b235c732194f1c0435bf2a5b0bc4b5b3b0fb7008
-EBUILD svgpart-18.04.3.ebuild 499 BLAKE2B 7ce47fe611520b7e2ce3ab7c3c1d19655b7a255199baa736166dc838e6e007c3501ef95fe6ad20eb73bf7e60ac40529e912586131d038bcd08d1361d35e7e6df SHA512 4ecc4acbd8dad4220fada4b4e3229902df053aa3d858857255174faaaae19d203ad11b1c33e9c105c04a828127086130908fb2eaf93a7d7b126261500b037ee3
-EBUILD svgpart-18.08.3.ebuild 498 BLAKE2B d5f7812f44875577d2a93cc904092b8820749fe1e8ce5ed9cbe8c7ba2eed114c5704720e944b13db20f59371984fbde2d0ac69c3edadd8bff63394357b361d96 SHA512 8c2da153b396edcddd1c24150b18166020e268eeba0760b8fb9d1dd1c7c1138ada1e6b089f5e7e84ef6306e36884824fde532e6e5a23947a004689eb6dbc1654
+DIST svgpart-18.12.0.tar.xz 20848 BLAKE2B 6095c0dc15679147346864dcfbc243b6173697f8cb17cfeba835ff6a44c5452fa0522b41133b7fe962e4dcdaeda311fe3b8490d3ac6cd08f929c1fdd1a7e6ce9 SHA512 55fd4823c3af66ec33f5b6f3ecaadaed305bafb4b073f38b2ab02bbcc7767d4b011d236ae69399964e3852ed6e4ff56b93d305ed235377401fe06c2fbf569e18
+EBUILD svgpart-18.08.3.ebuild 496 BLAKE2B e156d45b77719bb1fc60a7f95b7201c00c0e4ae28510c7e01fa05503fc304adf695cfb6098d9b637fe947bb502c9a4ba7245ab29580f74fecbcc04ffa61eeb1f SHA512 6cc90d01495b433f1d8534183a395fdbf7665123c1c41dff07fa3ac370da70d6b77dc22f384829180cd7b18746c4dbaaf7294dcfdf1d638c9a335ef09263085e
+EBUILD svgpart-18.12.0.ebuild 498 BLAKE2B d5f7812f44875577d2a93cc904092b8820749fe1e8ce5ed9cbe8c7ba2eed114c5704720e944b13db20f59371984fbde2d0ac69c3edadd8bff63394357b361d96 SHA512 8c2da153b396edcddd1c24150b18166020e268eeba0760b8fb9d1dd1c7c1138ada1e6b089f5e7e84ef6306e36884824fde532e6e5a23947a004689eb6dbc1654
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-18.08.3.ebuild b/kde-apps/svgpart/svgpart-18.08.3.ebuild
index 3ff6d7c07710..a77177a587ff 100644
--- a/kde-apps/svgpart/svgpart-18.08.3.ebuild
+++ b/kde-apps/svgpart/svgpart-18.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Kpart for viewing SVGs"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/svgpart/svgpart-18.04.3.ebuild b/kde-apps/svgpart/svgpart-18.12.0.ebuild
index 2d1ece4860af..3ff6d7c07710 100644
--- a/kde-apps/svgpart/svgpart-18.04.3.ebuild
+++ b/kde-apps/svgpart/svgpart-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Kpart for viewing SVGs"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index d3fcc324f645..20710b926022 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
-DIST sweeper-18.04.3.tar.xz 369048 BLAKE2B 4aba6d4403b2e90fda81ef1d79ffce4220ec68f78b2601891a76296f308e42eaabf59beaaac48dc6158ebc00882531f29b2b48df12a785a7736f9b54b43c2ac7 SHA512 d98ed3aca5ea85664c18f6d3a8e5e7055fd1cb12cd17103d75a2261dc81e6b9d4eb54400be3f8b12d2c0109edb8100a7f77353bc8c1597fd0b2a5e3625a21a0d
 DIST sweeper-18.08.3.tar.xz 368368 BLAKE2B f861ac24400e9f126733e74a7c38229436c7fa8ed774567f6d66ab3bcda7e5baedefae390aa1a31aebb48ab450cd0c57b453afa8fa4a3e18c2cbc472326d4e44 SHA512 6a4c44d83327021c241e0473acb1ed0fe8cb0ecd6c45133408448a22973a77ff2a1d52f1a70f97039d5ab835126ed374173c11fcf4f04d7f6b007bf1e67bddfe
-EBUILD sweeper-18.04.3.ebuild 880 BLAKE2B 328f32c415952ac91d846bd4dcd71dc18e5afe2345a9b9bcacefefa5a139e69b86bf0829e012fdeb3f1ea19aa3578fa3a0125c617980cb0b16d544f19748c46c SHA512 fa7096464c23a7f51aa6d2341ded2076836b43566aaab5dabb4d7561dc6001ce9c6bf43c09a8641b1b131820c52bb70dcf3c3cbf84293cc1beef09f78acab107
-EBUILD sweeper-18.08.3.ebuild 880 BLAKE2B 86a21cb56f0f0846f9277b8084df8de20d2dcb059467cd1d873c47245b01c07c1bbb9d291b01cdf77ef7ad04ce95e5df641792b27484c3f7d08b7f95a1d687b6 SHA512 9c8ae7b4def999030f5ea8e47e06ddb0edfdd7094eafbcf49f67570e15fc9fdf95095f7a66e40404e014716ff8c98c41b61cc8416c4857732877c4b9f19cb1ae
+DIST sweeper-18.12.0.tar.xz 368008 BLAKE2B 2fad3ab3fdeadb178d3e2af21734771bdcd612b27bf84bc2d79de6a0ac82646761e069a6896725abe6859244bd2e7cad5f103437de7a8a52a84a65b762b7de58 SHA512 6e9857e7bee662c97529d801c8e0709c6336612cc67b1a3963cd33f74020782ff3d75702dcc2365110ae94595dab40c2b636eb4a946b4c1ab8ef55405451a630
+EBUILD sweeper-18.08.3.ebuild 878 BLAKE2B f086b16dceda0da371124d6b32362ab5db85324bda48b3a599f5ac4e7736f24f313e0ed5d684c0de4f31f2d6e637563be96f2ad5e1cbb048694accd092fcf1f7 SHA512 08169419cbc0ab9423bfbdf9ef4245f6a4ce9d2e11e4d661c3031c38697786a054adc5f10b0ac3c059b1cee66e2435be914bf5abb69212e9f88129bf95d69812
+EBUILD sweeper-18.12.0.ebuild 880 BLAKE2B 86a21cb56f0f0846f9277b8084df8de20d2dcb059467cd1d873c47245b01c07c1bbb9d291b01cdf77ef7ad04ce95e5df641792b27484c3f7d08b7f95a1d687b6 SHA512 9c8ae7b4def999030f5ea8e47e06ddb0edfdd7094eafbcf49f67570e15fc9fdf95095f7a66e40404e014716ff8c98c41b61cc8416c4857732877c4b9f19cb1ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-18.08.3.ebuild b/kde-apps/sweeper/sweeper-18.08.3.ebuild
index fd89b50704c1..83acd93d9fec 100644
--- a/kde-apps/sweeper/sweeper-18.08.3.ebuild
+++ b/kde-apps/sweeper/sweeper-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/sweeper-18.04.3.ebuild b/kde-apps/sweeper/sweeper-18.12.0.ebuild
index e41815cb8b9c..fd89b50704c1 100644
--- a/kde-apps/sweeper/sweeper-18.04.3.ebuild
+++ b/kde-apps/sweeper/sweeper-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,9 +8,9 @@ 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"
+https://utils.kde.org/projects/sweeper/"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
deleted file mode 100644
index 67f4f44b5846..000000000000
--- a/kde-apps/syndication/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST syndication-18.04.3.tar.xz 160132 BLAKE2B cae12c0dbac27ad22afa25ad54bf70744b04ad63a73781c2a81950ae41af72ca74d0d666fc0183050237061f5e382de9ee2b6aba1b626ca6e18d799823f00356 SHA512 319ba72973cf67fb748e521100ababc4290d5a7bb9a8b26d5b288d36a1e00118faa23b92be546996ac98b1432fe719d5d8ceb9cd125d2b35d5ffd200141d2b3f
-EBUILD syndication-18.04.3.ebuild 392 BLAKE2B fe48411fd2d0a2ce7b77635085b328069282da9be4e109a6564af6b469d6f7d37641251784f2ceebc6e5f9314ba78aa1f96da97f6b9ae306ce1ed0d52af248df SHA512 68be4e60c5cdd987e45f798912091a6a06bd27307f9b1bb7ecf8701d4468a7d50b6d14f92a0f2084f67cc646a058f4dad20056200b4c473343a3ce25ad750c0a
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/syndication/Manifest.gz b/kde-apps/syndication/Manifest.gz
new file mode 100644
index 000000000000..425af7e675da
--- /dev/null
+++ b/kde-apps/syndication/Manifest.gz
diff --git a/kde-apps/syndication/syndication-18.04.3.ebuild b/kde-apps/syndication/syndication-18.04.3.ebuild
deleted file mode 100644
index 93c13ab8d2ba..000000000000
--- a/kde-apps/syndication/syndication-18.04.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 9bb7580d00cd..f5c35f41db30 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-thumbnailers-18.04.3.tar.xz 41316 BLAKE2B 336bebbb51f4b2c2650c693e71fa50ef0b08fda87ae16d7b3a4ff386d2c317ae7284eae776642eb942599e8a2a9bf504896860a704cf0d5191ed4cd68b986743 SHA512 d386f56295fdec11646ea04dfa46ad5f60ecf9c8897d6f9cbea477f95953434ea086784cf848198365701b2fe2efe4285f7a9b37fa9d98ebbca84f0859084735
 DIST kdegraphics-thumbnailers-18.08.3.tar.xz 41284 BLAKE2B e3921df4bca8830779eead63e84f38ab08b28f6e7eb4aedb9e2f0297d9a1c6aa9a068d366501d12f212bf184c169da22b7e4b632b596950d312c4d94abcd92b1 SHA512 3caece3e3cf670077a04aa0bb1a5c77ee2ae3868674a19e4aa105fdc6517cd54f002ecdbb1d494af2a0373a56c362c524427c5b23d6f695119368ecf9252a3bc
-EBUILD thumbnailers-18.04.3.ebuild 610 BLAKE2B fb61ab186c414471900aeed69873d5c7737d9cdfeb9a82460ca73cea2be4031c0d40f757de7625afc7bb457172b9518433330d28e1b1cd3a8bb1c5225324ac6a SHA512 c45fa2fb6982139f595e19f99421ddd334f97c2f55196e71a7e6c135cd3b94b7b1b6893bf2cf6e159960fb51f40edac12ef3e94326982c2ff9dc8bec7855a403
-EBUILD thumbnailers-18.08.3.ebuild 609 BLAKE2B 5cf3510528fb3ea41e5676a375691271f5c4e7ddeaafc5029e162035dcfb3d62d38792ab593fafe42253d9072fc546f393e6f392e7e693267e835c255f72302c SHA512 4ce1c46a262930935bc7c9815302baf03abe1fed13d7285de61337d80da86b4b1850be1753308dd2357d81962775ab994bbb57ffb8cc82f6909bce86f5c9442e
+DIST kdegraphics-thumbnailers-18.12.0.tar.xz 41288 BLAKE2B 22f12579b756bf3f7a65154d93605e3ebadeee8005594287dad9048057ad239acdcceca6daa6b125621d5a80c7c1c034e7ad6baf8bc52e238caff05246eca7a8 SHA512 6ae48e1608def399919769fe33adc07feff459477c38a14ce87a0f62a98d260cc02a6339f82141850a8dd1ce9bdbf8340262bc33115368b7726f1a12841b960c
+EBUILD thumbnailers-18.08.3.ebuild 607 BLAKE2B cf754ca4621644e19eb00bf9fc49408a13561c8b0ff307f458c1b26772c1eedad675c99cd5734d5e45797eb6097ffdf2fb1bb472153c70fb9b226239c6549d36 SHA512 52d5bd02f6fd8d15d44388e3d20f95df7d9ee7e2375e25006353dfda5cb4a4a6bbd8c690aec6a9c661c9b3b8d5304041ac3702f4938bc52024f1d2097e1c3335
+EBUILD thumbnailers-18.12.0.ebuild 609 BLAKE2B 5cf3510528fb3ea41e5676a375691271f5c4e7ddeaafc5029e162035dcfb3d62d38792ab593fafe42253d9072fc546f393e6f392e7e693267e835c255f72302c SHA512 4ce1c46a262930935bc7c9815302baf03abe1fed13d7285de61337d80da86b4b1850be1753308dd2357d81962775ab994bbb57ffb8cc82f6909bce86f5c9442e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-18.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-18.08.3.ebuild
index 38bdea3583d8..e8526f3b9a83 100644
--- a/kde-apps/thumbnailers/thumbnailers-18.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/thumbnailers-18.04.3.ebuild b/kde-apps/thumbnailers/thumbnailers-18.12.0.ebuild
index 99b6547eb0e7..38bdea3583d8 100644
--- a/kde-apps/thumbnailers/thumbnailers-18.04.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index b6d731d895ba..b13571436141 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
-DIST umbrello-18.04.3.tar.xz 3019628 BLAKE2B 1c2fe22828bd7716a1d9af42c6c4a2de15633933463fc553d981b0585b0a1ba0a03fe0372e5890c6189652d97084301ed36599e13eae0c39a3e25c892de94276 SHA512 fefecbdb4bc82e84f8174b45be63e195bd2fd769fd91acd6300e6eec8e4fe1c573c3043fb052682caa4772db0c3d73149d40b14cf181fe8c9889e652be03be41
 DIST umbrello-18.08.3.tar.xz 3048228 BLAKE2B 0aeb03360ac8633a738f8066816376991bba83569b4c3d5ada61c481a7009866497da6315b6bbe474a180ce779c5421d90e415ac26ebea8ee32cae961250926e SHA512 2aaceb8e351e4a0a13834ce6ad1c8dd5575ea591e4c69ac080ad53798338200fa9768460ee63f7462941e372ddb9458afba8b602843c63c9cad2cee6f763d6b1
-EBUILD umbrello-18.04.3.ebuild 1372 BLAKE2B 4cf613b6910521a8477356953063c645532760498ce8b54719f3c29e1720ee3eb0ccd7ff1076b2f69ab588ffdf2ca940941438fa948567f4196a125d50b3ce8a SHA512 65168a40a49253b23bb22c1afdc8e5221924073d5dd1bdfafd9575d1c4bb511e8b9605ed09197e1688ffa3b7da7d605355af9a2ce74f0600ac119700835e6fca
-EBUILD umbrello-18.08.3.ebuild 1371 BLAKE2B 36487844d2cb0f983ca193f001fd31d6a4fc52eabc1dc49adc8cc71bb32785c36b37435d2521be4c4c42b29cedc027b698e6444539120b3999281e008e0ef548 SHA512 25323060435a8ec76d5b7bc8f827f31adce2ce9ed6e123d4ede043e7312084e29d3231646a38c13b52b166c73d818472f7ec56e9cbe0fbe46a0da25f38014d26
+DIST umbrello-18.12.0.tar.xz 3049092 BLAKE2B 005b706c0a920125a2b2c4484c8aaa9f33f38df0aeb75d8ed2bece4480e73d4608de37d6f38f9ecac6fce5971946bff6ace7f766e74410f5b002f34c6ec7e10e SHA512 6cd2baf703614d0674e50a97cfbf64b00a63a4cea18bcfd9be63f5e9ef3949e552bdbc5d6bfc389c47f3ffabd22a99b856433ee6f4ddfa16b732deeb1c804df0
+EBUILD umbrello-18.08.3.ebuild 1369 BLAKE2B e5dc34a20a9b3747064d73002d6f6d853cf2f6982f82133137f0284732dfa4a73bd48ea3ec8c0038ea330084db0d0491be7f326965d08ff2d53bfd41793704ba SHA512 34179cc8cb4f5cbab83459ee483df4bb0336a40c17fa7af914609b32da9dad92bc458a0fdb078ef6c5a658891976e73fcc2ad6d0c0ac4f296f27c8e8cf5a46e3
+EBUILD umbrello-18.12.0.ebuild 1371 BLAKE2B 36487844d2cb0f983ca193f001fd31d6a4fc52eabc1dc49adc8cc71bb32785c36b37435d2521be4c4c42b29cedc027b698e6444539120b3999281e008e0ef548 SHA512 25323060435a8ec76d5b7bc8f827f31adce2ce9ed6e123d4ede043e7312084e29d3231646a38c13b52b166c73d818472f7ec56e9cbe0fbe46a0da25f38014d26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-18.08.3.ebuild b/kde-apps/umbrello/umbrello-18.08.3.ebuild
index 4d613c78d05e..c570c012f3e5 100644
--- a/kde-apps/umbrello/umbrello-18.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/development/umbrello
 	https://umbrello.kde.org
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/umbrello/umbrello-18.04.3.ebuild b/kde-apps/umbrello/umbrello-18.12.0.ebuild
index 153c7163daa5..4d613c78d05e 100644
--- a/kde-apps/umbrello/umbrello-18.04.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/development/umbrello
 	https://umbrello.kde.org
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index b8359dec140d..76e98806abb8 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
-DIST zeroconf-ioslave-18.04.3.tar.xz 38980 BLAKE2B d3167ffc83c70dccf2b1a5cb44aaa307a37b05d87f4fb617319c4f7ae1c8e69182cdd1581fa60fb53b67d1b9acb8bfdaa97c8edb9b1f50c78ee768416efa3299 SHA512 f6be3f1ee9fd4300b62a57e8001df76739521a5797b99f8a3a8407f8a8a96180d2e066654f08a73e51ab7d2adbf2311d209dc2f10d2ae2abe85b3efe5e14b79e
 DIST zeroconf-ioslave-18.08.3.tar.xz 38948 BLAKE2B c846229e80e8ab462a59416241f68d13c5198630e94d2cba795e98e07718fb30ca8f4d05c86dd34dcc43afcbc0a30e173fef3d5c524b93182c14cd1e4c6667ef SHA512 d632a27e51f69667f03119cb0b22f98bfb46e7522874aabc44153aa0ee244ba1d3d513cd72470e35feeab5a35d65a7caaca2cdf49e6a7c7cdc3f124a2692f860
-EBUILD zeroconf-ioslave-18.04.3.ebuild 480 BLAKE2B 86b9ede6f3a8ea99d360448d161804c2670b1f56a2cc45c779d42066638b4d37a18d3576c6b7977deee7de52742a3fb0c2b57906cbd606108b58571ce22f1ab1 SHA512 c3373cc48130617e01e151179a6d61d973f647b158663b2e514fb1e03cf181c9f5daa661eca4cf3d7ae4017030e2a4ebef5c5eeefe4049c588937ee45ded30bd
-EBUILD zeroconf-ioslave-18.08.3.ebuild 479 BLAKE2B c82e37f98903de13302e616ce8929732e9787fd65da073e4924e5451eff4d4ef6991e775f94ea788749ce7eeab5805ad37beaf3bf68b8110b412ef376d09c665 SHA512 e3bb87cee8231cf620bc35059816b95b0dea098385d3dbd79142000cf30df2bc13433089bfd23dbd4d1dfb6c8e93dfc45afe3b2a78bf2c6de2cccfeed37c3d11
+DIST zeroconf-ioslave-18.12.0.tar.xz 38744 BLAKE2B 5415cada88d081fde8671f927c19438975c9ed9dede0c05db44b1012a6f83250d168c2e61217dec2112a553dfc2b6d1c7f21ee317204843d8191a4adf20c5d2a SHA512 634ddec8e717d7707e1d8068ca36c584559dd681dee75ac4cb58d5bb64e97171382a6f12df7be568adc6e0e4dc4fe979a8b5e49d0b8a4045ab744d70697fd573
+EBUILD zeroconf-ioslave-18.08.3.ebuild 477 BLAKE2B ea6458363dc734a9f58e831ecfe4b539e1ef90e4565f18d4f55aefe41878d3b9e020c19a6919495ed81d3507b2be5581e06246e94ff9b82d9461470ad14c236d SHA512 cd3ca7b5dfb8abdb9dd27447930d60c65b3b1aa0de612b7803898a0a631cf3888b329425732d363a83ac7d809e9c33332d19433ac97fe4f3063b3f9ed9e6e76c
+EBUILD zeroconf-ioslave-18.12.0.ebuild 479 BLAKE2B c82e37f98903de13302e616ce8929732e9787fd65da073e4924e5451eff4d4ef6991e775f94ea788749ce7eeab5805ad37beaf3bf68b8110b412ef376d09c665 SHA512 e3bb87cee8231cf620bc35059816b95b0dea098385d3dbd79142000cf30df2bc13433089bfd23dbd4d1dfb6c8e93dfc45afe3b2a78bf2c6de2cccfeed37c3d11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.3.ebuild
index 142acde12fd6..c5f5b3636de3 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.0.ebuild
index 3b150f7efc12..142acde12fd6 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /kde-apps
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)