From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 29 Mar 2018 16:53:27 +0100
Subject: gentoo resync : 29.03.2018

---
 kde-plasma/Manifest.gz                             | Bin 7610 -> 7593 bytes
 kde-plasma/bluedevil/Manifest                      |   4 +-
 kde-plasma/bluedevil/bluedevil-5.12.3.ebuild       |  40 -----
 kde-plasma/bluedevil/bluedevil-5.12.4.ebuild       |  40 +++++
 kde-plasma/breeze-grub/Manifest                    |   4 +-
 kde-plasma/breeze-grub/breeze-grub-5.12.3.ebuild   |  30 ----
 kde-plasma/breeze-grub/breeze-grub-5.12.4.ebuild   |  30 ++++
 kde-plasma/breeze-gtk/Manifest                     |   4 +-
 kde-plasma/breeze-gtk/breeze-gtk-5.12.3.ebuild     |  12 --
 kde-plasma/breeze-gtk/breeze-gtk-5.12.4.ebuild     |  12 ++
 kde-plasma/breeze-plymouth/Manifest                |   4 +-
 .../breeze-plymouth/breeze-plymouth-5.12.3.ebuild  |  26 ----
 .../breeze-plymouth/breeze-plymouth-5.12.4.ebuild  |  26 ++++
 kde-plasma/breeze/Manifest                         |   4 +-
 kde-plasma/breeze/breeze-5.12.3.ebuild             |  87 -----------
 kde-plasma/breeze/breeze-5.12.4.ebuild             |  87 +++++++++++
 kde-plasma/drkonqi/Manifest                        |   4 +-
 kde-plasma/drkonqi/drkonqi-5.12.3.ebuild           |  56 -------
 kde-plasma/drkonqi/drkonqi-5.12.4.ebuild           |  56 +++++++
 kde-plasma/kactivitymanagerd/Manifest              |   4 +-
 .../kactivitymanagerd-5.12.3.ebuild                |  35 -----
 .../kactivitymanagerd-5.12.4.ebuild                |  35 +++++
 kde-plasma/kde-cli-tools/Manifest                  |   4 +-
 .../kde-cli-tools/kde-cli-tools-5.12.3.ebuild      |  59 -------
 .../kde-cli-tools/kde-cli-tools-5.12.4.ebuild      |  59 +++++++
 kde-plasma/kde-gtk-config/Manifest                 |   4 +-
 .../kde-gtk-config/kde-gtk-config-5.12.3.ebuild    |  52 -------
 .../kde-gtk-config/kde-gtk-config-5.12.4.ebuild    |  52 +++++++
 kde-plasma/kdecoration/Manifest                    |   4 +-
 kde-plasma/kdecoration/kdecoration-5.12.3.ebuild   |  16 --
 kde-plasma/kdecoration/kdecoration-5.12.4.ebuild   |  16 ++
 kde-plasma/kdeplasma-addons/Manifest               |   4 +-
 .../kdeplasma-addons-5.12.3.ebuild                 |  59 -------
 .../kdeplasma-addons-5.12.4.ebuild                 |  59 +++++++
 kde-plasma/kgamma/Manifest                         |   4 +-
 kde-plasma/kgamma/kgamma-5.12.3.ebuild             |  26 ----
 kde-plasma/kgamma/kgamma-5.12.4.ebuild             |  26 ++++
 kde-plasma/khotkeys/Manifest                       |   4 +-
 kde-plasma/khotkeys/khotkeys-5.12.3.ebuild         |  46 ------
 kde-plasma/khotkeys/khotkeys-5.12.4.ebuild         |  46 ++++++
 kde-plasma/kinfocenter/Manifest                    |   4 +-
 kde-plasma/kinfocenter/kinfocenter-5.12.3.ebuild   |  91 -----------
 kde-plasma/kinfocenter/kinfocenter-5.12.4.ebuild   |  91 +++++++++++
 kde-plasma/kmenuedit/Manifest                      |   4 +-
 kde-plasma/kmenuedit/kmenuedit-5.12.3.ebuild       |  44 ------
 kde-plasma/kmenuedit/kmenuedit-5.12.4.ebuild       |  44 ++++++
 kde-plasma/kscreen/Manifest                        |   4 +-
 kde-plasma/kscreen/kscreen-5.12.3.ebuild           |  38 -----
 kde-plasma/kscreen/kscreen-5.12.4.ebuild           |  38 +++++
 kde-plasma/kscreenlocker/Manifest                  |   4 +-
 .../kscreenlocker/kscreenlocker-5.12.3.ebuild      |  96 ------------
 .../kscreenlocker/kscreenlocker-5.12.4.ebuild      |  96 ++++++++++++
 kde-plasma/ksshaskpass/Manifest                    |   4 +-
 kde-plasma/ksshaskpass/ksshaskpass-5.12.3.ebuild   |  49 ------
 kde-plasma/ksshaskpass/ksshaskpass-5.12.4.ebuild   |  49 ++++++
 kde-plasma/ksysguard/Manifest                      |   4 +-
 kde-plasma/ksysguard/ksysguard-5.12.3.ebuild       |  47 ------
 kde-plasma/ksysguard/ksysguard-5.12.4.ebuild       |  47 ++++++
 kde-plasma/kwallet-pam/Manifest                    |   4 +-
 kde-plasma/kwallet-pam/kwallet-pam-5.12.3.ebuild   |  33 ----
 kde-plasma/kwallet-pam/kwallet-pam-5.12.4.ebuild   |  33 ++++
 kde-plasma/kwayland-integration/Manifest           |   4 +-
 .../kwayland-integration-5.12.3.ebuild             |  22 ---
 .../kwayland-integration-5.12.4.ebuild             |  22 +++
 kde-plasma/kwin/Manifest                           |   4 +-
 kde-plasma/kwin/kwin-5.12.3.ebuild                 | 106 -------------
 kde-plasma/kwin/kwin-5.12.4.ebuild                 | 106 +++++++++++++
 kde-plasma/kwrited/Manifest                        |   4 +-
 kde-plasma/kwrited/kwrited-5.12.3.ebuild           |  23 ---
 kde-plasma/kwrited/kwrited-5.12.4.ebuild           |  23 +++
 kde-plasma/libkscreen/Manifest                     |   4 +-
 kde-plasma/libkscreen/libkscreen-5.12.3.ebuild     |  27 ----
 kde-plasma/libkscreen/libkscreen-5.12.4.ebuild     |  27 ++++
 kde-plasma/libksysguard/Manifest                   |   4 +-
 kde-plasma/libksysguard/libksysguard-5.12.3.ebuild |  53 -------
 kde-plasma/libksysguard/libksysguard-5.12.4.ebuild |  53 +++++++
 kde-plasma/milou/Manifest                          |   4 +-
 kde-plasma/milou/milou-5.12.3.ebuild               |  30 ----
 kde-plasma/milou/milou-5.12.4.ebuild               |  30 ++++
 kde-plasma/oxygen/Manifest                         |   4 +-
 kde-plasma/oxygen/oxygen-5.12.3.ebuild             |  93 -----------
 kde-plasma/oxygen/oxygen-5.12.4.ebuild             |  93 +++++++++++
 kde-plasma/plasma-desktop/Manifest                 |   4 +-
 .../plasma-desktop/plasma-desktop-5.12.3.ebuild    | 163 -------------------
 .../plasma-desktop/plasma-desktop-5.12.4.ebuild    | 163 +++++++++++++++++++
 kde-plasma/plasma-integration/Manifest             |   4 +-
 .../plasma-integration-5.12.3.ebuild               |  43 -----
 .../plasma-integration-5.12.4.ebuild               |  43 +++++
 kde-plasma/plasma-meta/Manifest                    |   2 +-
 kde-plasma/plasma-meta/plasma-meta-5.12.3.ebuild   |  80 ----------
 kde-plasma/plasma-meta/plasma-meta-5.12.4.ebuild   |  80 ++++++++++
 kde-plasma/plasma-nm/Manifest                      |   4 +-
 kde-plasma/plasma-nm/plasma-nm-5.12.3.ebuild       |  75 ---------
 kde-plasma/plasma-nm/plasma-nm-5.12.4.ebuild       |  75 +++++++++
 kde-plasma/plasma-pa/Manifest                      |   4 +-
 kde-plasma/plasma-pa/plasma-pa-5.12.3.ebuild       |  29 ----
 kde-plasma/plasma-pa/plasma-pa-5.12.4.ebuild       |  29 ++++
 kde-plasma/plasma-sdk/Manifest                     |   4 +-
 kde-plasma/plasma-sdk/plasma-sdk-5.12.3.ebuild     |  39 -----
 kde-plasma/plasma-sdk/plasma-sdk-5.12.4.ebuild     |  39 +++++
 kde-plasma/plasma-vault/Manifest                   |   4 +-
 kde-plasma/plasma-vault/plasma-vault-5.12.3.ebuild |  34 ----
 kde-plasma/plasma-vault/plasma-vault-5.12.4.ebuild |  34 ++++
 kde-plasma/plasma-workspace-wallpapers/Manifest    |   4 +-
 .../plasma-workspace-wallpapers-5.12.3.ebuild      |  18 ---
 .../plasma-workspace-wallpapers-5.12.4.ebuild      |  18 +++
 kde-plasma/plasma-workspace/Manifest               |   4 +-
 .../plasma-workspace-5.12.3.ebuild                 | 173 ---------------------
 .../plasma-workspace-5.12.4.ebuild                 | 173 +++++++++++++++++++++
 kde-plasma/plymouth-kcm/Manifest                   |   4 +-
 kde-plasma/plymouth-kcm/plymouth-kcm-5.12.3.ebuild |  36 -----
 kde-plasma/plymouth-kcm/plymouth-kcm-5.12.4.ebuild |  36 +++++
 kde-plasma/polkit-kde-agent/Manifest               |   4 +-
 .../polkit-kde-agent-5.12.3.ebuild                 |  30 ----
 .../polkit-kde-agent-5.12.4.ebuild                 |  30 ++++
 kde-plasma/powerdevil/Manifest                     |   4 +-
 kde-plasma/powerdevil/powerdevil-5.12.3.ebuild     |  82 ----------
 kde-plasma/powerdevil/powerdevil-5.12.4.ebuild     |  68 ++++++++
 kde-plasma/sddm-kcm/Manifest                       |   4 +-
 kde-plasma/sddm-kcm/sddm-kcm-5.12.3.ebuild         |  41 -----
 kde-plasma/sddm-kcm/sddm-kcm-5.12.4.ebuild         |  41 +++++
 kde-plasma/systemsettings/Manifest                 |   4 +-
 .../systemsettings/systemsettings-5.12.3.ebuild    |  52 -------
 .../systemsettings/systemsettings-5.12.4.ebuild    |  52 +++++++
 kde-plasma/user-manager/Manifest                   |   4 +-
 kde-plasma/user-manager/user-manager-5.12.3.ebuild |  27 ----
 kde-plasma/user-manager/user-manager-5.12.4.ebuild |  27 ++++
 127 files changed, 2287 insertions(+), 2301 deletions(-)
 delete mode 100644 kde-plasma/bluedevil/bluedevil-5.12.3.ebuild
 create mode 100644 kde-plasma/bluedevil/bluedevil-5.12.4.ebuild
 delete mode 100644 kde-plasma/breeze-grub/breeze-grub-5.12.3.ebuild
 create mode 100644 kde-plasma/breeze-grub/breeze-grub-5.12.4.ebuild
 delete mode 100644 kde-plasma/breeze-gtk/breeze-gtk-5.12.3.ebuild
 create mode 100644 kde-plasma/breeze-gtk/breeze-gtk-5.12.4.ebuild
 delete mode 100644 kde-plasma/breeze-plymouth/breeze-plymouth-5.12.3.ebuild
 create mode 100644 kde-plasma/breeze-plymouth/breeze-plymouth-5.12.4.ebuild
 delete mode 100644 kde-plasma/breeze/breeze-5.12.3.ebuild
 create mode 100644 kde-plasma/breeze/breeze-5.12.4.ebuild
 delete mode 100644 kde-plasma/drkonqi/drkonqi-5.12.3.ebuild
 create mode 100644 kde-plasma/drkonqi/drkonqi-5.12.4.ebuild
 delete mode 100644 kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.3.ebuild
 create mode 100644 kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.4.ebuild
 delete mode 100644 kde-plasma/kde-cli-tools/kde-cli-tools-5.12.3.ebuild
 create mode 100644 kde-plasma/kde-cli-tools/kde-cli-tools-5.12.4.ebuild
 delete mode 100644 kde-plasma/kde-gtk-config/kde-gtk-config-5.12.3.ebuild
 create mode 100644 kde-plasma/kde-gtk-config/kde-gtk-config-5.12.4.ebuild
 delete mode 100644 kde-plasma/kdecoration/kdecoration-5.12.3.ebuild
 create mode 100644 kde-plasma/kdecoration/kdecoration-5.12.4.ebuild
 delete mode 100644 kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.3.ebuild
 create mode 100644 kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.4.ebuild
 delete mode 100644 kde-plasma/kgamma/kgamma-5.12.3.ebuild
 create mode 100644 kde-plasma/kgamma/kgamma-5.12.4.ebuild
 delete mode 100644 kde-plasma/khotkeys/khotkeys-5.12.3.ebuild
 create mode 100644 kde-plasma/khotkeys/khotkeys-5.12.4.ebuild
 delete mode 100644 kde-plasma/kinfocenter/kinfocenter-5.12.3.ebuild
 create mode 100644 kde-plasma/kinfocenter/kinfocenter-5.12.4.ebuild
 delete mode 100644 kde-plasma/kmenuedit/kmenuedit-5.12.3.ebuild
 create mode 100644 kde-plasma/kmenuedit/kmenuedit-5.12.4.ebuild
 delete mode 100644 kde-plasma/kscreen/kscreen-5.12.3.ebuild
 create mode 100644 kde-plasma/kscreen/kscreen-5.12.4.ebuild
 delete mode 100644 kde-plasma/kscreenlocker/kscreenlocker-5.12.3.ebuild
 create mode 100644 kde-plasma/kscreenlocker/kscreenlocker-5.12.4.ebuild
 delete mode 100644 kde-plasma/ksshaskpass/ksshaskpass-5.12.3.ebuild
 create mode 100644 kde-plasma/ksshaskpass/ksshaskpass-5.12.4.ebuild
 delete mode 100644 kde-plasma/ksysguard/ksysguard-5.12.3.ebuild
 create mode 100644 kde-plasma/ksysguard/ksysguard-5.12.4.ebuild
 delete mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.12.3.ebuild
 create mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.12.4.ebuild
 delete mode 100644 kde-plasma/kwayland-integration/kwayland-integration-5.12.3.ebuild
 create mode 100644 kde-plasma/kwayland-integration/kwayland-integration-5.12.4.ebuild
 delete mode 100644 kde-plasma/kwin/kwin-5.12.3.ebuild
 create mode 100644 kde-plasma/kwin/kwin-5.12.4.ebuild
 delete mode 100644 kde-plasma/kwrited/kwrited-5.12.3.ebuild
 create mode 100644 kde-plasma/kwrited/kwrited-5.12.4.ebuild
 delete mode 100644 kde-plasma/libkscreen/libkscreen-5.12.3.ebuild
 create mode 100644 kde-plasma/libkscreen/libkscreen-5.12.4.ebuild
 delete mode 100644 kde-plasma/libksysguard/libksysguard-5.12.3.ebuild
 create mode 100644 kde-plasma/libksysguard/libksysguard-5.12.4.ebuild
 delete mode 100644 kde-plasma/milou/milou-5.12.3.ebuild
 create mode 100644 kde-plasma/milou/milou-5.12.4.ebuild
 delete mode 100644 kde-plasma/oxygen/oxygen-5.12.3.ebuild
 create mode 100644 kde-plasma/oxygen/oxygen-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-integration/plasma-integration-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-integration/plasma-integration-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-meta/plasma-meta-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-meta/plasma-meta-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-nm/plasma-nm-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-nm/plasma-nm-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-pa/plasma-pa-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-pa/plasma-pa-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-sdk/plasma-sdk-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-sdk/plasma-sdk-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-vault/plasma-vault-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-vault/plasma-vault-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.4.ebuild
 delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.12.3.ebuild
 create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.12.4.ebuild
 delete mode 100644 kde-plasma/plymouth-kcm/plymouth-kcm-5.12.3.ebuild
 create mode 100644 kde-plasma/plymouth-kcm/plymouth-kcm-5.12.4.ebuild
 delete mode 100644 kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.3.ebuild
 create mode 100644 kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.4.ebuild
 delete mode 100644 kde-plasma/powerdevil/powerdevil-5.12.3.ebuild
 create mode 100644 kde-plasma/powerdevil/powerdevil-5.12.4.ebuild
 delete mode 100644 kde-plasma/sddm-kcm/sddm-kcm-5.12.3.ebuild
 create mode 100644 kde-plasma/sddm-kcm/sddm-kcm-5.12.4.ebuild
 delete mode 100644 kde-plasma/systemsettings/systemsettings-5.12.3.ebuild
 create mode 100644 kde-plasma/systemsettings/systemsettings-5.12.4.ebuild
 delete mode 100644 kde-plasma/user-manager/user-manager-5.12.3.ebuild
 create mode 100644 kde-plasma/user-manager/user-manager-5.12.4.ebuild

(limited to 'kde-plasma')

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index d5fdb304e1c0..876efacd7fd4 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index a8c003cb9408..91793cfacc1c 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.11.5.tar.xz 153380 BLAKE2B 1342ea233c6ea2b7a325eefafe1528d27d1f060bdf628ecd6c7dcddb0323ed10d6dc11ddcbf96a9f6913202ea327979a4f06d9cc7fdc70d02595b0a593a9a819 SHA512 273c1d3a649c7e78e78f27a10199057e2b06940e281eeeb7555bd2d40a6d9f9f7aaa38b5c0a84549f3ff13ec3209b63dde00dcce2ef8855a0cf46030f477594b
-DIST bluedevil-5.12.3.tar.xz 149576 BLAKE2B 46c3177246fd81c4d43c0b3bea0206a5e4220ab42d884528ed109b0ca4a5616d89b9fcfcc514da045902aad36533d3befe59fcef9bb5c3ca2dc862fd9461ff76 SHA512 61156547ac7a45c1e905c0141f4a0e29599a4cb1c91e0c5a0a4a226269430ca679899d840ad0fbb15333d474e05141647cb6b8cf9aa44988e95fccaf9fab26d1
+DIST bluedevil-5.12.4.tar.xz 149480 BLAKE2B 42c5e1f5d2208cc33c0645f0887f63794cf3f1acea7026401ac31023b0f3cb5d704964b70c10850555cd390ce132f81ad371e2f639df7907dbcb0754b400df8d SHA512 f885b859eb9bd864f1da4dba7f9239f60c050705df59f82f6a8d11c7bd8dabd546d58ddb7814a9b89c8860520e68e920c156f80543902ce66046f106c9072366
 EBUILD bluedevil-5.11.5.ebuild 1003 BLAKE2B 57d5960097bbd4ac906c8f3e9d276d501c0526a8fb66843b3ceb3f6367142ef44f2a0a49a66eb128a1f71f16b423343ea7f2d31331f621d02c73231cf88dfba1 SHA512 671c68e6b660dd79464865cc0a98a460a5e6db41606d54b95ac232aae44b12e5e11afc6af19f3b7c2b51ba1db5648516dcafebdedfe5c49d93b5639c1a9cc323
-EBUILD bluedevil-5.12.3.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
+EBUILD bluedevil-5.12.4.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.12.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.12.3.ebuild
deleted file mode 100644
index d57eb297ca48..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.12.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.12.4.ebuild
new file mode 100644
index 000000000000..d57eb297ca48
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.12.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!kde-plasma/bluedevil:4
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index e6b0fb31c6d2..a03ab1c1a2f8 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.11.5.tar.xz 3157272 BLAKE2B 1c4f9bed314f4968b00e7283203ce24ffa7911c4e7fcd0631ddb942ece5eaa104773bf267ee23449125cc902a20e7d8eae5be595d12c7b1eeae055455b5849d4 SHA512 87802343c23cf4a73160a669fbec69cd529b992c31fb6d4a3578e31f5c9eeb4bc418ba811e705d95c37b1e2047bd08619c369f3e16208dba7fcde1f8d56bd6f8
-DIST breeze-grub-5.12.3.tar.xz 3142168 BLAKE2B 96a9120e40910e244c0d81c2b149dbf1c173724ebe43002251d8be087e9d80f73074f5af78a46380964b8e281705356d26059c4f2ad10a5e462545ccefe91a5b SHA512 de6afba06e1ef2394f06315ace0ec5691facbe2ccfca0ab801af73935a6dd44f44c718c1d4f41e5ee5928321f8a4d17689355124284ca91853b64b377039f654
+DIST breeze-grub-5.12.4.tar.xz 3160636 BLAKE2B 97ac99342fed47e0a0143844a9123914af034c776a031e5af3c6146030e9bcc4051e82b506ca8c717924409d7f2d59538c570bcbba3e78f68a76bd57f7682820 SHA512 94ee4ab227b15ef3b7abcaf42b06abaf2da0789fcca99a922dc6c4313cc47599e3d8b75c3c42c103b30ccb2a2991ccfcd5a2d4f54668845cb39a143dbf70baba
 EBUILD breeze-grub-5.11.5.ebuild 398 BLAKE2B 34128bcfe78858a3695db8c09bc6666396dab77c982c12bf987c0dc727eda420cfb8b8474e8dc21e0575c4118854bf33f84a81057b52ee619d4b43180f831c50 SHA512 06527001727ebde78101ce6e8672fa30393b4652d706c54d94e463aa1aa062b15ba2ec85adf555fd418465d3802e43b2acba0490fd1279b596e628ca5fd4d353
-EBUILD breeze-grub-5.12.3.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
+EBUILD breeze-grub-5.12.4.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.12.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.12.3.ebuild
deleted file mode 100644
index 8ef3ef186a85..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.12.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
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for GRUB"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.12.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.12.4.ebuild
new file mode 100644
index 000000000000..8ef3ef186a85
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.12.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index ff5611f5909c..0ae6088f589a 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.11.5.tar.xz 218340 BLAKE2B 9f729336e0a5844fc8258f9900f7e5dc738c33e4d6a63f3a8b7fcc0f5fdf202d36a991397568dcdd3c608e3a93e9c5ff085d47b2d91a345f7b6587b530b035b1 SHA512 d940624cff5b785d2b32ca6329f463b4c545ae613fb5e7364537703086900f920fe72c25f5731ba24409e27469e2281b5d74bfd36ffedee66cbd8ac62be0c53d
-DIST breeze-gtk-5.12.3.tar.xz 213800 BLAKE2B 313fd4129064370688d16d1b0206820be2e67ebca33d755e023edd32e58542ada85dd1a5745f0615c9b6a336a33426777feb9324c744b51566c4ede36f5ac68a SHA512 958804d1985869a81f393ebfb0e0e5eff7ac552a48b4e34d86a2966de7dbbac8bffc186d521426eb6c2412fe00021626bb74be349363e7238d99230350f7eafe
+DIST breeze-gtk-5.12.4.tar.xz 213816 BLAKE2B 5bec5c39b1a68ca7f05dd25d2c92a5ee59d38375013520b3c38bc866462e7e4fd2ca9ac27cc029de8ab52e0940289d6126095413212f518c622a7a2453d3c72d SHA512 57c50ee48e809c31476c5df8fc1b0ebe35115b8370e4103c14b5394bef86da552675c1563dd8178f132d05917759a7aa05088d381e9f787583b5d95840f5f5c4
 EBUILD breeze-gtk-5.11.5.ebuild 296 BLAKE2B f1bbe6e13a0a65a151abc8c8a7cf5ec1e0db57167c3237236d061b500c716fee97e9eb7aa3e20d41d7b5d6b898cebe388914390bd7220e1142ed2a2a8d4e767d SHA512 c6cd9fb98a87e8c9ee53dfb708645cf340182e4bc9b88a830d809e642f3b6c3db300fc377865657240b4d110cc9a206be75af38715007aa22efa38f1825723d7
-EBUILD breeze-gtk-5.12.3.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
+EBUILD breeze-gtk-5.12.4.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.12.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.12.3.ebuild
deleted file mode 100644
index ef50e787f58e..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.12.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.12.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.12.4.ebuild
new file mode 100644
index 000000000000..ef50e787f58e
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.12.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 2952b3328e95..234f0ccb2fe1 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.11.5.tar.xz 106612 BLAKE2B d2f3f63e1f04f31de8b98a4ca63a529cbd2282db64527fe6faf030bd6bfa441da9213b467ac441eddffd870028f3e5bbfe79562fa7eb3f485d5f391f4c7d1dae SHA512 218045bf35efff475bf9aa4f1e8d117b42b671ba036a7dd67a2b6a8538ee4317f84415e53ffd17bb9645f7971bf575beae1cc1de7b6f67e37166fde25cf92c44
-DIST breeze-plymouth-5.12.3.tar.xz 105592 BLAKE2B 7b36f5b24abc5875b662342b4d608c382626fa81cf07defc8771ebd67b3be5f873902061417093205058456dfc7ea60588ec0034259852b40a1572341ed23e8e SHA512 3216f3b7224e0966b95679ee700601bfc56ed9becc30fa285cadee78b0662d7e198813ede511ad79200af8d24d9ff8878eaf45abe81d260fe0562ffaa4b53c88
+DIST breeze-plymouth-5.12.4.tar.xz 105564 BLAKE2B 7af1a9265dca67c06c9fd6409f1ddc53518957c3fd7f2ce5ce94934a12dea7cb7b30b2b0263bd0af4dff2b7969ce5ea9df9d5704d1a09eb1a9955321db9bf4c1 SHA512 9c78b84822e2c9e29cf5968eaf4c42523fec36614e8dd9cf2c137855dfa5d03394dc13fbb7db2dde6f13976981a61aa29b2ee741692be17993b7f0f1a5c4bc0b
 EBUILD breeze-plymouth-5.11.5.ebuild 459 BLAKE2B 25ab42a671b0dc5b5f299843f8c56d583cf042ad375ba7f57b60d62510eae9760937a50d8b8cd3ca4154e829d4712970df5183cd88d8c7c125aa3cc48285f41c SHA512 e47b0896263d14f388f5f5bb2dbb8635a075bba76046f2a03e77473829d843393dd4b4eddac6869ee03dda7dbb8fd235c1b2bc99655e580cae138865a0d7dcac
-EBUILD breeze-plymouth-5.12.3.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
+EBUILD breeze-plymouth-5.12.4.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.3.ebuild
deleted file mode 100644
index 7c86b9c8d818..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.4.ebuild
new file mode 100644
index 000000000000..7c86b9c8d818
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 887a07451b4a..f16ea2143dee 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.11.5.tar.xz 22228964 BLAKE2B f3fdcc10b7350acf612bec9edf4cbea544c6f1dbbc713c8cf9903054b3fb015fffa3a9be5fed4ce5d19209a476d9a84fbcc219ff5cdcdc93e05f3537bb209e85 SHA512 4ef2e7507f7175af7725157611bfe6339d417749d565e50760a5da70db7603f59a9c41deec42f343149442b2e82204eb9519354fb91e407d4c89a9300edad2df
-DIST breeze-5.12.3.tar.xz 22208204 BLAKE2B 820cf44897cfa277f662c5322d9a056b6c2d149fa8befb20e59952022faf183a2aad1c1deafda99415fed72a9fe0bfe5e0a9d5f82c6872d568ba40b929fd59bd SHA512 e9164dafdc6324103db4428e9e6d1819d3ff9e9d8f846392862e0f22719ffeb34b30c591dba8df48f733d4f0c18cca537b8d7d0d6e8d64ea55126fde56cf7c5e
+DIST breeze-5.12.4.tar.xz 22206808 BLAKE2B bbd26db38ebbff312733a4da702ed0357a3aa2029b3c63def8d69f0654347ae647c8af4b2de56ba0195484dabe770e03e11d2af49fe75b3c294c7d2f2b58a621 SHA512 1d0544beb6ef92354dbc0397ae04c3949ec4cd817bc78f50f07e945b4e32e9aa57a3a1e784194597548cb9cc1a6973ab934087c9d4c9c3151648486b7c8b2fd4
 EBUILD breeze-5.11.5.ebuild 1867 BLAKE2B 24ba84df08da2ed59de370a074062e35195d0460e571c405c1aede248af731438b9c94e7ab6fea288790c0021e8ee0be332c42007e79b76a0316419bee6cb4be SHA512 2d93e0dcb6ce34f3c042e5b7edc3b098aa9ef7cd72efae48cae3966ea355064a584edea9e42ec86ce5b3410247af1a49cccb1ad1bb2347f0a670ba9e17bc585b
-EBUILD breeze-5.12.3.ebuild 1869 BLAKE2B 3b2321cce93b09d45d87979768db5beb3aae44ed719e1ebb0d38b923d1d6fcb5609a1723f02ca8d74bae9d726fa8e8cbf7aca6ea0da3c7ddc61960b4021d37c1 SHA512 0acfec56efa5361419f51f358418bd2b30e62157e07a427a1f68448f9d465af7a6aaa9b7ff53d0757d12a5e597db19dfa0d447dfdaa0e9566eefc1a0de0d3174
+EBUILD breeze-5.12.4.ebuild 1869 BLAKE2B 3b2321cce93b09d45d87979768db5beb3aae44ed719e1ebb0d38b923d1d6fcb5609a1723f02ca8d74bae9d726fa8e8cbf7aca6ea0da3c7ddc61960b4021d37c1 SHA512 0acfec56efa5361419f51f358418bd2b30e62157e07a427a1f68448f9d465af7a6aaa9b7ff53d0757d12a5e597db19dfa0d447dfdaa0e9566eefc1a0de0d3174
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.12.3.ebuild b/kde-plasma/breeze/breeze-5.12.3.ebuild
deleted file mode 100644
index d16baa9e1fe0..000000000000
--- a/kde-plasma/breeze/breeze-5.12.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="qt4 wayland X"
-
-REQUIRED_USE="qt4? ( X )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kpackage)
-	qt4? ( dev-util/automoc:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			use debug || append-cppflags -DQT_NO_DEBUG
-			mycmakeargs+=(
-				-DUSE_KDE4=true
-				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			)
-			cmake-utils_src_configure
-		else
-			mycmakeargs+=(
-				$(cmake-utils_use_find_package wayland KF5Wayland)
-				$(cmake-utils_use_find_package X XCB)
-			)
-			kde5_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/breeze/breeze-5.12.4.ebuild b/kde-plasma/breeze/breeze-5.12.4.ebuild
new file mode 100644
index 000000000000..d16baa9e1fe0
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.12.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qt4 wayland X"
+
+REQUIRED_USE="qt4? ( X )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	qt4? (
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kpackage)
+	qt4? ( dev-util/automoc:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			use debug || append-cppflags -DQT_NO_DEBUG
+			mycmakeargs+=(
+				-DUSE_KDE4=true
+				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+			)
+			cmake-utils_src_configure
+		else
+			mycmakeargs+=(
+				$(cmake-utils_use_find_package wayland KF5Wayland)
+				$(cmake-utils_use_find_package X XCB)
+			)
+			kde5_src_configure
+		fi
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 88f54c80ae76..e375cb200c23 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,6 @@
 AUX drkonqi-5.11.1-x11.patch 1438 BLAKE2B 99750e2d33999bf2f97e5f6ef519ef22aa6889e9605ed133350a5ec0f9df55a4736b2bb61cccc8c414dc445cc5b4cd6b7742731e985609e76e692009f5c258b7 SHA512 3d19b11f7cfd47bcabcdaf7b3bb4dc1e38b38a5e52a3c23849860ed851b1211aaaa61da48f23a46f7a51dea7ec2f132a3c16577bea042da513d1bc84264e0bb4
 DIST drkonqi-5.11.5.tar.xz 746660 BLAKE2B 9ca5290ff64186347bc03133440c54da94256064868e1c854fb7813b7211d480e34ada74ae312dc7f18219ea81072eef5e2e4204e0bfcf7a712296157c37086b SHA512 6bf7435e091494627f50d2c047467e585f31e51ad5ecab242664230b118272303d245c07ff65fb3fbdbcfe2fb1283134fa69c029c5e42b4df98e6f9a859c0105
-DIST drkonqi-5.12.3.tar.xz 739124 BLAKE2B 1852b49c1bd7f34da552347ca73759e545774c722484d4c3680a488d4511d2a8e199d55dcc9002183d32529376ccd5a2a6a9bb1e81a9d6025366d0e165f92fa7 SHA512 bc5082d088622641c744f42de6077863dc67e0a3efd25fd1d594210facc61ad7cf051f3c36a367a912fab4621fced306c23fcb520231cf5c2ab5023903436745
+DIST drkonqi-5.12.4.tar.xz 735824 BLAKE2B 3cf8817a3b8c3f3e71b22a0319efe88546a7e89b45e1f7671dcc7c6c7557e9d394cddafee4a20b4b4e8a7cf1861d08f7dcd278ad3eb60d077b22efa84970fc9c SHA512 53c3d98e7545a20b3de9fbf7eacb633a2d50606fcaab645af096ffff423222913d8497dc2dfeab0426db66b1d3cb58a8e55b5e4f4ed013fbeb57729f9fd4c6c8
 EBUILD drkonqi-5.11.5.ebuild 1414 BLAKE2B efa2f0f71116246f3a5e394e3be9241bdfa638865daf575d8f820662715fce9a6a107425f87682af3707eca22c729ec32fd47ac5ae41096a0e2ab3199e5bccb0 SHA512 1555dc8391e557a98f953c8d36dbed282efcd46c7add75199f64868d59277c07c0d63de46ad30b067eb275741ed5fbd5b3d37df003ee3a905f3279be088bd5ff
-EBUILD drkonqi-5.12.3.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
+EBUILD drkonqi-5.12.4.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.12.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.12.3.ebuild
deleted file mode 100644
index 08c83e00ef5a..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.12.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/drkonqi:4
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.12.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.12.4.ebuild
new file mode 100644
index 000000000000..08c83e00ef5a
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.12.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/drkonqi:4
+	!<kde-plasma/plasma-workspace-5.10.95:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 58d5bf20791c..963766f4e010 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.11.5.tar.xz 89720 BLAKE2B b4fea473744ed25abd44831418a2e427b86b865385392044aea8b3bada705b8038c2e85b6273f05874c2bd26d6f283e7bf674f082f5435690a08b2348ae2c1f2 SHA512 8c10b5a8716580dbbb42883bf7acc78e23877797e30208400cca9b37d7d921a2873854733ffd730fbb37b6d79b0b44aebbfa6274376123fdfc0999f362793745
-DIST kactivitymanagerd-5.12.3.tar.xz 84828 BLAKE2B 446617c66d5bc38f14028e3d8e2491d62cbbe1f9a07023a9292cf0b7d105a9a934a25b672ebe2b2341e0d2ab0641ac56a581b10a2c1574af8a6c0627d4b2cdb2 SHA512 a0250362a37edfc176caa9fd2b2fe9ca00eb78840f320255bf9a9c2d90c0b8bdeb608f7995f9ab5ddbf573cf8ac5307932e3b6c23b2d27d548f13508500daba9
+DIST kactivitymanagerd-5.12.4.tar.xz 84984 BLAKE2B 68a1cdf0fefef7af86fedd5b8cc586ca270959faca16c3fdb98f3967dba449e720c1fb9b11c0e33fd4a149441ac44e62064be31a7e9c4b2dce431d21bb1ad2fa SHA512 54cef6dadfd943e6dd9f7f7ede912f022120c705ab7c9c57265f5e03c459f61763e731f65c076474be352b1a0539556a4caa9875053ece521f1ac2375f40df73
 EBUILD kactivitymanagerd-5.11.5.ebuild 886 BLAKE2B f7585849689d9db572c6157d21e7784fa70efafee71596809db33fcff09f2a76b60eaba7b75ef2becb72ce241f8c28b42fa7fb2c895df887f743e96545a4553e SHA512 f9536e1bf8f5271ea2e833ee3b21d4487e08ff0ab25dd509f4ed4f9cb011cff363ea81b9f5705b3fa6140b80fc36625d3354505e4214bee51259057c1f707de8
-EBUILD kactivitymanagerd-5.12.3.ebuild 888 BLAKE2B 08dffbb6f68abe07727655187f6082abf0c8522e4069a1141e7ac822fc7cbec4d1d18a0205e019c58c02c00817909e226d67c4c93edc38b18c8366a59aeb7239 SHA512 00425be891f6a8a2888077a84099ae2acaf06a64a74a3f1ab8a2d425113551690a693c23c6fb4526ccdf882cc4bee20a96b22c591e3a54caf59dd07edb91cc42
+EBUILD kactivitymanagerd-5.12.4.ebuild 888 BLAKE2B 08dffbb6f68abe07727655187f6082abf0c8522e4069a1141e7ac822fc7cbec4d1d18a0205e019c58c02c00817909e226d67c4c93edc38b18c8366a59aeb7239 SHA512 00425be891f6a8a2888077a84099ae2acaf06a64a74a3f1ab8a2d425113551690a693c23c6fb4526ccdf882cc4bee20a96b22c591e3a54caf59dd07edb91cc42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.3.ebuild
deleted file mode 100644
index 547e3aeefd46..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
-	!<kde-plasma/plasma-desktop-5.6.1
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.4.ebuild
new file mode 100644
index 000000000000..547e3aeefd46
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-frameworks/kactivities-4.13.3-r2:4
+	!kde-plasma/kactivitymanagerd:4
+	!<kde-plasma/plasma-desktop-5.6.1
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index fd0aec488717..533801cd2c09 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,5 +1,5 @@
 DIST kde-cli-tools-5.11.5.tar.xz 597040 BLAKE2B 8e17d08d45699c618325710fd4a054e1acde34e17965b65fb9054111d77e8c944fb4806d7d50e5073debabc948c79bf167887243c68e3227fc0c74c31d5eea74 SHA512 1f1363026d7d372552a06db19630a7deece8228bba020c0469971012f6393d4439fc56645b7348fca777b27dd86f7ffe8299c6e024384aaf7525d91baebe4b48
-DIST kde-cli-tools-5.12.3.tar.xz 572820 BLAKE2B b31968189019346c4130c6c0856f2bf5778f3dbf65a928756674c906e9122358e05331a0bb0a7d3a2d10b09bab5ea43dc20aa4ac1d17fc8ad6fe791b6df1a057 SHA512 94d6b52a5e578edff19609950724cc06706be0d805b25457216a717bc6cd02ccd137d9ca79bace225777e929226a5deddfb943706d10d2387e61c95f0bb45818
+DIST kde-cli-tools-5.12.4.tar.xz 570832 BLAKE2B 1e6807b275a5fd24e5162ac649f4c7da349adab90f556182ca0218caf261080c21e06160ddce8bf71c4e4f48973898722df9343ff5fceeed2d98f13fffff872b SHA512 50e1c5aafd5ae28445af4b4c9c86dcd57c739b5b48d5baa7f7e8afa7615764b7e6930418a3f42755605988b66cc944f300d724abbb1b3d530bd78a5f9ccbe9f4
 EBUILD kde-cli-tools-5.11.5.ebuild 1415 BLAKE2B 62733ac6b500c63456858a16de37fd9feafe80d9e06c1965f7b5d30e4e659f6f76ddadd54e46c4acd6cc85e4310c3e27e1cf1ee7e3de05acc7e2a97d5cc6a2e5 SHA512 9e97dda7e652e8703e0a74acb425f6949fcb09a11ce0db6cbdc5b48ea7f79223e07fcd6c84f5b29ac1bd574baccfe4c97e01c26b5ef3954ec379ca7b722c1eb2
-EBUILD kde-cli-tools-5.12.3.ebuild 1417 BLAKE2B 35c251d4e8e872dac6d1a8ac9f80ac2e72575ae19f1421e9bbf8837e99a4faa4c08c7025ba8103664d4cbe8d8fff9958bd2575a4b7c8bf6b7e894636cdbe8944 SHA512 e8b7be68b473f7e47132de03006662d3dac69d348b4345bacc190e387e74dd11f9c9fcd0e6653e73c6fbf2f2383bcd9079e1718c5bf7be5fd0306a7ae9b1f0c0
+EBUILD kde-cli-tools-5.12.4.ebuild 1417 BLAKE2B 35c251d4e8e872dac6d1a8ac9f80ac2e72575ae19f1421e9bbf8837e99a4faa4c08c7025ba8103664d4cbe8d8fff9958bd2575a4b7c8bf6b7e894636cdbe8944 SHA512 e8b7be68b473f7e47132de03006662d3dac69d348b4345bacc190e387e74dd11f9c9fcd0e6653e73c6fbf2f2383bcd9079e1718c5bf7be5fd0306a7ae9b1f0c0
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.3.ebuild
deleted file mode 100644
index bcf243febb89..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+kdesu X"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdesu
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.4.ebuild
new file mode 100644
index 000000000000..bcf243febb89
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdesu
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 129b4e47a5d3..eeff3ad7e9f3 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,6 @@
 AUX kde-gtk-config-5.4.2-gtk3-optional.patch 578 BLAKE2B 7e528903187c1cd4e8f3edf4d3b7234d5e944761740a1d6ed1b0bf7b34375781e9c4b2a283f544614ce07c71131698dc6cbd6f7e6066cbcef7d6f8fc2f902d13 SHA512 f4cfdae004dd0c6d26eca2b46a1d28bded9576c3488320b4436742020835ac5029a163f7e5859542d087181e07651b66777cb3199d79c1aa1fac682edbf20617
 DIST kde-gtk-config-5.11.5.tar.xz 159700 BLAKE2B 3de3d056f47cedc7d04191853a7642e783d8e03af60a5198e9dc3f8eb49d14f2422324972a1e3569816df36869c19c1d34bfb5e7c0ce9bf20b8543c26029ab20 SHA512 bcaf0e8c6495fa2418caa92e4fa30f6369b7ed6d45ed288a6f4d071661cefad9240e990c57727aa709e398c1947a4caa6bcf77f3ef53c24127a5696186c989df
-DIST kde-gtk-config-5.12.3.tar.xz 156860 BLAKE2B 5289a1363845cb521e62b7ff74d5fc4c0dd3fe4ea6c4c90e18d4bd0b95633f927c60607e65701017a388b69d801389e8ba75ef9b7192671aad1a9b1e7ee72ed5 SHA512 482fa31fecb5cedd7ae8d1aa41d6d378c16cbd28760f43d9a3bc35412b88e1210e5aeab2de077e78a23fecfa4d487459e7917dbcbe2b4e267d64058df5d12b88
+DIST kde-gtk-config-5.12.4.tar.xz 156784 BLAKE2B 89fe6d6436799b00dd2cf7f95e7d25dc3973bcf38b7fe6d458ba1cb085d66d80c0c503583c05566ac1cc4a4ed530911c0e878d166b966b201579b96ad8e43414 SHA512 07563d2a7ea9784ddd7223c7b98d923e3506f5b3f16337313482e8d47d3ac34cd5f852b6cc4fba38cf20cc34154e34705b3cd72dbecdb2d6d3c4096843bc60b4
 EBUILD kde-gtk-config-5.11.5.ebuild 1355 BLAKE2B c4b16ad68736ba32664ea01fdda00bd66ca2836669346f17373c61ac379e2c4aa46b8fdb03df1225e205159fe3101c12977e9418a9b4edf806bbc30ce4a41b5d SHA512 9ed7f5bf17eb3408d632860a9062180f567f2cb10d572f122b094cca866c02f830195dc5d26bb7a75f14271d3b22a064e7fe38251d6fd27101ca0185a4df1acd
-EBUILD kde-gtk-config-5.12.3.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
+EBUILD kde-gtk-config-5.12.4.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
 MISC metadata.xml 333 BLAKE2B fe2211e8c1798fa7f3d3863ca5182a360f3ce2c5091f57c6ec14cd64733c1bb16a15fb57007e19502a2fca7761a54f0aeb2f228df10d23db3ee1e9a4911e1283 SHA512 ce7ff5491e0b8e230a07d5170efa584645eeb59b83f5e446569d230ba1b7e86e0419648fb11d91d81dcbe96139524b2371ad9b9266d1b97f147784674c64c326
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.3.ebuild
deleted file mode 100644
index 13b77b96ddfa..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.4.ebuild
new file mode 100644
index 000000000000..13b77b96ddfa
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/kde-gtk-config:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index db044132a17b..e13104516ef8 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.11.5.tar.xz 36280 BLAKE2B 64a8bbe8d9891f011bfbce69de5b989931f2129a87d01486378ae2a327c11615baca1223113c6a2e21a9bd2698cee7c908a6454b598389fca6082788df8f683e SHA512 a7dbec450e7a67b6c029ebba1663ffb3fa199f4c855322673ddedc4411506b20ff922a1dc6c728a6a8b5332ca8b0eb542fc52dad91ce3d01ed39d5bc5efc4cbc
-DIST kdecoration-5.12.3.tar.xz 35564 BLAKE2B fe9bd05a3fe5573f9bad07d6825904ddd95ed7a593064783dafe998cbb9b32a3a74ddbd9bd440705c0cf0a1e37fec01965e01290f2e401a5770e0c41c6b9d9ce SHA512 912e1dafb7a8622a3f32dbf1bad12e154b7b643e01771ca06aef7a0e05f1c0e5b35b7ae121735831a7727a6a0367308f569b38c11469994c7c3edc134806e7c7
+DIST kdecoration-5.12.4.tar.xz 35284 BLAKE2B aa1a0748f2fd3f23f56ccc254e1bf6871e5b16de74d63df01e6ac08f6624a3a87ea9e104332481e3210a074d11e77135447104ee9f1975fe05d1d2f5fb0b35c8 SHA512 b3e6abe919d6a50cb0014e1e2cfb1e4505a32b14839ae027d18119db3212afe4b0c1effca196cc80d5732aa02b231e343aecd41c59fbbff5b88c37816dce0d99
 EBUILD kdecoration-5.11.5.ebuild 368 BLAKE2B 6926d03e513b21a5d09bf629fda76c1e351709b0ca5e4ce7cba51cab88f9a3eefd2038b269090f16bef9ac78a5724cde7e6880bd8992afb35c5c3d56fed05935 SHA512 940302029114e1ce499159a58a6fa0881cb31f4b5ef61f53eafb726142bfa79d22dfe04970771ca9711bc66ec2cc2fc7058a7a9e845eb322da7e22a60197efa4
-EBUILD kdecoration-5.12.3.ebuild 370 BLAKE2B af3340879708d1a5ea4f9f940c9bc28323c5f6cb14429e2f1b03049b720d2daba1634010af6abe5aa300bdf2b123589da9e153ae675b73bb160e1afa3840d9da SHA512 9246769e79f1eb0c096f8cc90b8bc00be2369467f05cd4b4c7e7b59d3e465233277cf7522c1c02f4bb241bb7aead8b7a0d6a2b81f9da189b73f43bce27c5961f
+EBUILD kdecoration-5.12.4.ebuild 370 BLAKE2B af3340879708d1a5ea4f9f940c9bc28323c5f6cb14429e2f1b03049b720d2daba1634010af6abe5aa300bdf2b123589da9e153ae675b73bb160e1afa3840d9da SHA512 9246769e79f1eb0c096f8cc90b8bc00be2369467f05cd4b4c7e7b59d3e465233277cf7522c1c02f4bb241bb7aead8b7a0d6a2b81f9da189b73f43bce27c5961f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.12.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.12.3.ebuild
deleted file mode 100644
index fce30fa8c298..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.12.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
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="$(add_qt_dep qtgui)"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.12.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.12.4.ebuild
new file mode 100644
index 000000000000..fce30fa8c298
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.12.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="$(add_qt_dep qtgui)"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 79cdc345ee83..d4aefa888839 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.11.5.tar.xz 1459308 BLAKE2B e64360e7607b7ee653953dd487bc4bc087be349304909f88546f6f7bd1c79903f3b67d239bbca63d4b145cb95317e4542e3b8fba0cfc5c7cd470c3b8c9bf9d94 SHA512 b4a2e191573dc72d6a32d3f1a612153ccc502232fe7908dea90a7dc869002da6e50e6126a0b6b921478fe687479eac096971fb105ed757d82bacbbfb15fed471
-DIST kdeplasma-addons-5.12.3.tar.xz 565196 BLAKE2B a43b604aa3156c71bc48e5f616c63726a1463d6af05acac5329818d3879b1ce22ecf948c6ff02b3e228caf8df34dac995055bee00372dbf0731b869e4a1aca6d SHA512 009561437ee39aeab43fa7a6f0c3471fdb89cfb1bc64c9673836b3be73c2d85c12997410dfeb315ba07afc21f9c0ad02f04029c01289b7c06db81dc840058a09
+DIST kdeplasma-addons-5.12.4.tar.xz 565544 BLAKE2B d465bcfe91f466d49f17f7ddd8b4e95794f2647b28f1e0b775f485100fd9966a9b1b82850a739c60b0bab35046be38581af500e7a7cde6570038b6057ee9e8de SHA512 ad94d1b949318fff6c9d9e0415eba70c5420b41de431abd70a673c8d16d047616d8ecf061aff86a806b1f5af1f89a1e0c1d967ae90aacc2d34c7bf9dd649c3d6
 EBUILD kdeplasma-addons-5.11.5.ebuild 1434 BLAKE2B bd342fea71f33fb5ed300f265fc29e70a3493d66ab574d7b896e114d5c0c9ce4778171f1a11f3910b1c297e2edfe1d016155fddeee9f47a640ff64bae8a56528 SHA512 e89e572b35ed2c78eb5ae1b48ef545e279a374213d01e394443a895abc1c59301cec1fd8f5de65ca27e8873419e235c15ca7d868e35e03b904eda84e965c0019
-EBUILD kdeplasma-addons-5.12.3.ebuild 1580 BLAKE2B 185c8f56b34e5f9a68de6196acd3720adaa717765d99d715b946e8abde923dfcd39dd4f1ed1c0b4101dc8a2021070a6059d031cb1f44a3ab361e02c13c438b08 SHA512 f4aac2c159ba60a36fc8b837b4aefb4f845e0c3c92596a3d7529cb14328ca6389e2d7d218effe97098a06649067d116f87ff715b9326aa87fe3298d99c61667b
+EBUILD kdeplasma-addons-5.12.4.ebuild 1580 BLAKE2B 185c8f56b34e5f9a68de6196acd3720adaa717765d99d715b946e8abde923dfcd39dd4f1ed1c0b4101dc8a2021070a6059d031cb1f44a3ab361e02c13c438b08 SHA512 f4aac2c159ba60a36fc8b837b4aefb4f845e0c3c92596a3d7529cb14328ca6389e2d7d218effe97098a06649067d116f87ff715b9326aa87fe3298d99c61667b
 MISC metadata.xml 449 BLAKE2B c65e099c2e1c0b03a7b5096842caf875a74c6d0a52109d0cefae1e7c890492a3d8c0ceabc2e9c6474b15208baceda99c75f8fffe951ef876f43496acde6af4d1 SHA512 41859edf7b9a36220087bddcad932509dfe8c98f17f3a9f98be875aa5cf60dae52de24084a16c194c0db3b5af61baf64ed81b49fe3a3289b70ab254785b0f688
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.3.ebuild
deleted file mode 100644
index e42b2f529c8d..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dictionary share"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dictionary? ( $(add_qt_dep qtwebengine) )
-	share? ( $(add_frameworks_dep purpose) )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dictionary Qt5WebEngine)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.4.ebuild
new file mode 100644
index 000000000000..e42b2f529c8d
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dictionary share"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dictionary? ( $(add_qt_dep qtwebengine) )
+	share? ( $(add_frameworks_dep purpose) )
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dictionary Qt5WebEngine)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index e8321edf9757..88cc2d053d44 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.11.5.tar.xz 64108 BLAKE2B 0eb21c1c79a40c60e066f7aa80e336768cbd89405a0083019a299d6dc379d7ccb9100efe01ccb1481413d465afbdf61f64db546337c4b2c1675e18a54951cff7 SHA512 ac923f6e899b2b35ce80ed990315c3e72bfd239ad79a8630cdbdfbdc3248dd72608ac219cbeafd1d20e768496dc6bd2d71d1d326017a84f30b681b6c65e604df
-DIST kgamma5-5.12.3.tar.xz 60516 BLAKE2B eb9a146b67bedb484c8468deeccf913dec81b9f366aa98a7f55bbd1a65c9f7c6f42bf0317c98e186b6f78bdb53c1b717f9c42915515c43e2b0b56c074d46402b SHA512 e9062f75c21e38f1323589c316d44144e3a341b5036e85e87f8b9dd7e2508b0c04c8597efabd42f739d2ccfb311c075d46f340fb5512843056e84eb00d753c11
+DIST kgamma5-5.12.4.tar.xz 60244 BLAKE2B ee06365af0e8b26595c363facc1f67466ae48bdc74edb090526321de176987c64e49582db0f12fb0f3dae601ca4aba6717179cf37e365000519e409a3ea40788 SHA512 4de4d5db283379544fabeff17acf9aa753aed195c5ea66f18d1655419fc032e9e48e8b8f72bf59fa85208a8c9ca66ffbc0b3147d415b06a667b1ca664102b859
 EBUILD kgamma-5.11.5.ebuild 538 BLAKE2B 02f28fdd2ec410f5068f3c9a27b484aaffc1063901e378cbeae42fe7e05ec93b885f4c608a9b87089c9cbca466335e01a0b2752755cc08c78129813446ff773e SHA512 0cce38f8e624dc056254df3e7ef7e5fe4cbd974533e88054edc864f5129e7f56b9a43faf1491fe9fa30799809c0d4a6d8e316bcb6e74b85a4bf466bd52822059
-EBUILD kgamma-5.12.3.ebuild 540 BLAKE2B e05e344d4231306912c7f09027e6a1994612f16acac901427c435a5e8cc8ac2d5ac9b0f70f288ed42cbc7ff0b471609cda3739e4ca6907d203808e0f772cd827 SHA512 85474fb4d723c375823a07381d4e02ae6fc6d847ad25fb46a41bc6b179afbb0a8343045d9323a4a8eef0a4f39e483b68727e3fec6736265c5797ad278f7e6bc6
+EBUILD kgamma-5.12.4.ebuild 540 BLAKE2B e05e344d4231306912c7f09027e6a1994612f16acac901427c435a5e8cc8ac2d5ac9b0f70f288ed42cbc7ff0b471609cda3739e4ca6907d203808e0f772cd827 SHA512 85474fb4d723c375823a07381d4e02ae6fc6d847ad25fb46a41bc6b179afbb0a8343045d9323a4a8eef0a4f39e483b68727e3fec6736265c5797ad278f7e6bc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.12.3.ebuild b/kde-plasma/kgamma/kgamma-5.12.3.ebuild
deleted file mode 100644
index 30b8c5ef9211..000000000000
--- a/kde-plasma/kgamma/kgamma-5.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.12.4.ebuild b/kde-plasma/kgamma/kgamma-5.12.4.ebuild
new file mode 100644
index 000000000000..30b8c5ef9211
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.12.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 5136feb102b0..1f59679b310c 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.11.5.tar.xz 1071588 BLAKE2B ded5b2936068cc0a540ed6ec6f0229c62babefc8038db76578180625f04214dd98d3c06da7ee3d4b8a7d7286319039c2fa8c1fb5107f595cfaeb2109a9677c25 SHA512 fbbe09514cba58749945fc310b67e4ee716a49c38e602087c26e9c531334e0d1483a388778ef013678f7705ef575d18d403d922d83058d6025eedff0420693a3
-DIST khotkeys-5.12.3.tar.xz 1058668 BLAKE2B 88f6baa744cc50ae8a20fd5503be43f0914ebccf0c8338923ee2a57740fb1c49aa2305789979773d87c1cc72933f30b6e9aa3fdea1cb2b4849b9ac44e5aeb667 SHA512 5f9eaf02f47623a93a32ebadef11ce35f6252c288296d64c6b374f5bc489d5e53c575303832f37a41df5d7f764035a9eb32583be91ff4bf76fd0b06631beb976
+DIST khotkeys-5.12.4.tar.xz 1058428 BLAKE2B d7589960e808a64c7e8c79ff9971bc6f4af345725f2da9bedc0a5c11a89ecda3157f35507245bb8c5182d0bb3daf139c4b6caac5d30dfd651c7c2bb755222dff SHA512 dacf62abbd13ce37b308f797ca9c6fac740f0ae950c5ee7abd96eb561e6b5b817fd0ccd72b4d5d0ca1fe5a77bec4f1d14c9426877ebcb6cd852a5aa3441b49a4
 EBUILD khotkeys-5.11.5.ebuild 1122 BLAKE2B b5616561f00ba86f251105234816129dd58d8acd2cc82fe354cc8d2789ab71b6412514b6f03e33343bdc0fc62bde837bc898e7d7dde5ae66237743eb549e69c7 SHA512 ffd4f3918a03554ecbe8f330d01f18715732dbafecd9dce39cebd4344943f1e4ed2354d541fa1a7468b80e14d4274db9da9b49068fe487438c1103ea4167e72c
-EBUILD khotkeys-5.12.3.ebuild 1124 BLAKE2B 4a85249b9f692c243c4bc44a8f5c3a62a7d05b8188f4f16db7cd88287b8ba566c2dd504f5dbe0d00ec101dfb6bdc95b0eb530e727f58d4f643d41899a05360d3 SHA512 50db51119dc32d08bb1af9f83b58a92f68811b34ba5e8fdc31a9c39e179b4509e920a90c45f3b6b69e29b7e11ed1a257a0b75587b397c8ff10b241fa3dd76cf4
+EBUILD khotkeys-5.12.4.ebuild 1124 BLAKE2B 4a85249b9f692c243c4bc44a8f5c3a62a7d05b8188f4f16db7cd88287b8ba566c2dd504f5dbe0d00ec101dfb6bdc95b0eb530e727f58d4f643d41899a05360d3 SHA512 50db51119dc32d08bb1af9f83b58a92f68811b34ba5e8fdc31a9c39e179b4509e920a90c45f3b6b69e29b7e11ed1a257a0b75587b397c8ff10b241fa3dd76cf4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.12.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.12.3.ebuild
deleted file mode 100644
index 60f38c3c3a35..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-proto/xproto
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.12.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.12.4.ebuild
new file mode 100644
index 000000000000..60f38c3c3a35
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.12.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/khotkeys:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-proto/xproto
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 98382b1a8329..6e245aca24f0 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.11.5.tar.xz 1302960 BLAKE2B bd938c9c330c8f335825810e3fc8e8c97b1629d89bfeef0eb18bd4852f939f5ba0fb55640338b6d817c08d0b8f0099cdc303a19874811af52c35afd2a63a728c SHA512 d64cf466b4b883c9a57a0dddfe5a1d1cae0687655897803e5f14bcf73e90c1ea05d96458dbe131428c6d19a50d92b2614036136fdb897e422b1c1fc3d38f5303
-DIST kinfocenter-5.12.3.tar.xz 1270096 BLAKE2B b788489c57817c0b60ea16afa23109eadff2478cf7e7016faadefcea8c8bb59ee17effb5e0243eda33dca70f58ac8e5dc69f85760d56967bbec74c532ba3cee8 SHA512 f82b5f2915547a7d258229115f82b085a88195a8e060224a4246194b98728b089040563f7450523e622946d65823e5cf348eb06fa614dade27c92f0725583317
+DIST kinfocenter-5.12.4.tar.xz 1267316 BLAKE2B cd4e253099aa20d7ee800043b1c83fec92ed75be84f815f6c732ae037b39a794c625621091bdd900f65101c446bf9ef1f3e4c23690138b17073daa645d57208a SHA512 56e93f9e71c94a3c6906d042e0b9c40cbbcce3d7494fe5e5833324014d11d79fe8d480967e08292eab43754688e9f4582cabc6af79609a9b88eb992235aead83
 EBUILD kinfocenter-5.11.5.ebuild 2420 BLAKE2B da22bd0116013b3b79246f2a579b353381d9ec018efe97ddcf770a72ee76d57fdde18d52d4378851da577d9757f0fa507800d426a334c595f4ac0e4e8a174a4c SHA512 3f16d3bc5cf32511d53695315edebf42059971cb66e7d1c373d72ac71d883a56b3f887545344263e235a3a9477f620ba1e9fa4797023b6f6cf26002691b9a806
-EBUILD kinfocenter-5.12.3.ebuild 2422 BLAKE2B c64d5e3573160a015217f71835e009dd8b6e7962cad973f24f0ba958de182efe121c50d8e98ad76dc4afa4349ff0bfe1390203e4787635f73f00538f02c1ff52 SHA512 95c593960f555ec8c8254b8e974e07ab7f9aff34a739db3f86f282e7f805cc07d382480b08ac331506969b8388c7c427b65b6f6088f5ce4d073ac2353cdd50f0
+EBUILD kinfocenter-5.12.4.ebuild 2422 BLAKE2B c64d5e3573160a015217f71835e009dd8b6e7962cad973f24f0ba958de182efe121c50d8e98ad76dc4afa4349ff0bfe1390203e4787635f73f00538f02c1ff52 SHA512 95c593960f555ec8c8254b8e974e07ab7f9aff34a739db3f86f282e7f805cc07d382480b08ac331506969b8388c7c427b65b6f6088f5ce4d073ac2353cdd50f0
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.12.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.12.3.ebuild
deleted file mode 100644
index ff2f95c95937..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.12.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gles2 ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gles2 OpenGLES)
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		einfo "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
-		einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.12.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.12.4.ebuild
new file mode 100644
index 000000000000..ff2f95c95937
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.12.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		$(add_qt_dep qtgui 'gles2=')
+		media-libs/mesa[gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kcontrol:4
+	!kde-misc/about-distro
+	!kde-plasma/kinfocenter:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gles2 OpenGLES)
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if ! has_version "net-fs/nfs-utils"; then
+		einfo "Installing net-fs/nfs-utils will enable the NFS information module."
+	fi
+	if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
+		einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
+	fi
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 9be1c14d9636..062f3b975cfc 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.11.5.tar.xz 663336 BLAKE2B 2a3adeb669c00cacb0e5334f7e5c41f38683926db315714d2026256b702cef9788c8d9014dbaf63c6e68b28de953f42b9421ec5a94a165e121341e7d945ca2f7 SHA512 65fd7e67eb67c56adad3f9dc422f8005fefa40fae37a29444e305a20434a1e228c63c8db04c4f031cf60f9f06d07d794727344ad10d8f3d5681119ea44e3c5b7
-DIST kmenuedit-5.12.3.tar.xz 652192 BLAKE2B 5b4a4f8daf24a7bb1f38424fb501193652c40ace9f333f2faeabd0430d2c9c62a8bd1177f394fc0bdefa8c45cc462ffae51d0f0d4d4cde48ee8145bc19728a83 SHA512 fd0371dbcd36167f1cac64dbed9904cd6dd5d65eb2df4d31facf343a6589e18e2b0a7ebef9fc5903c5e49f855665858fc09ea6b3f0c718a3e5930151195128af
+DIST kmenuedit-5.12.4.tar.xz 651916 BLAKE2B 26a531e0c20dc529bb8f9566e2e8a10fd94dae12440a822c5de983c83c4a1ce277cc7467f1acae4d154ec1fa1c4b29227e1f80281c0fec7ff9265e60a699f031 SHA512 54df50d40cb3adc6a5948e4a00a8180049df158a99c2081828b1c3c2aefa2ddc4e137b2c2c0309270f4437a9bfd98edb4a30663d0d5ab13bc0dd067da6683d9e
 EBUILD kmenuedit-5.11.5.ebuild 1028 BLAKE2B 61939d330fe0251115207ac560cdce1b00517a31f97c0e176ee335431fa3da77b498b1346fdb668d7120af7a2850e2f02bd80a258fb13dc15527e69b3cc2f46e SHA512 7c150deda5597fe3cf45a74a53e08375b38731b770f09c0836fceeeec1dce0656a347d5d0eb2276f0605217b89570c6ae5b81e6e2560e680d2edd5d4fad265e7
-EBUILD kmenuedit-5.12.3.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
+EBUILD kmenuedit-5.12.4.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.12.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.12.3.ebuild
deleted file mode 100644
index b504d5a6e14e..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.12.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+hotkeys"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.12.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.12.4.ebuild
new file mode 100644
index 000000000000..b504d5a6e14e
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.12.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 627d514a1fb0..652064c1e225 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.11.5.tar.xz 124060 BLAKE2B f9af27d740c3467700aeab51b8cf75cb087379dff833f2bb43c1fe4c958fc28204af41c81247d3835bb376516ccc2e400272b4cc9d0f9778af38a0fdf17b65f6 SHA512 a6224de2c9f3c2e539e97461ef2a7cdd626c78dc3a1e3eeebdc63b12368df26c83315497d647abd008f9246f9b7aa2f1b94425a2c6d366200811725b64d012ab
-DIST kscreen-5.12.3.tar.xz 117832 BLAKE2B f9c4e3705c9648586deee4eb1fee96b7426fdcf2cee25ac198b9bb1b3c1b50f5b35d41fa85656f6daad083360bea10b4d28ed3b6f2b68e5950070182c6cf765d SHA512 b3119eb3264ba357c8efd879e92ec0f5fe2dc785228a088434d8f8e9afe72d36edae79bf7cc944657b6fdbe43389df44edcc74704b65f393cf40a68db5c7ff1a
+DIST kscreen-5.12.4.tar.xz 117192 BLAKE2B 12426cd1343b12b561941c0de16eab1f49d19a2966e7005a9b5b836ddd9e6f8ea5036d9170585b4bc9614bc23429bc63acf1e0f5d0391118b214199d304ecfb3 SHA512 b35bff40f8b4424e64ff69426728d35b169d14daac5f11dcf628c1d1d27c98aca2dc1270c0bfb2499bd081e11744dea489ac47c1aaca2ae2dbcc16927ab1a682
 EBUILD kscreen-5.11.5.ebuild 893 BLAKE2B 96a21fedd04dd1f65d9400bc67aa2d2324c7b39bbccb2ed937f53c11a42386d1f14f8661d74720228b31007d610ea791f1095c1b5e69f1c602c245c16d367de0 SHA512 806d196ec98ca72aa1e2b81d5ed136cc0e61ca616e2ffed6ab0f08ea46dee62fdbb093bb891c73b473053b11a0abe8a74cd884f36f8c3d657067cd32e8182f5f
-EBUILD kscreen-5.12.3.ebuild 895 BLAKE2B 05a0a5838845a9961b4bd3fc0b7d4640953df52eccea95e58c33eff0b04a0e8c045f11146d48b36f3d726ba8e3105df9f47d14425b6d38e4d34cad4327ab1c96 SHA512 4225eba2e3ac0044655210a7916fd0eeadf98f095d5f202170eb1a5f9bcdbd3c6e03bc8cdda70985f971fac7f8b0a5f3954d32bb7cb9cf1a485e8801ddf32ccb
+EBUILD kscreen-5.12.4.ebuild 895 BLAKE2B 05a0a5838845a9961b4bd3fc0b7d4640953df52eccea95e58c33eff0b04a0e8c045f11146d48b36f3d726ba8e3105df9f47d14425b6d38e4d34cad4327ab1c96 SHA512 4225eba2e3ac0044655210a7916fd0eeadf98f095d5f202170eb1a5f9bcdbd3c6e03bc8cdda70985f971fac7f8b0a5f3954d32bb7cb9cf1a485e8801ddf32ccb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.12.3.ebuild b/kde-plasma/kscreen/kscreen-5.12.3.ebuild
deleted file mode 100644
index 05eae8520855..000000000000
--- a/kde-plasma/kscreen/kscreen-5.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.12.4.ebuild b/kde-plasma/kscreen/kscreen-5.12.4.ebuild
new file mode 100644
index 000000000000..05eae8520855
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.12.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://cgit.kde.org/kscreen.git"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkscreen)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtgraphicaleffects)
+	!kde-plasma/kscreen:4
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 2878daf8e35f..e694e90dc52d 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -3,7 +3,7 @@ AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 AUX kscreenlocker-consolekit-unlock.patch 792 BLAKE2B 65ada31a191a5ae478a8a5edf27d0555ab4e81a20dbfb128cff1de520386f914b9730f22bb709be97f0ab9a38c9aba1d0a4596039b2438325ad55ea3969f7fea SHA512 21f06f101a9a04a80393a040d29506de8b4de129f3c6433d5455245ec6a9dca9630a59338612396032bd66e345fb59fb78bcd1b486b5d46138be616da632ff18
 DIST kscreenlocker-5.11.5.tar.xz 125528 BLAKE2B 32bad30682da09245cc567f3cb79c0e0fd4ffdba26b47ef0c49c3094374503640cab7718033cb9c366ef7acddb6180995f4121b61ed1d04bbd867e1361e9d7ea SHA512 20eefbb4f970b2476d3df2e36bf74021d854f0ba61cba4946b3fc7190cff9edc9fef753d3bdde24ab135cc0dc5ad826cb22063db7b12ce817007355a98a3011a
-DIST kscreenlocker-5.12.3.tar.xz 118296 BLAKE2B bc4a5b05eede73bc8d4a3f9752ff03427deaba004e26017fd1eb097eed48e462e22c200122614e40009b065a7da55265aba01ee80e177fa6862f60cdc79805ca SHA512 f93e5a30dbde7bf7662ac57af4293f5b7117d4f63a85dc079607faf06e7e88f938936a0b0e3b5ac55877f9af1a06bbb666ee47397db2e2f7e55edeb70e5a3feb
+DIST kscreenlocker-5.12.4.tar.xz 118380 BLAKE2B 12c3b382fe4f78c3696be137d0d5eea5b99b2ef698982d9757380b194422d3a606dd336d7ba27eed9c4e9200e510cf1a1d186a8125f4c0925bf95f932fa7c43a SHA512 d967b6891c2ee83a1fef4b564e95ad1468803db26c0aa8657048e7d94279eea17b75f007c44e90727a4b5689765413055e64ff49800631e9a4db1fb047ce41ed
 EBUILD kscreenlocker-5.11.5.ebuild 2088 BLAKE2B 467a8c4a4da242250fb776c4b6e9a83777ea81296cc917d7ef79460b083ca0418429cc093964a259d6eb9d1b56237df15b0411721ceff9ab4694cf8dc00c8370 SHA512 1e133cc0cbfbf6505df1ceae6ec5b730e6f4997d68b00787e7cc5a934b843ea7d567febe5b83e7e1b2d2c37241ea0e11fafd1ae7eb40fb07bbd1106c0ed4a4d1
-EBUILD kscreenlocker-5.12.3.ebuild 2230 BLAKE2B 5a90ba44f40c103717a26f7183c19ff6b6d42d0270f8b4cebfe4ee2756169bcbba9bf739341a836d34e256f2c47a08abd93168f877bf2806cfee14bd44d3aea7 SHA512 7aa33eff86e5a3fa6d2844cb7a2999622e56deec7d26f50152cb10b048a3cddee0af4ae652410a6f13fde05dd1d5bafefc19a3e06ae49ad49d30622dab1312db
+EBUILD kscreenlocker-5.12.4.ebuild 2230 BLAKE2B 5a90ba44f40c103717a26f7183c19ff6b6d42d0270f8b4cebfe4ee2756169bcbba9bf739341a836d34e256f2c47a08abd93168f877bf2806cfee14bd44d3aea7 SHA512 7aa33eff86e5a3fa6d2844cb7a2999622e56deec7d26f50152cb10b048a3cddee0af4ae652410a6f13fde05dd1d5bafefc19a3e06ae49ad49d30622dab1312db
 MISC metadata.xml 397 BLAKE2B 0fad03b144a175f0f5f9d8e0c0ba4f75e6cd4f211ba0207e73a7968b7d49bbe0977860324a51ebef324ea0f915eb92dc23978558e000085ff21bd8fdb1d53187 SHA512 1d3749f74eab5cd2e17f73bb44e9f8d7ce03060db8d422a835597f13dce6c39c232eface04d9e74ed3ef66e9a45bb7b4b64c4cd82f6b5aedc62627bd77801c76
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.12.3.ebuild
deleted file mode 100644
index 000589de4b14..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.12.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use consolekit && eapply "${FILESDIR}"/${PN}-consolekit-unlock.patch
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	use consolekit && dobin "${FILESDIR}"/ck-unlock-session
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.12.4.ebuild
new file mode 100644
index 000000000000..000589de4b14
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.12.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="consolekit +pam seccomp"
+
+REQUIRED_USE="seccomp? ( pam )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
+	!kde-plasma/kdebase-pam:0
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	use consolekit && eapply "${FILESDIR}"/${PN}-consolekit-unlock.patch
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	kde5_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake-utils_use_find_package pam PAM)
+		$(cmake-utils_use_find_package seccomp Seccomp)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	use consolekit && dobin "${FILESDIR}"/ck-unlock-session
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index b834c62e67b6..402da8a09660 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.11.5.tar.xz 23168 BLAKE2B 74d10be7c303d0b7d1d8765e08a89986b4c1745e5f601982dd406cefc7c73ac684c1c05acdd355d45f5078e034ab9971467b4b76c0ae3a94800ce6480fa8c3f0 SHA512 34a8fe5da983a0fcc6d5d223120f2d23e0168a534d29941e83024110eafe981d6c46ee503abfb7bf8e072dc64060eea373c191ef0f8dbc5051cb2d968e6d49d3
-DIST ksshaskpass-5.12.3.tar.xz 21172 BLAKE2B 93aa3a8c9aa0d332004c1864fb9255438461aa5d2a2a279541279b978794cffbfc3ab8367f9ea7115503ebedf65461fd3b2997e3cd684fd4bf20d0cd03dbadb9 SHA512 edeeb3b4e47dc29c7681eaaa7a3f7ba0d68076e86a03c42241aed5420c5cc87000c410816987e7c033b275c6001f4083f05f31bbef79f08481479362ec8b97fe
+DIST ksshaskpass-5.12.4.tar.xz 21060 BLAKE2B 45f157eaeffbe61d76972f08cf38ea3e659a5d89877a0e10b4dd285992c3fb89a114a5fbcceeb31e37536b39b3a9b2fb8e1cf247fc7593e135ac9374ae28354c SHA512 12b0cd5270509325d60060b3ee3a6a03fda27063fa25af6e6fbec190319a836dd11d73b202909c733137e95528e0e23b4cc35dbe2c6ad3148ad2bb63e21363fb
 EBUILD ksshaskpass-5.11.5.ebuild 1235 BLAKE2B 76ec180a4af4bf1b0f861f3f86e8ba4df59d796a58bfd95dcf1e1dac2dcf9eb7e7682a714fef94cfbe1609518381e8d812b10f6665d2aa2100b6ac337181f5a7 SHA512 02ef5de19976e1b1aaa20ac0c6534bca3094a4befad0da39d557199455ec37d8f058e5aecea2be2a808bb98d5723ca511147ab7148a205fa39515d960d3b41eb
-EBUILD ksshaskpass-5.12.3.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
+EBUILD ksshaskpass-5.12.4.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.12.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.12.3.ebuild
deleted file mode 100644
index 3009c8d5ff69..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.12.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.12.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.12.4.ebuild
new file mode 100644
index 000000000000..3009c8d5ff69
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.12.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="
+	${DEPEND}
+	!kde-plasma/ksshaskpass:4
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/05-ksshaskpass.sh"
+	elog ""
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 97016eddf7a2..1355e2ca2df7 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.11.5.tar.xz 502228 BLAKE2B 49e82c26ea1c032e8e036e509c6a46c5da409f4092679a623bc26342f34ffa90d96306fb5638b1fe5a4edafe6f48af6ee12876286788b11145c00c1a32765edb SHA512 62af21b0d911abac5b66ccddeb0180c08199c0cfd8807d461fcfe444105ce7912efb5b8286e7f4955e97cb537edc32f046d646e82ecfc2d61ec39b2a53ed4d93
-DIST ksysguard-5.12.3.tar.xz 486832 BLAKE2B a066fab22cd2ca648af04ffdf69366fbc2fc1cde52d2bd6a321ee5cd160a6fc7ea84c72950a66f96299bb64d3b90bdfa3c0220e65f9ab596779128c8a02be1fc SHA512 2d727136554242eca2428198f4b08b6ce6d062a4278a053502489303be6950a5efdf2f6852cb56105cd1d1dcb9ea1401c028c0654b2dda9eb898ba7cd8ed5f4e
+DIST ksysguard-5.12.4.tar.xz 486016 BLAKE2B b99d939431ccaedff7484734f85e05840c3ca6071efe38d4f23ad0f8cb43a9c7a18ff28cc3d34b46cbbb7196ce7fcc88130d9d974e6037a08aab36b46d4f3d4f SHA512 4608672cfdc9c5b6bb36194ba33e4db579e8c9fcaab421ef034ea8e5cc104a54091cefbe84059f3efb9972929f6c0a7878a55b32ef9c83d858ca1e880f325413
 EBUILD ksysguard-5.11.5.ebuild 1143 BLAKE2B bc2409ea028c763c822431abd58fe334cf5f3ab8430b43ec61cd53336e278f4a8bcb518e01d1de86607053fded35b8924bce024ababea2c904bd89159e57a6cc SHA512 3f50f88f16dde5a45742d8012d5a5601955b59c191aa82d0fa410425fa56e13faf3f8370a4f86d2eceda48790d9ffc12aeaf647a1689f5c1310ade072a8037c3
-EBUILD ksysguard-5.12.3.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
+EBUILD ksysguard-5.12.4.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.12.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.12.3.ebuild
deleted file mode 100644
index 5e2260a85627..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard '-minimal(-)')
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.12.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.12.4.ebuild
new file mode 100644
index 000000000000..5e2260a85627
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.12.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard '-minimal(-)')
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index ae7a442ccb4f..a95cced23305 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.11.5.tar.xz 19060 BLAKE2B 814199f67c9026ca420c66d0dbe48ef9f1cab2d30bf3784cb3441af56ceec9ab3841dcf41021bbc5d42edffc0fc0849b714c1f279065c974bba794924fc0879c SHA512 1602ef0eeec86c653c2a99c1c514133367e7dee07d11ffbe0533066d895c71e3b7dd90187cb353446b717738600143cd09de1a5baffad5113152fd616bef90ee
-DIST kwallet-pam-5.12.3.tar.xz 18584 BLAKE2B ebaa26b20d9c2f1efccdff9c129ee0982e47736b54422347e87e2dc681e8f86f2c9d2672be7f56a1358dc43a26755f1e44d38d2988357115b89ba7e35b7dac31 SHA512 04f76793e5a3e9ee8535a2dfe52cbe2477bf4ff5c06e69fa666638b85b576a51c2e899b424a4376b44737f3c35d097f3cc00adf2f66df075be952aaaad77e0da
+DIST kwallet-pam-5.12.4.tar.xz 18476 BLAKE2B 1465ebe0a7e43212f4d97db7464d7c8806e21e0f8c11071d05442bc2128c8541f624cd96abadf19d8e151604bc4caa1021d976b5074235c7d0f6be8faa15c365 SHA512 7e78dc5666238afbb8cacfe1bedd51ada19112edd52ac57943c176d288f9663f5ba41a78167f6153e6ddf29504328f5d510b5dea45e619ee702b30930e0ed9c2
 EBUILD kwallet-pam-5.11.5.ebuild 637 BLAKE2B e60fd96ae3c9b69d8d79975ea5fa340e625314f6769a82ad46546b1f7791bf28e95a7e3aae40e1c07b68b373a32c0b52930951957d36f087d7b3bec384314a84 SHA512 502c7e484ae0da13c6c19042308a8cbf7c95544c4f302b42f6743cafaba8214a0ac6b0f05f743c00806c73dd5001f8c238642191e5d893994adf562e9965e444
-EBUILD kwallet-pam-5.12.3.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
+EBUILD kwallet-pam-5.12.4.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.12.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.12.3.ebuild
deleted file mode 100644
index 8c9a7437fc09..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.12.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
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.12.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.12.4.ebuild
new file mode 100644
index 000000000000..8c9a7437fc09
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.12.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index d4a0c77f76c4..90c736c991ec 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.11.5.tar.xz 19080 BLAKE2B 3f1bf365f4886398fee77da4a1716232cceb691746ed6f313d6bb48f46d5813eacfb32381b9cf3665cfb7706a04b863d3545be4ddb5749176ac25055e5d643ea SHA512 246ff96d30d6a212aedbc9e7a5680e20bedfcc398591f670b0c96f68127aab547e21537aa11f2db68c505845c7897ce8be657b3430b420033100a774bcf6c1af
-DIST kwayland-integration-5.12.3.tar.xz 18588 BLAKE2B daa5ea45b05e66bf8e9c3caeb45de1ed3c620edeb81fe0a02d25fe08c0521880abf9f00d6d76830affe20fbfa4cc2a59f02aeef506b71aa7ce46e9af1bf76c81 SHA512 f276747b7a3e26382756266687a99f89bd5585f4abd7cf09ad645f6fe98ed6e437ee58060f88486e061488ee443e8146c9f4125f21e64e2cb113a2e21937bfc1
+DIST kwayland-integration-5.12.4.tar.xz 18504 BLAKE2B af9620b05dd9f486fddf90dfcefcfdb4b8c0fcde4dc0a8f6cd095bb9dbcda1bf46a49f564c24cc30c52dbf27987cbf0327d705978e414e345c2a54b68a1c238b SHA512 b726912659314b0728f1c2eb2f994f4851801174df6959355bbcf4a1ad025b260c8238a03d7650951ca5239c0636fdde7dc5cd7bbc72178a6b0b5320c9d861a3
 EBUILD kwayland-integration-5.11.5.ebuild 503 BLAKE2B 1b4b9be2a97f6051ab0e45da929edd0c106f056f06f8918e2482eeb22087ba790a0eb4a5b3234481f107adc7315d1dc547439cd04c6e82460a9a59707267fe65 SHA512 c21a517a77603c7560c7833cdb53dde7c4599ba5d777c90987e8d606c22ff8a1e4a43378611bbf820f4e65d1238d7f1a5e98f8786f48c8a28dc73512473bf923
-EBUILD kwayland-integration-5.12.3.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
+EBUILD kwayland-integration-5.12.4.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.12.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.12.3.ebuild
deleted file mode 100644
index a2771a46748b..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.12.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.12.4.ebuild
new file mode 100644
index 000000000000..a2771a46748b
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.12.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 52317069020b..56a773feb7d8 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,7 +2,7 @@ AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771
 AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
-DIST kwin-5.12.3.tar.xz 4921288 BLAKE2B 709ac1ba038ca925c3159bcf1c72e3ff22b9ae0aa86e0c097dafb8191f1cac4a95a3fc28f29ba9c2ca2d1cf00fc2d1275727c0fbf670ece2134285f2f7723491 SHA512 5c5162152fb4bb9827e540be0f2cc9a93fd9b4c850d04e7237b1de253958c7dd15e440103a35d7ecd0fd157ae90a94a48286a803f7a3bfbad8d5670889357277
+DIST kwin-5.12.4.tar.xz 4986536 BLAKE2B c9e3c68c02682ae1123be502f301cfcd3cf0285d620ebd5c67b07e6748431291963b2ca3e18d8a8900b8d37cd6ef72583c944e71604426d1099416a07aef0b2e SHA512 6e2c2f2a582c40d7eb13b704498c47185ac267f62a84b59c357df8b1e6685c4e261ffde0b62a86ffd56cf100930720d74af9d7d0d1b28c354d3c4126007bd538
 EBUILD kwin-5.11.5.ebuild 2413 BLAKE2B 3cc059fee6f94872050cf63e5d15998de7a25f9b2f22cfe31a11cd8f4b632f43d6b7b77902ed3207620b5755389a102d10902e8b7cf464d7b110f3f718a9c575 SHA512 93e83dfd948e22611a514b084bf964eacdeea645b49330e57df71d522438a4766836e71d60742e53890022d4e5a4cd9b3130fd026c6738a00ea70c0dda3f263a
-EBUILD kwin-5.12.3.ebuild 2652 BLAKE2B 3f0a61f51ef8ea8335d41ddf48689295fbf5324e100098876b4ee4fecbb05f71e782054f0e291ac9636f3508d052f88b3edae77ae7012b33229c01ad6a9c7f57 SHA512 2765cffa8124bec5f27a2d73561af0c7a644c89b0ccc51c4e3cb966f1fb582c33841f9cfd90cd67ab35e189c05ef6ecbf8936aed74566ded55a5e3c3d88991b1
+EBUILD kwin-5.12.4.ebuild 2652 BLAKE2B 3f0a61f51ef8ea8335d41ddf48689295fbf5324e100098876b4ee4fecbb05f71e782054f0e291ac9636f3508d052f88b3edae77ae7012b33229c01ad6a9c7f57 SHA512 2765cffa8124bec5f27a2d73561af0c7a644c89b0ccc51c4e3cb966f1fb582c33841f9cfd90cd67ab35e189c05ef6ecbf8936aed74566ded55a5e3c3d88991b1
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.12.3.ebuild b/kde-plasma/kwin/kwin-5.12.3.ebuild
deleted file mode 100644
index e47e89325e23..000000000000
--- a/kde-plasma/kwin/kwin-5.12.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsensors)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.5
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtvirtualkeyboard)
-	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.10.95-test-optional.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.12.4.ebuild b/kde-plasma/kwin/kwin-5.12.4.ebuild
new file mode 100644
index 000000000000..e47e89325e23
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.12.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps gles2 multimedia"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kscreenlocker)
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsensors)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=dev-libs/libinput-1.5
+	>=dev-libs/wayland-1.2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,gles2?,wayland]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	caps? ( sys-libs/libcap )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtvirtualkeyboard)
+	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
+	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
+	!kde-plasma/kwin:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep designer)
+	$(add_qt_dep qtconcurrent)
+	x11-proto/xproto
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.10.95-test-optional.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 273b099a5e95..76818a55a223 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.11.5.tar.xz 20672 BLAKE2B 4d976948ec85e92981a28e99a291c75dcb888159e1203cbfbe35a238132e13fee682cf1566b455ca7cc2bd39c84e4449fca915cc25037a0a149836ab18272833 SHA512 a8ef4c899aa4b38265c470cbdb0c1b47951567f2637255837febec344cb79920986dda6838c60723aa9474e5d632fb8209e6b3090c52a723b1618e134ecb6246
-DIST kwrited-5.12.3.tar.xz 20368 BLAKE2B 3ba5d92842dd40f6f8dfd36bf7a30536be15aa53fd651b9cdd48671c2c5fb5952b60ee246d3016efb01abc3d40f5794a5c46a95516bbd1ae8c9d7d1ae6b01c5c SHA512 dcf934fc15edff512369cfd0a71751b0e3f4cbb0381f2bafafa7db19d3962f468bd474076708a9077050f997175f41b02f09041ba46b1ec8425a6adc136149f0
+DIST kwrited-5.12.4.tar.xz 20320 BLAKE2B 8a965b8f55654442d1265ccf773f15bf8b733d0406047c6d1a6f7381427808040c2d5a124945becb17f17857d342f1903a6fd33539264c35e7ecb8a79cd023ea SHA512 2831c0dc57578d882eb2b088c6e9c420a8f909670ff6a0bf09af589f72508b920bd3e5d848a1bc68f59cbc4c8bcd04ad078349329d83b8c6adff18fd6140d008
 EBUILD kwrited-5.11.5.ebuild 501 BLAKE2B 10c4a3455ad22aa30db3d80773b354a1d5db3860625103e325099b06de6f3b45093f74d538f1fbca081f3ea926a4c4b91e738380a9a5abd2b624255ffc9a7c80 SHA512 aa11e4f344edb76da01f6e8ccedb8be4ef3e58eccb1de6de2b39550c8faba29308c8759671ed03d1d720e8dd0fc1787db343349a2885c48bd911600611586e3f
-EBUILD kwrited-5.12.3.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
+EBUILD kwrited-5.12.4.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.12.3.ebuild b/kde-plasma/kwrited/kwrited-5.12.3.ebuild
deleted file mode 100644
index 9e8c97481c25..000000000000
--- a/kde-plasma/kwrited/kwrited-5.12.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
diff --git a/kde-plasma/kwrited/kwrited-5.12.4.ebuild b/kde-plasma/kwrited/kwrited-5.12.4.ebuild
new file mode 100644
index 000000000000..9e8c97481c25
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.12.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/kwrited:4
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 47c4c0e7d556..1e1ba00dfb9f 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.11.5.tar.xz 96556 BLAKE2B e0744934eab4e8f906000ba61ccb0bd8dadde9e699118195c1ff795a97c6625ee89d8478f67f19fcf8c990b339ae9eb5f088b9530a555e98bc55d4d190eade05 SHA512 40f5753d08d7bbed5693cbd2696a680565f4012412b6a097048a773ccc15af59a37659e3b73c3695c012b6c7435a05ff04f05009d9cac7971e40d75696ffacec
-DIST libkscreen-5.12.3.tar.xz 94800 BLAKE2B ad70aa7489c59e8eb497646b503a45e30af794283867082010935651bfeb5bbfa0ba7def63141704a2585ee99e1f2d7420ca3d2f284484737fd09364533473e5 SHA512 e9cffc96e5249f3ebfe895b005ec570d15dc0ae2b4ea79e1e82fe48bf34b9d4d3639aa3fb6a7ec477e26f71a16f64928e39b7e4358915d7082e3f42eebf6fb3f
+DIST libkscreen-5.12.4.tar.xz 94492 BLAKE2B 76cdd6ca32bd3c4a651dbdf230bf843c69f0d61f731d8c5e0bffa676db9b98824ee74fe163fa216c68a13a009ea62e96ff83b551c3d6bc0c628680acc0fd866e SHA512 9d6fdca9c147cea9084fae6b1c233b31630a7e586f8e2a8fbeb4b8a3f0f5ac003d4fe12ca8e1b37058d508cbd4e25f268bb79eea598009462163c4d05c4ab4c8
 EBUILD libkscreen-5.11.5.ebuild 501 BLAKE2B 315265c1c6421fce51b41f6a6d108b5ecac4ff1d43bd8a19a3f87e246b6834b8a54ff4810a0d789424037ea43d67781229daaea1947927b13edeb48a67069448 SHA512 bfd421bd2e8a96688fa0ae0673954f7a115d2443e2aff066ed3d4a4f9cc5b4d5537f80d1fe7f323dfe847303bc65196bd45130d59e25efc9769d35474c06aba5
-EBUILD libkscreen-5.12.3.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
+EBUILD libkscreen-5.12.4.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkscreen/libkscreen-5.12.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.12.3.ebuild
deleted file mode 100644
index 56ac7823247e..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.12.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.12.4.ebuild
new file mode 100644
index 000000000000..56ac7823247e
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.12.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma screen management library"
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kwayland)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 66872354f63e..718eeb3a63dd 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST libksysguard-5.11.5.tar.xz 576200 BLAKE2B 8e17dc3eda1a69ea2a37664c80695c77087779138e8b4b99c9ab0ae444074d9f78194db55b00170d3d917310c0c1ccbc5c77d3aa07dbb2a31210ff4e8a9155c3 SHA512 3a4c08aba07a71841643fc830a77ae4684ed41a8f26e6222d202738fb3c9f7ee2e816f15bcbbf5b3032fc100d33feb4d6771bf335c70548ab3bb4440d6d90286
-DIST libksysguard-5.12.3.tar.xz 570712 BLAKE2B a46500bb2c34932a4c559baa2c0a79dd44e2dce98316478c3d49a6767cf7ad64fae6390711ef3ba85ce85c84be4591eef46a0a64d5ff1a4614e764f49c811638 SHA512 fbbac93f01d511af1a9b48c0dc4f27a2dee76c6bbf6ccc571ee95aab66d10236e8d0d4ae74c58add6e1e52b8b24d1373672881fe0eaaa7fd30bb629c971add40
+DIST libksysguard-5.12.4.tar.xz 567216 BLAKE2B 73c976ea2869d6fb24126636969023f00155fea35c2c2b19329bf0fa6e700376d16e97888575900db11f55dd4a7dab10192ae119a6414787e4747c8ea416911f SHA512 c1e7e3c16c88b9ceef463503e6e776ca0a9cf4d4033aad51f6785e33a6b1e17f041ea351456a2c305888a09349d568fbff1f5feda6535b060b1c010c688cad4e
 EBUILD libksysguard-5.11.5.ebuild 1241 BLAKE2B b971b2aeda2a3ee5ebc8438502262823d3af09d264e7fa0f209e1461b9e10c484911db10766c63542603ef101e7083ae148d3b944f2e081bfd5c9926b8e1fa0e SHA512 70ad7a0f43651b8f0fce0f394464f43a6a238c2e2c7b360b1666b5ac7bb054c7aa511caeb92dfdfe5c6c7327f7516fe0b05ae8372f12a6de0defbd844e5bc499
-EBUILD libksysguard-5.12.3.ebuild 1243 BLAKE2B 98011d5bb9ea00c62ee9f83c0238e302b10d99615624aa732f74dc751081d09f8b877f5e9f841114880be62cb0845b9f2ce8fe736c4d75c47b8aa852a0979264 SHA512 a45400d5e0fe8f5303bc93a841d0628f96594ab33122f33f09b1efb5201679ac777498f0de75e87376a70d665e10897a633cc9d3ab2f4315f0c60bd62a0927bf
+EBUILD libksysguard-5.12.4.ebuild 1243 BLAKE2B 98011d5bb9ea00c62ee9f83c0238e302b10d99615624aa732f74dc751081d09f8b877f5e9f841114880be62cb0845b9f2ce8fe736c4d75c47b8aa852a0979264 SHA512 a45400d5e0fe8f5303bc93a841d0628f96594ab33122f33f09b1efb5201679ac777498f0de75e87376a70d665e10897a633cc9d3ab2f4315f0c60bd62a0927bf
 MISC metadata.xml 381 BLAKE2B 50486844ab6d038f69a97e298953a1eaef11d9ee011c4b10fd3210deaeaf4298f0d93c514a2227a2ede9227aeeeed3a68b37ae1badd3783a23cf35ab208f8fe6 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43
diff --git a/kde-plasma/libksysguard/libksysguard-5.12.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.12.3.ebuild
deleted file mode 100644
index ec1440424001..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.12.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+detailedmemory minimal X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.12.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.12.4.ebuild
new file mode 100644
index 000000000000..ec1440424001
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.12.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+detailedmemory minimal X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	sys-libs/zlib
+	detailedmemory? ( $(add_qt_dep qtwebkit) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/ksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	!minimal? ( $(add_frameworks_dep plasma) )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index f7772abeefad..173a5d34daf8 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.11.5.tar.xz 61832 BLAKE2B e241f388a6a17243123329a8075b5453603a3b1f174205a1be78306c3fcc84f56f78334be3bd58c54c90c722ea64927acadf2f1108354fcfa613960b9abaf82e SHA512 c0db62a1b8e6e72f4d738d9f26d7d16d3b1e77db1e6566451b23cf32f2b2060ab3ffa439caf1edea2c65c80d73b6e68aa054c73b54aba3fee93446a70d65557f
-DIST milou-5.12.3.tar.xz 57364 BLAKE2B 220bdcfc17cab727d73db9c4dd6f772e499689f1f08052c92f177839959a1fa660ba07b52d3e84b0f45583fc26d7b1fb47efff5f8da6e3364b2cddbf7fddf50c SHA512 78f2fa8545977468d875348385f4c08f02fe187f14fad4db693a36dc98fb5ac72473d9b6f48cf478681e6a91be4b39c56fb74c92815efb109ad04b23017a8a21
+DIST milou-5.12.4.tar.xz 57408 BLAKE2B 07be260866f1e3ca9af98982a554a396f41dc4ded3808ff172f57a5b2f3231432e7436af601afb8e9e510e2a9361a72f295aac72e2892eddcb381a48a956ae4f SHA512 b45454c104b7d90b8a5c86541b8ecf7f9cc87b55e0098c4540f8028aed2a6730ae45f337ac74c89dce43355584a91e111183f68f55d3c69e59473e9eae8be359
 EBUILD milou-5.11.5.ebuild 692 BLAKE2B 6cf9633673d92a1fe2654f5f0cd4ea60e5db47bf4120ed090ce9cbb691255b5a854ca55d2aa608f4a0751766e0ff0c05018cfbe35bab4782c68fc7d221efe05b SHA512 78fb4c265c8b09fbca47b998191c7fbcaeabf7224d0a43caeebadf942071dd92e3ca088e4de5a5678c85ffd50a140c66914a23654c9e3541e1f67617a81efc73
-EBUILD milou-5.12.3.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
+EBUILD milou-5.12.4.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.12.3.ebuild b/kde-plasma/milou/milou-5.12.3.ebuild
deleted file mode 100644
index 05a6dae87be6..000000000000
--- a/kde-plasma/milou/milou-5.12.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
-
-KDE_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/milou:4
-"
diff --git a/kde-plasma/milou/milou-5.12.4.ebuild b/kde-plasma/milou/milou-5.12.4.ebuild
new file mode 100644
index 000000000000..05a6dae87be6
--- /dev/null
+++ b/kde-plasma/milou/milou-5.12.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://cgit.kde.org/milou.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/milou:4
+"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index f707244761f4..a09175d97451 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.11.5.tar.xz 4489196 BLAKE2B 89d8e9742a68b59ad03c697875ca8e1e49e253668db0081a04922b057a7ba67bba1ab785e1507bf4e16ceb3ffa63f5adda54fead63a1704d7fe4298408db4b63 SHA512 101b9a3ace2e619510702feba868bb98cb873b18730d3705803e047ce2b0c0a761c884e1714fc654f85775e461c0784d199baa1b9026c6b8f8a4cfecce2e4209
-DIST oxygen-5.12.3.tar.xz 4468608 BLAKE2B a8f179c80c642280c3045a8e27a08b6a80d28250cc56d70e2804fc6a891541d6460e1953ecb9fcc766c2f9592f0415411e47a074e5bc8ed4d85d3c84c9ad268a SHA512 af021a17b1c41ffa7ea69f6833c94ba3ac79bdaf1090df0293c8f2811d80bd9d465cfa2bf1306626d52401a49b2a459569334bfc8410ed03b46696268093e8cc
+DIST oxygen-5.12.4.tar.xz 4467084 BLAKE2B d5cc747e8fef63f06d66b10838a00e144b07a6bf1d4fe5cff63de338f308e457701c075dee5cd8825f87c476b27e9d39833e0ece172745dededdc46bb120e7d3 SHA512 826a8b803dc97cd9d16b982ddd70c75d973fdfdc993ee510720113abedfdb6527c1cf4b1eb42a2b5ffa0c486d52100e43da7eb46fe648db99631dafe1af61094
 EBUILD oxygen-5.11.5.ebuild 1978 BLAKE2B 6948b48c969b6ab6bdf8eaa5a9c2ec0c4c20c770e1ee79f5fbfe47f5ad6f2d3f1a98870883393f836022902e2879ed17cc509f1081c15b3d8d94dddef23f804b SHA512 6d6a1708c3af1600865fc59db2e538e200a6f4c77953016da7493f68c00b237218192fd786e94fbb15e3d5b0fd68d768e60e5380a97e8f4d729706c9f94b5a04
-EBUILD oxygen-5.12.3.ebuild 1980 BLAKE2B 333bef6be5233d9d3c745b076479042f29b03a19ab64f64e62e096cd98f4466628c6e9c7ad36e4a8bc3a12c37cf6393ccae8956f51b6065c6f06ca2bd13e0548 SHA512 bb68d16cb3675a33275b6d277bf97756e8064cbd614170ff8741fe0dff245f83c356c6498dbbdeee452333a36154ae3d89263cd968fca272ff3431ac41e4040c
+EBUILD oxygen-5.12.4.ebuild 1980 BLAKE2B 333bef6be5233d9d3c745b076479042f29b03a19ab64f64e62e096cd98f4466628c6e9c7ad36e4a8bc3a12c37cf6393ccae8956f51b6065c6f06ca2bd13e0548 SHA512 bb68d16cb3675a33275b6d277bf97756e8064cbd614170ff8741fe0dff245f83c356c6498dbbdeee452333a36154ae3d89263cd968fca272ff3431ac41e4040c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.12.3.ebuild b/kde-plasma/oxygen/oxygen-5.12.3.ebuild
deleted file mode 100644
index ebd8d663ea95..000000000000
--- a/kde-plasma/oxygen/oxygen-5.12.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic kde5 multibuild
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="qt4 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4
-		>=dev-qt/qtdbus-4.8.7:4
-		>=dev-qt/qtgui-4.8.7:4
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-	qt4? (
-		dev-util/automoc:0
-		virtual/pkgconfig
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	qt4? (
-		!kde-plasma/kstyles:4
-		!kde-plasma/liboxygenstyle:4
-	)
-	!kde-plasma/kdebase-cursors:4
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			use debug || append-cppflags -DQT_NO_DEBUG
-			mycmakeargs+=(
-				-DUSE_KDE4=true
-				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			)
-			cmake-utils_src_configure
-		else
-			mycmakeargs+=(
-				$(cmake-utils_use_find_package wayland KF5Wayland)
-			)
-			kde5_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/oxygen/oxygen-5.12.4.ebuild b/kde-plasma/oxygen/oxygen-5.12.4.ebuild
new file mode 100644
index 000000000000..ebd8d663ea95
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.12.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic kde5 multibuild
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/oxygen.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt4 wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	qt4? (
+		>=dev-qt/qtcore-4.8.7-r2:4
+		>=dev-qt/qtdbus-4.8.7:4
+		>=dev-qt/qtgui-4.8.7:4
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+	qt4? (
+		dev-util/automoc:0
+		virtual/pkgconfig
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	qt4? (
+		!kde-plasma/kstyles:4
+		!kde-plasma/liboxygenstyle:4
+	)
+	!kde-plasma/kdebase-cursors:4
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			use debug || append-cppflags -DQT_NO_DEBUG
+			mycmakeargs+=(
+				-DUSE_KDE4=true
+				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+			)
+			cmake-utils_src_configure
+		else
+			mycmakeargs+=(
+				$(cmake-utils_use_find_package wayland KF5Wayland)
+			)
+			kde5_src_configure
+		fi
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9fcd7ad7672c..68b8cfe61a90 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
-DIST plasma-desktop-5.12.3.tar.xz 8433088 BLAKE2B 0f14c6f9f0ac29dfa191440f81ff4ce5d829a76fcdc3606830b003735e23cfbfd6ae79b5f96d560d3077b165d2f45f2efa7511e0d139eb7685570298018acf77 SHA512 58937067bff3e9ea9f5add9d9208c8455a5f16774938fb7f96f296c9deb05dabed88733cc36641b3aea09e567c5ad81fe157084dfbb6ed42be705083d7935022
+DIST plasma-desktop-5.12.4.tar.xz 8532112 BLAKE2B 411d2f71ed74a592f20093630abebc35174b765bc2c559d652a3371b9216283ddb3cdc2d00f6194681a86bc491f2861abc329aa4518214c38a354107025c8709 SHA512 1aaecdddfd373512eaabea2c1c2e172c058b4aac52144feb14c8c0bc096db0e8242f7f712e228fc4f9188877e045cfd4d1e9890578234c61f6b408f8c3cfb660
 EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a
-EBUILD plasma-desktop-5.12.3.ebuild 4494 BLAKE2B b7ac84c4498eeabd839932633821f7872971c2972fb2ad8cfd6f06424c006f460246d71aceab4c96bd9675c221722620649acb63b80b2885d86594b33b063dfa SHA512 ed242861f62f306c26c5da073350b8090a82feeb02fd8339daa4466d56cf049ce864868e25f04651ab0cb995dea6366c8ed64b5a22c0fed0416da64e9afe0920
+EBUILD plasma-desktop-5.12.4.ebuild 4494 BLAKE2B b7ac84c4498eeabd839932633821f7872971c2972fb2ad8cfd6f06424c006f460246d71aceab4c96bd9675c221722620649acb63b80b2885d86594b33b063dfa SHA512 ed242861f62f306c26c5da073350b8090a82feeb02fd8339daa4466d56cf049ce864868e25f04651ab0cb995dea6366c8ed64b5a22c0fed0416da64e9afe0920
 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.3.ebuild
deleted file mode 100644
index 1c48f8ffa813..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.3.ebuild
+++ /dev/null
@@ -1,163 +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="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	appstream? ( dev-libs/appstream[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	!kde-apps/kcontrol
-	!<kde-apps/kde4-l10n-17.08.1-r1
-	!kde-apps/knetattach[handbook]
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-desktop:4
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-E "(test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if has_version "dev-qt/qtcore:4" && ! has_version "dev-libs/sni-qt" ; then
-		elog "For Qt4 applications legacy-systray support, please install dev-libs/sni-qt."
-	fi
-	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
-		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
-	fi
-	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
-		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
-	fi
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.4.ebuild
new file mode 100644
index 000000000000..1c48f8ffa813
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	appstream? ( dev-libs/appstream[qt5] )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep qqc2-desktop-style)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/accountsservice
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	!kde-apps/kcontrol
+	!<kde-apps/kde4-l10n-17.08.1-r1
+	!kde-apps/knetattach[handbook]
+	!kde-misc/kcm-touchpad
+	!kde-plasma/plasma-desktop:4
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-E "(test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if has_version "dev-qt/qtcore:4" && ! has_version "dev-libs/sni-qt" ; then
+		elog "For Qt4 applications legacy-systray support, please install dev-libs/sni-qt."
+	fi
+	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
+		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
+	fi
+	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
+		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
+	fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 85a167994407..61978fbcdf43 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.11.5.tar.xz 55856 BLAKE2B 4c1d56f9de0007d369eeca5f7a992f95ac9a7853ad30f80b86a762b2ba88a5c87cd0861590e640466314edc4436052063be7e9718754a73388eb60baa253285f SHA512 2e14b0bae19e344dd0ddd27b48ddf9f9075b773c295b58a35b05d0c9d11c1573821ec1c25ae33da4e3a4091386301aef15c51f4d1163aa195a1de5f3ea1844c4
-DIST plasma-integration-5.12.3.tar.xz 53756 BLAKE2B 37bec063aa8a7d82746a60ecfc6205af744aa5a3e35562f72a8dce52a1bab19923e78742ea9373206143a92456d967ced92532205d43f72d56b8ece35d9c1860 SHA512 135ad3803d76a2e069404655c37ff152496e380c1e8b7bc4a18a620979822520b11a4753c59389f9be08cf401b6c6375ece46aa10cfb55ea9cc34b3b06dbf51a
+DIST plasma-integration-5.12.4.tar.xz 53488 BLAKE2B 47b20e5fbf6e340882cc9a610828df3a4c404f9cd496400356e1941128136eb4d402f725959a8734225e9ede98995efa2ff3a883f9913e36a5ab86246241cbcf SHA512 4bbdecf88425459dc10dcae96b2d4aef8d63b7a3c9c6c6ce39b7815881007b580dcada974636f2549ee79aa106512c89b4a4b3ce22c4ef78af63276d9bf06810
 EBUILD plasma-integration-5.11.5.ebuild 1062 BLAKE2B 85677c190ba956334daaf097c03844c989a2897cc089b6eab540c346885cd3f895a906b3a42b555093fd83978ad61abdf6913808f4523f745bab4e346d6a763f SHA512 d0c91184d4d21d945e16881f879a80d689281632f4c1c0822fcc3153d02be427198dc6f7e12af76ddd0d26f362f1caef714f21a41685e6bb604534b58b8053a5
-EBUILD plasma-integration-5.12.3.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
+EBUILD plasma-integration-5.12.4.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.3.ebuild
deleted file mode 100644
index 1d60d9295f03..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.4.ebuild
new file mode 100644
index 000000000000..1d60d9295f03
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.12.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep breeze)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui 'dbus' '' '5=')
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index a8e3a11fc810..4dcafaefcb9f 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.11.5.ebuild 2000 BLAKE2B bb5660a59599dd6d868010aa62a21baffeaee05667c921864a0cea0a6ae52bd6ecea67693d8a91498e6c3c73ccbaf13745a602425913766f004666828a799343 SHA512 ff0cce1055e377dfcd256a2bd26aa53d7ea6c2342bc4b1ad7bc6a07e5a0db809a003ba1bc37c31d2d6bc7cfd576e751dd41c7a38b8ed800a06c8e940186696b8
-EBUILD plasma-meta-5.12.3.ebuild 2243 BLAKE2B 886031582c093ebf15f1d9e2369ee34a009daf83f7e5e4d3735679643e243c69a50fe8f35491c1e4183bf5d4a740c67d9b9a8d59e3655c77f9526065f6538972 SHA512 a235f32b2d1c3ea3c2e88cbbfbfdc92ef3795a64005e64d771f4ea1b5136f7ffefcac9da04488d7d4fbf470d44f062655d98b1ec93ca4fc0bde91be1aa4257e2
+EBUILD plasma-meta-5.12.4.ebuild 2243 BLAKE2B 886031582c093ebf15f1d9e2369ee34a009daf83f7e5e4d3735679643e243c69a50fe8f35491c1e4183bf5d4a740c67d9b9a8d59e3655c77f9526065f6538972 SHA512 a235f32b2d1c3ea3c2e88cbbfbfdc92ef3795a64005e64d771f4ea1b5136f7ffefcac9da04488d7d4fbf470d44f062655d98b1ec93ca4fc0bde91be1aa4257e2
 MISC metadata.xml 1224 BLAKE2B f36ed48ffc55a03d4a79349eeb85cb36811d10e6ab2ca993f254b803a8fb2b320320985fb773e2734282f2210ebb9cc8220b1b78114f3622e3bf089ff10b0909 SHA512 cf8ac08d51562b13cd4158e4ea09aa63918947b8fbfea1dec5e23f33748b28b310c110283318b796f04a27f3a9c86524990cd991ace46c1f9e1ccc0f49c94ebf
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.12.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.12.3.ebuild
deleted file mode 100644
index 985334a5d958..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.12.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth crypt +display-manager grub gtk +handbook legacy-systray
-networkmanager pam plymouth pulseaudio qt4 +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep drkonqi)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	crypt? ( $(add_plasma_dep plasma-vault) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-		legacy-systray? (
-			dev-libs/libappindicator:3
-			dev-libs/libappindicator:2
-		)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
-	plymouth? (
-		$(add_plasma_dep breeze-plymouth)
-		$(add_plasma_dep plymouth-kcm)
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	qt4? (
-		kde-plasma/qguiplatformplugin_kde:4
-		legacy-systray? ( dev-libs/sni-qt )
-	)
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
-
-REQUIRED_USE="legacy-systray? ( || ( gtk qt4 ) )"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.12.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.12.4.ebuild
new file mode 100644
index 000000000000..985334a5d958
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.12.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-functions
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bluetooth crypt +display-manager grub gtk +handbook legacy-systray
+networkmanager pam plymouth pulseaudio qt4 +sddm sdk +wallpapers"
+
+RDEPEND="
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep drkonqi)
+	$(add_plasma_dep kactivitymanagerd)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kdeplasma-addons)
+	$(add_plasma_dep kgamma)
+	$(add_plasma_dep khotkeys)
+	$(add_plasma_dep kinfocenter)
+	$(add_plasma_dep kmenuedit)
+	$(add_plasma_dep kscreen)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep ksshaskpass)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep kwayland-integration)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep kwrited)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep oxygen)
+	$(add_plasma_dep plasma-desktop)
+	$(add_plasma_dep plasma-integration)
+	$(add_plasma_dep plasma-workspace)
+	$(add_plasma_dep polkit-kde-agent)
+	$(add_plasma_dep powerdevil)
+	$(add_plasma_dep systemsettings)
+	$(add_plasma_dep user-manager)
+	bluetooth? ( $(add_plasma_dep bluedevil) )
+	crypt? ( $(add_plasma_dep plasma-vault) )
+	display-manager? (
+		sddm? (
+			$(add_plasma_dep sddm-kcm)
+			x11-misc/sddm
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( $(add_plasma_dep breeze-grub) )
+	gtk? (
+		$(add_plasma_dep breeze-gtk)
+		$(add_plasma_dep kde-gtk-config)
+		legacy-systray? (
+			dev-libs/libappindicator:3
+			dev-libs/libappindicator:2
+		)
+	)
+	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	networkmanager? ( $(add_plasma_dep plasma-nm) )
+	pam? ( $(add_plasma_dep kwallet-pam) )
+	plymouth? (
+		$(add_plasma_dep breeze-plymouth)
+		$(add_plasma_dep plymouth-kcm)
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa) )
+	qt4? (
+		kde-plasma/qguiplatformplugin_kde:4
+		legacy-systray? ( dev-libs/sni-qt )
+	)
+	sdk? ( $(add_plasma_dep plasma-sdk) )
+	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk qt4 ) )"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 8b3a2150410f..7fc0b98e86b6 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-nm-add_EAP-PWD.patch 10213 BLAKE2B e35cf580481f9ddc139fd77d7f3a652440bff749a1c34e26ef579ff1dc9ac741b97d7f6f8ea2165c959febaedd16396e29af3a4adf20bb74b3ec6b73fb77193d SHA512 0db8b7e4c9e7ea51acb6ee7c8f79b1cb1040899b45e02a80f83d268197844e5bcee3b963796e9a70d364677adeff2180d5b4520d529c7603e10d91a9a0f162f7
 DIST plasma-nm-5.11.5.tar.xz 718500 BLAKE2B bdd9520cfa3a305f7f2c271fdfc9678b43ed46e160ff7c7485a963889b32e60f56408bcc39b4fce81e570ce194410730a628bb2eb96afcfba8704b787d90c05a SHA512 6bc42e9b385fff03d994d66fb2088ce22b2766588c655466e4e26a0b57f1533c142ce7712c9182d9003368f30086333ea9670bac54b9b797e58a968f8bfc3512
-DIST plasma-nm-5.12.3.tar.xz 703716 BLAKE2B a9335bb14dbbeda0b61a7ead5746afa003d55057e6435ff98923ec130a1a09846750a284309a66656d0589d8566302be397a9d08cafca75f5f058903c7e73d49 SHA512 30d9f9661df1b1f51502825e5a584126c4b6bca04f39cd24870b21dc92c46e3a60f218e03ce33365b7486067eaa6b1040a034d13a0e65de2095bc6463c82be9d
+DIST plasma-nm-5.12.4.tar.xz 703984 BLAKE2B 88e1e6ee4f69a3d6fcf5edf8f97d5a7146339de2b085233b0a94ed6950824bb2e85f6b98231873da501bedb609b65e3a7965d2dcd4903a6cc69c2075c269ea91 SHA512 f35ad6e833bc995230703c4d94a4a3e1e418472828f2ad43565fed5eb91792c714dec7712a3ce5e5fbdab45ee495f60e21f83d9d211d183b2b53278a0f8c336e
 EBUILD plasma-nm-5.11.5.ebuild 1789 BLAKE2B 7c5af92a13398f943f6277e1b87864a40fd5c2a5ebb1f7765a64309a38e006339c4c0e63192e18180ad1b98143df2ffb4b743c990438f99930406c61b1d362ed SHA512 d376eaf845a52b6e916f554a848dcc767774bb972fde518e10404eda1b269025e4d4108132a64b4dff9d2c7453b88dd47ad5280ac12baef52eb3cc63d89d7618
-EBUILD plasma-nm-5.12.3.ebuild 2049 BLAKE2B 94706ee5252b5b89c42b785e0b9d0b42d36baf3818c23a7c7ebf6eb7c7510919c9dcfdceaecc1d9d0a3c67f18087666d376269238fdee26c5bf8d89a6e04c5f0 SHA512 5738bfa0bb0eff64392b1d0dcb0a16a87fd8df3a82d0ece3051489718dc9c8e91fddb0c793f834ef61bb9c3315cac6df699da00408c83a623a417badebace5d9
+EBUILD plasma-nm-5.12.4.ebuild 2049 BLAKE2B 94706ee5252b5b89c42b785e0b9d0b42d36baf3818c23a7c7ebf6eb7c7510919c9dcfdceaecc1d9d0a3c67f18087666d376269238fdee26c5bf8d89a6e04c5f0 SHA512 5738bfa0bb0eff64392b1d0dcb0a16a87fd8df3a82d0ece3051489718dc9c8e91fddb0c793f834ef61bb9c3315cac6df699da00408c83a623a417badebace5d9
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.12.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.12.3.ebuild
deleted file mode 100644
index a699afd24882..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.12.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	>=net-misc/networkmanager-0.9.10.0[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		einfo "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		einfo "However, the networkmanagement KCM can be called from either systemsettings"
-		einfo "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.12.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.12.4.ebuild
new file mode 100644
index 000000000000..a699afd24882
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.12.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	>=net-misc/networkmanager-0.9.10.0[teamd=]
+	modemmanager? (
+		$(add_frameworks_dep modemmanager-qt)
+		$(add_qt_dep qtxml)
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		$(add_qt_dep qtxml)
+		net-misc/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/plasma-nm:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package modemmanager ModemManager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		einfo "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		einfo "However, the networkmanagement KCM can be called from either systemsettings"
+		einfo "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 5c23ee102131..bf88186955c9 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.11.5.tar.xz 90384 BLAKE2B 06974711a2b64892414906d0330ce1a5ca31cacc7ece0d71e8514ece78e7e838818a936197a2ad46f641a44ebd7c55d8cf99346ac9220b85135bf5f5dc7bd97e SHA512 f7debe7b422b6c5ec0833d22d1bb46bfac06c4fdcdc54ed2f00fc9cf22d5cee8e7fb29f2ec0845cf3eb829bb938b1afb1ebd4a72185208f056c3c63afb1ef7b3
-DIST plasma-pa-5.12.3.tar.xz 85968 BLAKE2B 3ea075115e11bd838cf7ecee9220393ab1d880808abb61f5abe5856c60f5948a2f4173e146b5e0422c1ba493610b3494f5ddaedb1811d3bf4addaf9ad011115e SHA512 0455b77051b5b7dbc505990ff26b91a96adf42ee1e3ab59ab88d05ff396ff80019120ed11749bc13bd700786472ddaa3df79b57d9d4396c0ab1ec2b34d7f48d0
+DIST plasma-pa-5.12.4.tar.xz 85968 BLAKE2B d5b326882e6a43979f02a4179bc5097fc95a6a29906fa7d32fcd4a75e725c265f4697c07a4ad0ec3fb5f427c718900668ef549e7cb51415b2532574a2791ab2e SHA512 07d8286f047e31c0f276c5b1b10663e163e10f191e0391a611dead4c853048fe6c6eb1eb25ebe112ead55676299116f9c3386b18554743ad847c4b18f0e8fb9b
 EBUILD plasma-pa-5.11.5.ebuild 654 BLAKE2B 92ab0bdf33a2abbeff636da7fd356b4bd94c2c7d3bc73adf0867c3563e6ed06bff4ff1706c49eb5d6730f16667c29b8d234899a24a1016b7af51b98400778ed8 SHA512 7aadaba73defe948c5eaeab2a08810ccc02bdfbc32acdc9b6729185c8c0c1c3f05a6bf93137c46dea46fe2ec2c1fd92388b47dc117f6d3688b211355751a0040
-EBUILD plasma-pa-5.12.3.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5
+EBUILD plasma-pa-5.12.4.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.3.ebuild
deleted file mode 100644
index aae43ea14cd3..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.12.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gconf:2
-	media-libs/libcanberra
-	media-sound/pulseaudio[gnome]
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.4.ebuild
new file mode 100644
index 000000000000..aae43ea14cd3
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.12.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	gnome-base/gconf:2
+	media-libs/libcanberra
+	media-sound/pulseaudio[gnome]
+"
+
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 2e742231b6e9..0563cbaad2f5 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.11.5.tar.xz 265048 BLAKE2B 3da4125bb0db4801462ce5907329dc95a4102dacb0d09e404dd0af85d7dfeae44d4be6b60de6828999769c631c1ad09a52359501d7e9454c18ea2d91757df367 SHA512 b7259e5d17f209edf3bf07a37fb7a2efd0be08a5d34ab78115c55f94c74862e076cf58446ce67327c8021800086d282587cbec0e7ab8634b12ed009de3c26090
-DIST plasma-sdk-5.12.3.tar.xz 243508 BLAKE2B fe7e8a01b95a521de9fbd6bf0d09d56cd985cc84de6cd00c6c6c76ecbf09ec683cdc2c6a591f8ec2e37e7ecb6768ade76ad4b88fbe18bb1fd417df3fd0a5b114 SHA512 94e9c3e32ad1dbe5a3efde03ec3d25428a4685e3920aab3b85078ad93720b4d42959b95a18eaa473d9b44a8913b58fb4a2280abd1875f3ebec0179c9309cbb50
+DIST plasma-sdk-5.12.4.tar.xz 243864 BLAKE2B e34dd2c647c0132e984185bcabf0175209791182450cffeeafaec1f7d76393b19af574832c6cc7f9a098e5b333482fa3297f3d756f53c6ee99d6b85c8189ffef SHA512 bc68241c16f63e60ea8258d27d99da25fe21750624f77d3e31eeb3a879ca69897511cba662e89d01aad0df2489336e5914af94f640c9e60f8a01435cfe7ddd7a
 EBUILD plasma-sdk-5.11.5.ebuild 969 BLAKE2B a4fc74c2bd385e5d6bf936276de015c1616ead4b35df629d19aa7051b69ccb12dcdd968dd8b0250cffd07987a0762d210999a64f235c233bd714ad64be63eabe SHA512 b942f87567b41693f6568bf9975a907af75b4601a5f1b2bb8c024975c4a4223a7ed2e1e1d870103357632369e9da4fa58f4fee2bb8838a7bfe552857b9ac54c1
-EBUILD plasma-sdk-5.12.3.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
+EBUILD plasma-sdk-5.12.4.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.12.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.12.3.ebuild
deleted file mode 100644
index 47de95ae2130..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.12.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.12.4.ebuild
new file mode 100644
index 000000000000..47de95ae2130
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.12.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+	$(add_frameworks_dep kirigami)
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index a407b4d559c8..5a0612eb7e7e 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.11.5.tar.xz 97556 BLAKE2B b6a1b8bb4660c8e00ea0dcd098eead4171f44f747f5fd4ce414b35a00e36c9433ea9540b620c713d613e903deb3ef008add1549e163bc4644f0c330392362d17 SHA512 7505afee50f1f0a5340d9a2936ac9534326acf5abe4cf4009efa21584e3fcee54b58311ab850b94e601df85dd446d6ccfffdb18d2839536c6730d3bf7ef96541
-DIST plasma-vault-5.12.3.tar.xz 104024 BLAKE2B 324f7d5d037777d2de4d4835fb137f70891aeb407c6dcfbdd02339456ddfe7449f073f27a003bc39af66138040a3ad4c804f23cb708b8ca395da813ff1d31960 SHA512 3754a1aaedb8612b54bf8451165165a9e9da4a3ce6e94c8169770c881fd65cbe898726864cabed847ff8ddf0ad3a82cad4b4ed8da3536b26681ea2e92cdc50d7
+DIST plasma-vault-5.12.4.tar.xz 104848 BLAKE2B 21936cf55a19e059fdd731d53c0415289c4b512f7cc5902a34859419cb558510d6a33935f8fffe30274544acdc812f8f3fbbaf85e0fc98cf152db5207b400cc1 SHA512 50186657fd1338743d46d7591a551fede63011fe3cb7e37273e33013d8ca8a4b4f4d91b73ef91c841bcbbc0d314f3bd316b626cee541318c4e0473113ba55793
 EBUILD plasma-vault-5.11.5.ebuild 855 BLAKE2B 700ffe1ae7d237e6714fa15115d4bc34e334d66f97d11416977929864c2e9d9259d9ef2dbaa87244d82ad0fdc8515b3f105a7ae79e9e61477cd620338c7a98f9 SHA512 0389a4107e2bf513c0b28f6cd2ca7d0e8fdd67ed1870a9e442dd89d5bd275f0f5bdd888453889f5c1cdcc483a9e963d7a2aaa2bacdd6669d8ae25da4c300f003
-EBUILD plasma-vault-5.12.3.ebuild 857 BLAKE2B bd281842d537f31d444f1ff0155651859b7d9bfe4f3d25408966ed3657d391a15f9d34cc2f9debc5a90a2d8d98fce2979f9f1519f9308df807f57ae8b7cf1329 SHA512 03f6fe44498657c87cecf54cddcee1c2463527bd21254749358d719e689674c74729441d9c66294894699207f9f0f43ec335983107e7e43939a64d9ac7c6e8c6
+EBUILD plasma-vault-5.12.4.ebuild 857 BLAKE2B bd281842d537f31d444f1ff0155651859b7d9bfe4f3d25408966ed3657d391a15f9d34cc2f9debc5a90a2d8d98fce2979f9f1519f9308df807f57ae8b7cf1329 SHA512 03f6fe44498657c87cecf54cddcee1c2463527bd21254749358d719e689674c74729441d9c66294894699207f9f0f43ec335983107e7e43939a64d9ac7c6e8c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.12.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.12.3.ebuild
deleted file mode 100644
index e346ad1f7d2f..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.12.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" http://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs )
-"
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.12.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.12.4.ebuild
new file mode 100644
index 000000000000..e346ad1f7d2f
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.12.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" http://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs )
+"
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index dc1a761b1e39..8d6b3303d2c3 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.11.5.tar.xz 45920036 BLAKE2B 5e6898a9ec2444f7b9c8a5a637c898eaf8dd9c7e20428dea3de72d7405b585618f7f868ec9e3e6ab4c17ae60d7bea0696a8918b4f4a65b4a494ed0371809130f SHA512 a4cc1776099be2822073a3a4252a02ab1e063a9308be275002f8376ab0c621f2aba1024d085b93135aafde3c34191f40730567b2125e49cfd22162799ded8057
-DIST plasma-workspace-wallpapers-5.12.3.tar.xz 45917720 BLAKE2B b9b1e9a88de702e499ac6fb61a6177c6d59d39ee7a232f8a07987057425befc463b4f205a59abdf082b096efca8e5df6e20694eff6c84c9601b511fabe79f81b SHA512 c2272e8f7a20f8c1897dea8b2da162b6513a2446bbee97260083d807a35ec33568c853330b1137efd6298b92ec9b63c029ad129faef9359be33b52f93ab3cb75
+DIST plasma-workspace-wallpapers-5.12.4.tar.xz 45915596 BLAKE2B 59632024d515b2dcdf4535bd797490953c750b37db432cae6edcf3e44ad7d11e13b5863858197ddb6f11885cd940ba7ca843f63e0bcf3c2d0ff0e37699bb0f84 SHA512 8b6e3a79aa2d10133d88f4ceef76712207d2b886edd2d96b495003bd75c9fff19e5f895e2f7287a2b55980925e3a29ae5e0a79c60deb912efcfc39331a38e391
 EBUILD plasma-workspace-wallpapers-5.11.5.ebuild 388 BLAKE2B b4bf3798c73f248bfc0c401da88c958a447e2ac61cb7be3eee9660f39e758388542254ad1863c3b98aa409512c6f5b130607ecdf167e81cde36dd32acde61aa5 SHA512 da0ad25926fbb78cae9f25c1d9c0e5601e613aad594d4bbb06be11e24700b599843842515d3204a05f5d688b9e2b863f4dcda4a564136c7f7957cb3e6f71c501
-EBUILD plasma-workspace-wallpapers-5.12.3.ebuild 390 BLAKE2B ea1a77e379d275ef3d2a816824ccfd9016e9d61441ac6db97b7c6fcb63a0f5b6c6f92ac905894a23755894313bf2d466ed0724d43283252f9f5ff87e338509f4 SHA512 1f50c54cca6f1637339ce43498b657a8a4422b7b60e42c557ae3bfaa18dac8212eaf379295e6f3af5a5f72b9cb073a0ff19aa7b8b6d722c3af1579aab333f794
+EBUILD plasma-workspace-wallpapers-5.12.4.ebuild 390 BLAKE2B ea1a77e379d275ef3d2a816824ccfd9016e9d61441ac6db97b7c6fcb63a0f5b6c6f92ac905894a23755894313bf2d466ed0724d43283252f9f5ff87e338509f4 SHA512 1f50c54cca6f1637339ce43498b657a8a4422b7b60e42c557ae3bfaa18dac8212eaf379295e6f3af5a5f72b9cb073a0ff19aa7b8b6d722c3af1579aab333f794
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.3.ebuild
deleted file mode 100644
index 96669f76d47f..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r2"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.4.ebuild
new file mode 100644
index 000000000000..96669f76d47f
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r2"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 66af38fd6206..cbdd20264a92 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,7 +6,7 @@ AUX plasma-workspace-5.11.5-CVE-2018-6790.patch 17967 BLAKE2B e9c65a902dc68f579f
 AUX plasma-workspace-5.11.5-CVE-2018-6791.patch 1087 BLAKE2B d388f92343bca64a810da32a12ff2572e6c2100b1ef86107f43b4e7f8e29a36764c272ba5814228c45ac671b31e35d67135e8e5d4e8df4c92037985d0f800a29 SHA512 dcdc58fe65f72325c851ff361cf47f5521f0b58e8ba2fe0715b8dc0e214b7cbff2c2e653cd06189e394c0bcdf980395942d06dbc281eb8131e228739fbdf3777
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
 DIST plasma-workspace-5.11.5.tar.xz 6494360 BLAKE2B de4e3608382ab827f68d61b5095d05168a03fe8da65b219ec5b53e28506e21d5105fce0874d840eb23be1253f3bd3fb3e4ee7d0e3c5e15c895fb4b9f133c062d SHA512 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f
-DIST plasma-workspace-5.12.3.tar.xz 4559680 BLAKE2B 182ca94b52049b10921f7d6035948300516868d55cf29083175569ce04ec88a5328e37a0f7a721867e83d1835d30acdd14d5d72c61b0f6d753d15c05517e0858 SHA512 0f00b1e14d5dc5b5763dbfa5aff4de74a2bbf3a44e2932f1916de525c3caf60d0a11e611cb2b0bcc31ff502991595808ff2728772dec787e91974700da234f53
+DIST plasma-workspace-5.12.4.tar.xz 4556108 BLAKE2B 57bc47e266f09dbeb07196b42d668ee4042d08f6853c02368aa6b96a222d72a77111048870e8019b5f391b098472ae158a04fa62f6aa74b872550d535324be91 SHA512 629f0286fffd1e90cf68611a3b14a8934e9770dd821b4c6de25549af00fefd305c848342f55559a9223199433ed8f180975ceac38765904de95179d1980fc3f5
 EBUILD plasma-workspace-5.11.5-r1.ebuild 4830 BLAKE2B c55b1354329cc9b2f7904d1674886085e3c352ede25fd4b9d66fce858bf62c0b285df59ceaac4db68736228389fa3ff4d797f5b5a7e43ae5378b66e5cbd4124b SHA512 2ecfe5362eba94ada58fcb747ec4d497a8f3a56a8bf5a03d06b4bae0d0b23d9678882b2ad3b4e6914f73f75e6794e369eb4d0bb57116572061ef64715f1f18ca
-EBUILD plasma-workspace-5.12.3.ebuild 4716 BLAKE2B ef1e4b20cfe702aad3818205ea79398f770734ed979842e0f2654dfe3c3ea0ae339a3e454962b943272083dc4c25f35c8bfbcee10bc7ca174272671c77699789 SHA512 b1dec91c549f8e048ce988347989a55b9548e35ba863ca5368e7740acd808b90a88ae737fefb4e7c7abe315053cfe0a114bbc406c7a01a1f553b40f30935ddaa
+EBUILD plasma-workspace-5.12.4.ebuild 4716 BLAKE2B ef1e4b20cfe702aad3818205ea79398f770734ed979842e0f2654dfe3c3ea0ae339a3e454962b943272083dc4c25f35c8bfbcee10bc7ca174272671c77699789 SHA512 b1dec91c549f8e048ce988347989a55b9548e35ba863ca5368e7740acd808b90a88ae737fefb4e7c7abe315053cfe0a114bbc406c7a01a1f553b40f30935ddaa
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.3.ebuild
deleted file mode 100644
index 0fbd6e358b41..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( $(add_frameworks_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!dev-libs/xembed-sni-proxy
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4.ebuild
new file mode 100644
index 000000000000..0fbd6e358b41
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kjsembed)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui 'jpeg')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( $(add_frameworks_dep kholidays) )
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( $(add_frameworks_dep prison) )
+	qalculate? ( sci-libs/libqalculate:= )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesu)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep plasma-integration)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtpaths)
+	$(add_qt_dep qtquickcontrols 'widgets')
+	app-text/iso-codes
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( sys-apps/dbus )
+	!dev-libs/xembed-sni-proxy
+	!kde-plasma/freespacenotifier:4
+	!kde-plasma/libtaskmanager:4
+	!kde-plasma/kcminit:4
+	!kde-plasma/kdebase-startkde:4
+	!kde-plasma/klipper:4
+	!kde-plasma/krunner:4
+	!kde-plasma/ksmserver:4
+	!kde-plasma/ksplash:4
+	!kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	x11-proto/xproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package calendar KF5Holidays)
+		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/10-agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+	echo
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 34e2f351d2db..7e6c6850d45b 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.11.5.tar.xz 39368 BLAKE2B da61b6e32c1a73a4bd5e138c4e5720feb1648091ccf9e28583b40f30ccad20ff6dd8096996c93224accd151d5f9f4298756ff2bec37c73176f2e3159ed3f7627 SHA512 c30ca55c8647b3c32f1266519a7b005f9d2b2eb0b7064c12ea1780b85ff43662dc6be8ed46e2730be84eec96d809b7cf01385a2d38c52769f469bb355c983ed2
-DIST plymouth-kcm-5.12.3.tar.xz 38952 BLAKE2B 02e0e23b3077364e4557283c7e30e74215ff37785217b0d33fcf2fd43c3de228e98e7a502387bfd5be8ea213c9a159537831b6b4bbfaa3e93a310285d01231a0 SHA512 fa30aa3ad2583d53f62cec705048b6471f12106a384106ae01a34dca30eeae3c36c3659ef4e6e4751b6c6ede20285090411548fb39628b2ab20a90932f558108
+DIST plymouth-kcm-5.12.4.tar.xz 39004 BLAKE2B fb9a3ad9281e61d07c17b4b7de3a5739235a6c267579c7a60a73a9c25e5c92b35696977a928b9e72ca4e716851cf1a0a93ac470de61b2710748ffa054a5aed69 SHA512 da1ae6a949d84685053d889a39230f82e3d6d777f3e69112b6e857094f18be1a453abba94d0f0fb0135df43c0a4bbc0938a29da7580b2e5784c3eb1613385862
 EBUILD plymouth-kcm-5.11.5.ebuild 796 BLAKE2B 589a5ec6877dc910559b491081dda3c8a2fed924f60b775c248b1e4f6c354ee18790d5bcbd0e2ec30651d567574d8ddb21bbee870efba1d33a53df8f88e7dcc9 SHA512 106d4743791473dc7ef56d39a4a9028e693d83a51018da96d9a8f6846a2929ede3f5403254635e48d252d387fdaa8b62f264ebb4bf97b29bf374738c28567a1e
-EBUILD plymouth-kcm-5.12.3.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
+EBUILD plymouth-kcm-5.12.4.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.3.ebuild
deleted file mode 100644
index b22a94e9b199..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BOGUS=1
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.4.ebuild
new file mode 100644
index 000000000000..b22a94e9b199
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BOGUS=1
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtwidgets)
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 23bb6c4aad79..32956cc1015e 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.11.5.tar.xz 44320 BLAKE2B c1e0add72af02cb34f61a07038580f9b1de5e2b45c0a47f01eaea1cb0a96ddfb071fd56f293cb59d66620ecd3dcb8868f0c4b63a40ed46de4326f78b8314d37b SHA512 63a6696fa5961c4757b9ee13db8d9de67d0ff8c15f72448c05f2728fc57f19717adfe09aba38d7990bbaf3bd67a3674300397fd2f988f0d27b5e13b22902966f
-DIST polkit-kde-agent-1-5.12.3.tar.xz 41588 BLAKE2B 8ed12b88bac46c46c26070136fcbd1285a770abba5efc08da5a3e070b4aebb9f5c25caf7fcb15c53dc442e076c47cfd6d485919ade5254cea684a9fc702e2b4f SHA512 870859afab2cc332dd74b87fe9217a6c1140c65647c36e3c62ebe264a17a5194e784840393c993fc3d2f90d94d3bc6155368d676b20ff94cfa71e9b8d53c0ba4
+DIST polkit-kde-agent-1-5.12.4.tar.xz 41576 BLAKE2B 3fc3e952405cee3cd112386ae5b62afb1f698d8a2e3a3ba7d1e70070eba03b779e43094a82fe7b9ab63788ac02cc08ead032f6183b2759fc075587cb0a3ce952 SHA512 2f8bbaa4a7dd7ac53492a767cec13af74d1e254517313185b25d5b23304023063a7d4be0ac21fdde62d8610a5c72c2fede6fcf2e80f81a6bae09c1d67440b0dc
 EBUILD polkit-kde-agent-5.11.5.ebuild 719 BLAKE2B e879a3556ff23140c9e997264e5ee347a2ba22fca5ac59eee68ed1e84759edb09465ee4f28d4a9d0a6ac9cb6d6427bffab5767f7594f9f8e09c99854d24e2992 SHA512 558547980ad45e24b1e557bf807484ba05b41f9c3131510f322696d55e3cc6f0a756f84fd63f768c42025342731b10a1d5798c307ae27f9403dd28868a1d00f2
-EBUILD polkit-kde-agent-5.12.3.ebuild 721 BLAKE2B 24ea1a19dd4d1dce29e67fe934e4e4e9db207f2fe7dbb4051d0a077d6e69e4bb01b80f20e5227bbf717df8a6417170d54c3a3b02f995c504955620c75a2685a7 SHA512 b842c139b0ea485d20b0a3f49d2a89814f08699a0715e8e70674db428b83f131dc9638d5c7369f5f26363fb8d9885130af16bbd5de67c4456f5dfc623413b096
+EBUILD polkit-kde-agent-5.12.4.ebuild 721 BLAKE2B 24ea1a19dd4d1dce29e67fe934e4e4e9db207f2fe7dbb4051d0a077d6e69e4bb01b80f20e5227bbf717df8a6417170d54c3a3b02f995c504955620c75a2685a7 SHA512 b842c139b0ea485d20b0a3f49d2a89814f08699a0715e8e70674db428b83f131dc9638d5c7369f5f26363fb8d9885130af16bbd5de67c4456f5dfc623413b096
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.3.ebuild
deleted file mode 100644
index d1b6abb46a4e..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.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
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.4.ebuild
new file mode 100644
index 000000000000..d1b6abb46a4e
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	!sys-auth/polkit-kde-agent:4[-minimal(-)]
+	!sys-auth/polkit-kde-agent:5
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 377c6cd78cc4..d3e36519c5cc 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -4,7 +4,7 @@ AUX 30-org.freedesktop.consolekit.system.restart-multiple-users.pkla 325 BLAKE2B
 AUX 40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla 367 BLAKE2B a43d81771fe1fee025aa631a4f026d6ef9bf9d26fa8b377e5f658d85c85d1182e3e9f5ddeb6f1bf8aa0ddf22657b7a0afe0ffbd60cb447925eb411c9603da499 SHA512 c359ed4a577f02810b56fd6032cce1b59df720598f7ea61e68d74dae2929a2ac81b1db3ffa57e9aa29c594639f3ea6875f2f7cdef214e7f61fd37c153c7b1444
 AUX 50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla 308 BLAKE2B 96be3dcfd39eb58a71c0755e81c33bb8a9fdc5011b8270918cb6dbee59e6cefee98677e63ad5cded12bf2389a3b49259eaa5b0d7f390190084ef6e11ad7408e0 SHA512 f3051bdb62ca0c0e63f35f95cfbf6c8afcc9910fb61be8d78c7769a4e01f8d4a8b5c96a7ffa2b5f8be200a5f23f08ec4201a2d8ffc6230e9468807d7b79d85fe
 DIST powerdevil-5.11.5.tar.xz 392664 BLAKE2B c348dd3258a9724f0f4b79dd20e7bc4b96d6e1a062322c07b6f86c20c36319b723b9ab1fcb622b7e55001ab79db24e91b1c8f7baa5b84706bb3fab79835ba445 SHA512 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3
-DIST powerdevil-5.12.3.tar.xz 380576 BLAKE2B e32859cb21e2a6740b6f8c6b8082d59277f9deeda9199fb1138376906a8d5c6f49b296351833015e8d80b256e5684e488583cf9a19be78e8521885f5fa058068 SHA512 715ae2c3018a771088efb3db9e69f57167700666267f50ff8bd5f858d9e4cde29768236f3f3041c3d395a147f004153ece89b014fd18d38ab726838d74c908d6
+DIST powerdevil-5.12.4.tar.xz 381604 BLAKE2B 3c49767f78c49b8225604e56d7b4bdbc3f47371a39b4ceeb1b85f64e673b5dc02269fef233ec860836c853be9231bfd4934849bae4f35bff8e0f721921d119b4 SHA512 098c02c640f04684f56aaac954a7af9f0297d4640bd47739b2da48deb50e298c9faf79d2688ae8116702a3b7072a39712b07937ee1d2fa261add6e1b54cb6708
 EBUILD powerdevil-5.11.5.ebuild 2252 BLAKE2B d4f9db9d39cbed2225803934c83bb9449187002ed76aff2770990a5f583c8ec7cb184a0db0c4f68e9b17637dfb9dfdfc4f83614705825e9e7341a38cb9a47c1a SHA512 d3405de703cf20d706014e9207157f029a10412cf8763db86840923b68966e3e8ff20ec5618dbbc4d022b5d8eb70eb4dedb9ae785811871d84054ac6014d1672
-EBUILD powerdevil-5.12.3.ebuild 2338 BLAKE2B afa6783b0a2cdd6cf908ac63d8ffae25c5a43074af6ec1a1cd6020469efd071660575fe308f5627af2e1b2a3aee257e0a5c9ba0e7b2046ab7969fcc4f133b353 SHA512 639ca301d9a4dc62a721956897e2bd417b11a0e620cdb6261e39c9b38056eb2821af78fd797d980e082cc22f128f73227b3dbde096ad489cce0944a5ff7d4995
+EBUILD powerdevil-5.12.4.ebuild 1788 BLAKE2B 340f9d5dc53957dbe0a3097b28393ecd7ed9af90c73c037d896afa94c3d59ce58011ac9c7070d97f89505ebe4a2c153256c84aac5eb70de5b998c3871b8dd0f7 SHA512 ae488943f2012b8c5b4a87181492665fc62cfdd3f6fbf183f84cbdd00dd5074fe9ba5a8156d51ecc8ee6d5581b22b22987b26860b6e7bca19ae6ec03afb52801
 MISC metadata.xml 642 BLAKE2B 51a6b9a3c4cd0040241ac6be1b9669d7b7b77bda831ddec18380fb4f2b1af4072d0ede8281d3b05da41a6744db95b588dde3efccd4b339e289aee053645231c1 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.3.ebuild
deleted file mode 100644
index 16f648877dad..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.12.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="brightness-control consolekit +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	>=sys-power/upower-0.9.23
-	consolekit? (
-		>=sys-auth/consolekit-1.0.1
-		sys-auth/polkit-pkla-compat
-		sys-power/pm-utils
-	)
-	!kde-plasma/powerdevil:4
-	!kde-plasma/systemsettings:4[handbook]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DDCUTIL=$(usex brightness-control)
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	if use consolekit ; then
-		insinto /etc/polkit-1/localauthority/10-vendor.d/
-		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
-		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
-		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
-		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
-		doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
-	fi
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.4.ebuild
new file mode 100644
index 000000000000..ed23ce04aed6
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.12.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://cgit.kde.org/powerdevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="brightness-control consolekit +wireless"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth policykit)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		$(add_frameworks_dep bluez-qt)
+		$(add_frameworks_dep networkmanager-qt)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	>=sys-power/upower-0.9.23
+	consolekit? (
+		>=sys-auth/consolekit-1.0.1
+		sys-power/pm-utils
+	)
+	!kde-plasma/powerdevil:4
+	!kde-plasma/systemsettings:4[handbook]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DDCUTIL=$(usex brightness-control)
+		$(cmake-utils_use_find_package wireless KF5BluezQt)
+		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index f8c9dd11803a..bfa955fa1653 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.11.5.tar.xz 62788 BLAKE2B 2329b2891a4d3334b06b1083b594bb04abaa38fb83dcc2ce0971d717c5f169043743e8ac5cbf8fcf57f42d300aef521669d30f2b4989d94540d43bd5388fc53f SHA512 7ea9ba1ee71e28f7afc7eedd40030b50fd22ecfc21447972c8f154ad1289a80f25dc5bdd00c01e8ac70b968d720734538f9172f92648b205614bc70ee556408c
-DIST sddm-kcm-5.12.3.tar.xz 59848 BLAKE2B 0aa72b670120d5e6a9ecc83702b23c6df21e333b2f08e17b49c63c6d2a3322117b1df8620bbb8a9a23f93fa8a614249b9c370fdcb7b0129591d84f534e60a177 SHA512 7b5df8c08b577855b5269c1424966c80b9f4153aaddd6b8aea16fb12927b398c5a8a1ba2eb3f51979d6b38dccd5bebecb2247c2cf4cf66cd9b9701e873677d13
+DIST sddm-kcm-5.12.4.tar.xz 59724 BLAKE2B 2e3d01cb0148e23765ce983ab78fac68b6eb205fa39346bbda466e8b30ec6f1403c10bd978b4be49c914af71bf492d73803f33bbe209577264977de5e9b9a100 SHA512 16354893c43921d57f132753b42dd623f3da9efb9e72f440378c175b4749a3f776fc5dd17eb9a0746944a3c8954e5ed995c64a22c5a9169785649c235436a513
 EBUILD sddm-kcm-5.11.5.ebuild 903 BLAKE2B 4d6baf95830ff57b93ab0850cbf15c657ca4636f282dfbbda5b8c6865beccea8bde071100b483ffa7380b63c79be02c77fa859eed76b88298855fc7944db90a8 SHA512 154faf670b577a4af410a3c4dbc5efee5e6cc5ebb02d2dd77b140434fb0d01f4b0fb9440335ea107ca1f46f3ebccec6d9c0622c5f371e0a5bbf7bb97ad1d395b
-EBUILD sddm-kcm-5.12.3.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
+EBUILD sddm-kcm-5.12.4.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.12.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.12.3.ebuild
deleted file mode 100644
index f2bab93c9538..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.12.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
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.12.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.12.4.ebuild
new file mode 100644
index 000000000000..f2bab93c9538
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.12.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXcursor
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXfixes
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	x11-misc/sddm
+	!kde-misc/sddm-kcm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 2e8b5cf631e7..6d28d7aa6352 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.11.5.tar.xz 180592 BLAKE2B 49c79d63f1da81e5699a929de9ea66a7955d57b53516eb289bc70e1b907f6d5f4629d01f3507e722b484d7363108a143e3a64073b043e9c82a74383f07b135aa SHA512 d9cfe14d5dc023e203b43bad20d9fcf8449f4f945600c9b9ed4a3367cb5384b88e77e8f206448a4915cf88734ab6f03dbab55f5586a17d1984e46947e684150d
-DIST systemsettings-5.12.3.tar.xz 171904 BLAKE2B dd280815e886444f85ef017687cf27cb629670ba609ff56f56c01c30b9a232d38e8021f379c501ef4c8b55a4ab720d78bc0bc3e21332e224eee33d26461bf2c8 SHA512 d9b43311172f215840e4d392a90ad4ac4b6fd9bb9244508660b1b579630a94aedf1f735a355d10ccf4819104114c4f17dbdc9595ad28d05b70e57722e37174fc
+DIST systemsettings-5.12.4.tar.xz 171740 BLAKE2B b0bfa5f3f632669fd0598c90fd8e3568a4c6ee31c301ac76c154532dbb8f5bf2c605a6c5e12f736eb61d23f77b3cb5784bce76fe4afe99765a01a461ed8dd6c6 SHA512 8edf9e2f6724722b3405fae98073d8969cf61046cdd5e7ac1fdad28a7b1b09a5b6bc0315205bae0bb658b0b01cdcba9b8b0e444d5821e028017ce7d5c768b8cc
 EBUILD systemsettings-5.11.5.ebuild 1288 BLAKE2B e56737a2453b4e2c843548f0947c6ad08725370a46d998ddd693d2dd3f3685da8e67d7a2adee338838a830619ed3a1072eddb2bacfc0a2f1a224d53f8c8bd64c SHA512 615bfc896f684fd6977bc495b6a92d386d6191e0a21dfc8df4745a311c4b7e24b776b7ea43e14ad0799836a76b529d9462b113cec36cbedf63560852e91c23e1
-EBUILD systemsettings-5.12.3.ebuild 1320 BLAKE2B c27960f4875d3eb0d3853313171fb17f2711fa5a9de21e4872f1a6b7868542efa3aadcee68809b4ddb00fefbb3fc4fdce698c1165dcaee7af2301da9e0488136 SHA512 f50342ab1da34e8a9f67c7cb415bd94912cd6bdbf19aa9bd4a62df34b6feed73bb3c43ecd453f1e0da5cdb7cde64a5c7afe3902ea7b9b10ff7d4bd69daa12a0c
+EBUILD systemsettings-5.12.4.ebuild 1320 BLAKE2B c27960f4875d3eb0d3853313171fb17f2711fa5a9de21e4872f1a6b7868542efa3aadcee68809b4ddb00fefbb3fc4fdce698c1165dcaee7af2301da9e0488136 SHA512 f50342ab1da34e8a9f67c7cb415bd94912cd6bdbf19aa9bd4a62df34b6feed73bb3c43ecd453f1e0da5cdb7cde64a5c7afe3902ea7b9b10ff7d4bd69daa12a0c
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.12.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.12.3.ebuild
deleted file mode 100644
index d1c4f56be8df..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.12.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="System settings utility"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="classic gtk"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/systemsettings:4
-	$(add_frameworks_dep kirigami)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.12.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.12.4.ebuild
new file mode 100644
index 000000000000..d1c4f56be8df
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.12.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="classic gtk"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	classic? ( $(add_frameworks_dep khtml) )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/systemsettings:4
+	$(add_frameworks_dep kirigami)
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package classic KF5KHtml)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 05b33c6d19e2..67185c2631cf 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.11.5.tar.xz 548208 BLAKE2B 92bd23929537bf3a5d6bfc73d04c0aec40029188acfce0859ecf0feb476695c3bcc8ff3b1dd71eed4b7592482e18e8661f54d6f8591da5cd63d9d472d37486c3 SHA512 9c4ae28282bc1ccfc1cc0c817fc89c80185e0e9d756186d920d91d177492de1bf3420cab93e823658614c9e637c8cfeadfde8c093f50097331371efea763cdc6
-DIST user-manager-5.12.3.tar.xz 544848 BLAKE2B dddbcdcd6554a65b437cc7e2635410de0c62a0b954ec7a43b8554493ed9e6ac4f4704d89a5b566b49783b97e8514e3b0e365e3457ed9752a09399e96de90022b SHA512 5515ef468f45f6f1083f99bed83a21bfae67d588512bb7ac197a9840e2c06c75f8350cfcc95d3b909cbee35e0f528de64fb7c76e5dd2de7adf8d173d11d46624
+DIST user-manager-5.12.4.tar.xz 544660 BLAKE2B 9e18a1e42d5ede5f1349f234bf566aa72cbc913a62ce97788e0c8a0a8c6906ea315f2c3425f1ae275dfd722a03cd82972d08f98c38cd227e5e2809178fc582b2 SHA512 671e9fcaf81473344efbec240c5bdefb7262f3b1886df071f66da1a7d70afffe7bcbfb7507b0da9225dcf4624027f3c6064b7f5e41c904025c2539e73ac7beb4
 EBUILD user-manager-5.11.5.ebuild 668 BLAKE2B 65c027257ba173b05b2ca0161f372c1a478fd84a7301bcef018be3ed2a2d12051920469e94132a6927c6d2217e007c4419e04de61902d66a402cddbcaa884eed SHA512 964458719bf604ca0c37e411a913addfca197bff4a9ef3163ad680cdd308750a349ecfe3c2df4ff1088e2cdbaf9546be31942d1590f8bdc4f3deda991439baa4
-EBUILD user-manager-5.12.3.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
+EBUILD user-manager-5.12.4.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.12.3.ebuild b/kde-plasma/user-manager/user-manager-5.12.3.ebuild
deleted file mode 100644
index 55c31690044b..000000000000
--- a/kde-plasma/user-manager/user-manager-5.12.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/user-manager/user-manager-5.12.4.ebuild b/kde-plasma/user-manager/user-manager-5.12.4.ebuild
new file mode 100644
index 000000000000..55c31690044b
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.12.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}"
-- 
cgit v1.2.3