gentoo resync : 30.06.2018

24 files changed, 4 insertions, 854 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index fcde162bd402..712a81862077 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdelibs-env/Manifest b/kde-frameworks/kdelibs-env/Manifest
deleted file mode 100644
index 1b4a5a25dd21..000000000000
--- a/kde-frameworks/kdelibs-env/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD kdelibs-env-4.14.3.ebuild 761 BLAKE2B 0e3bc45d100d01715d81a71f98c45cb707ce765b9b4ba8533b77f6e1cde667ab46f02ab34a205190607c7c8417cd4e25ffe384b4bbb29baebea71197dd542e3c SHA512 bdd4ccdc0c5a461db72be59301adfb8a2c2bb7aaef30f52d034dd32765045708939d2819e105f6a03f4eba7520d6b4bfc429c94744944d514c9f50fa53a8760e
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild b/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild
deleted file mode 100644
index a6ebe5e9b499..000000000000
--- a/kde-frameworks/kdelibs-env/kdelibs-env-4.14.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
-
-DESCRIPTION="Environment setting required for all KDELibs4 apps to run"
-HOMEPAGE="https://www.kde.org/"
-SRC_URI=""
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="4/4.14"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	# number goes down with version
-	newenvd - 43kdepaths <<EOF
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-EOF
-
-	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe - 11-xdg-menu-kde-4 <<EOF
-#!/bin/sh
-
-if [ -z "\${XDG_MENU_PREFIX}" ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
-	export XDG_MENU_PREFIX="kde-4-"
-fi
-EOF
-}
diff --git a/kde-frameworks/kdelibs-env/metadata.xml b/kde-frameworks/kdelibs-env/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-frameworks/kdelibs-env/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
deleted file mode 100644
index 4b4c5d14b22a..000000000000
--- a/kde-frameworks/kdelibs/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 596 BLAKE2B 213e8af15e819f1534bbb9adca211d3c2e85cc6f200db93972ab1196b1ca62bad7c95618cccfbc1a56cc29853439caa6cefb264056881d0ee11340202fade009 SHA512 f97b9562f120994d52c86f144035c43d2545cc502e590a2e2790e9650ad5bd3d1c02c35a1e27ea8e9e32d22cd78003265b025b7db131947872e384a04bba0438
-AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1045 BLAKE2B 0808a42fbfed36ed7cf88e9e3699616f6a7982bd3e4153328205e1fbca21218a3b2d93d8298a9c3c18ce725df9dcb249a3a23d3f3464cbfc48d9bbae9fe7d17f SHA512 f4237a5af5f017cf5b7e641747dacbe8d98ab4f017543d31b80936b913e1dac6352f044d9d76cfd35d6b5a77737730a038d41936c0ff87b8b81f00daab03bb35
-AUX kdelibs-4.10.0-udisks.patch 2020 BLAKE2B d671b233e9403a4c89fb053d547ecd1e429e1ab7382426ff4b5ab4a958b1d8b445cb52bde1994f4ab8f0d1385cfc30d310786bd9c3925cfae57b43e7b5d0132e SHA512 079de24110cb9869270bf5724ba94f4c414aa30503b8d2528ba921d8379d1e8644219b6f333e5538d7e07f18f65a59cf1057d7d8e51950ebb239d7408f603415
-AUX kdelibs-4.14.20-FindQt4.patch 1447 BLAKE2B d9075d1b6df03ce008943d7f179e015c52b02af53435ebf42d36a16206226fff4aba20831659c9798927dac6680d45de55e3628c34b8021851d0820fe17afcc6 SHA512 79f26148bf017932f49fc7b45292c74400d7d3ed722536cb156c9ac6d235ca7f98bb47ef02d654bd6622d7fdf1a089aa57653ceffa0a63890f28b3d3b8f1f3d6
-AUX kdelibs-4.14.22-webkit.patch 2646 BLAKE2B 14347c3fc3d43eb6455b8ba6f46693d564742f469d360c678d841f3201c293b9a6f470ae6a6c779f9706581e1937367b0ba6f38a2e47058952d88cdc948a42dc SHA512 1c5ba03291650591162e4a2410c496561223c70a21828f54004f07d0a0971bb171ad36fd4c25cb3898d31ff04ced559612521fded116c0abdafd40c5745d5cd1
-AUX kdelibs-4.14.35-3dnow.patch 682 BLAKE2B d6646c104bb7f3760c39aadefd8711317b496d7055a80c007fbf0bf197cf9c6f80447e40eb424342720b2a079f205161573f36f6061abd9b3a0002292bca3c5c SHA512 b57635859925fe948d36a1115b321ca227083962353590ab9d46d245128a4a5a8fabb360a412ad239d2706fe18652f722249865cfa0abc1d3b84ed95e38804e9
-AUX kdelibs-4.14.35-kde3support.patch 3153 BLAKE2B 483afaa0ad8cf2ddc03260b621f69358b82bf790ac1db16ec64d325565b4790afc512d5f87d91fea37bc9b8220a3e7058a456e7e58e7b2b877482246a1713fb8 SHA512 e50137d57743b89010a9487d0e99617f5d1097d80e81278713c74eaf40cde78e42358f404eefccb47f7b29e1e6e357afdbc0cab28f7c4db855a00220d925e105
-AUX kdelibs-4.14.35-plasma4.patch 1926 BLAKE2B b65fc5627bda391f0b60b0144e1ebfd7fb03b14c9753027676205b54e67d239f2ee06ff37e4d3ca52dba924ca9e6f0659d47da547622fe2e1ee27deee4142c8e SHA512 3150a6a9821c52c5b131ffdf84d32754c60e83762a6df938f8d6d8afd3182303d0919e91651f6cf0b15c996f2762c02c0124e7bd086582a9874fbf7e69fadfcc
-AUX kdelibs-4.14.5-fatalwarnings.patch 1070 BLAKE2B 4be7ef58a8e5b87e35eb749a9cd3f9136991f5d6409f09ce2919bf498c5dced456517e5d9a4af7c1300d8c34d0cc2984d61d5d7ef0d39b7b48f84aaa9f7533cd SHA512 69767a980db082bf51ae42948d9703efe22b28f6a0e20a84c4d297a34c018669194e120fa5494dfedf34cc075931bbebc528818b58b1ce45525733768e5d1ec9
-AUX kdelibs-4.14.5-mimetypes.patch 805 BLAKE2B 5a8d9f7d36e1d68b43ffdd7be71a4951ebc1be38158dd489e839563971bd4576dcb2a1cbeccbd9e783a898c169f9ef43ce26bcfedd33b3630956ec67bfe4792b SHA512 8037e935de6239ef3a32f540f82bdf00cba99e89a72c4756d703d4dceba088a4af5b7bd6955bb68e430ed040d4abad629caff27a2f4bbe5f140e7cd36b07e28e
-AUX kdelibs-4.4.90-xslt.patch 553 BLAKE2B e692ecbd4126c3e7c1183b192e092a128e549da88836de91e967eac42e3e5d2bdf8d5b7620d01e8245674aacbcde4998b88ef0cf27b2158a11903682eabdfce6 SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea
-AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 BLAKE2B 19df42a9b0ba3f0ab1b6a5d990b481d525003746af71dbb3ad8d4f749ddf021afb4a0a1dcebc41f76dd779b344563f6e6ef222b18b1239dc647d34eb648a4671 SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1
-AUX kdelibs-4.8.1-norpath.patch 788 BLAKE2B cdf6f6cd3df45f53782d81be09ea85051e90e1a9925972b608cec1a9324c2a5d364821b2ef63076c50140f0558ffe46e1f13b7f1754c4c2e3da2c805c3c49e1a SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89
-AUX kdelibs-4.9.3-werror.patch 1525 BLAKE2B cf48f41c843ef00493c0cfe99dc97c63ff09446f8822ba17d73de40dd09561c07f6b0020d8318a3fb7df8393315b8f7bacb0f1fda158ed869701c526ccf37692 SHA512 d2df35a0330bc98745cedb0dba1733969198cb3024de8b1b70bc552b4abd0bcf42c8f17a40519189b29f4ab2d054ba7ee28436e274c8ed674c9b12620b07814f
-DIST kdelibs-4.14.37.tar.xz 11642272 BLAKE2B 6d4384b9de08c557ba2a9af856825985bc26e71ab6deb515f13ad023a5c6f74d820666f13a6b719d51aff6fa03243f8606c3bbf568d279532ab7eb79c6cd5b2f SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1
-EBUILD kdelibs-4.14.37.ebuild 8035 BLAKE2B d03f4dca49a4f9b2934a612251d30e58d99b351c76b05745f19913f48291af6137d59aea9fa20ceeeb611d0185cbd2ebcfbd3391f69b60d87dd9ae7eb2924e01 SHA512 90a703f7e3caf6b4df35fd1d79b46226fbe6a12fd30bc915c07d14bf0d683af8f7d9e3d32389bbd8a9a3eb71f6a43f586ec9ecb09ccd853053a144450f7f89ba
-MISC metadata.xml 353 BLAKE2B 3048f8a7581ac3c5f1178e2d17aba931887ea4542e529ec098af1b1f61b369d407613bfb2b4cb8ff931cf486475246c52cdaa4362ee16e8d7449695849faeb46 SHA512 6dae9e92d4f396fec1c208d028b9590cbc3b874a8c5e5968488b236e93d99fa763a87ce3ff22383721f7cbc76949c79e1e1bfe85c4ebdd7266ed986fda782587
diff --git a/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
deleted file mode 100644
index c12c2aba9aeb..000000000000
--- a/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running
-KDE4 applications outside of KDE4 environment.
-
-Index: kded/vfolder_menu.cpp
-===================================================================
---- a/kded/vfolder_menu.cpp	(revision 1014368)
-+++ b/kded/vfolder_menu.cpp	(working copy)
-@@ -770,7 +770,9 @@
-    QString result;
- 
-    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
--   if (!xdgMenuPrefix.isEmpty())
-+   if (xdgMenuPrefix.isEmpty())
-+      xdgMenuPrefix = "kde-4-";
-+
-    {
-       QFileInfo fileInfo(fileName);
- 
diff --git a/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
deleted file mode 100644
index 074847ae9953..000000000000
--- a/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Set up XDG_CONFIG_DIRS lookup in order:
-1. custom XDG_CONFIG_DIRS from env
-2. kdeprefix xdg config dirs
-3. /etc/xdg
-
-Index: kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- a/kdecore/kernel/kstandarddirs.cpp	(revision 1014759)
-+++ b/kdecore/kernel/kstandarddirs.cpp	(working copy)
-@@ -1664,16 +1664,13 @@
-     {
-         tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));
-     }
--    else
--    {
--        xdgdirList.clear();
--        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
-+
- #ifdef Q_WS_WIN
--        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
-+    xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
- #else
--        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
-+    xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
- #endif
--    }
-+    xdgdirList.append(QString::fromLatin1("/etc/xdg"));
- 
-     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-     if (!localXdgDir.isEmpty())
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch
deleted file mode 100644
index 63e9b308838b..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-udisks1 is deprecated and going away, so removing this clause
-will permit us to build without udisks at all.
-
---- a/solid/solid/CMakeLists.txt
-+++ b/solid/solid/CMakeLists.txt
-@@ -283,20 +283,6 @@
-            backends/udisks2/udisksgenericinterface.cpp
-            backends/udisks2/dbus/manager.cpp
-            )
--       else ( WITH_SOLID_UDISKS2 )
--           message(STATUS "Building Solid UDisks backend." )
--           set(solid_LIB_SRCS ${solid_LIB_SRCS}
--           backends/udisks/udisksmanager.cpp
--           backends/udisks/udisksdevice.cpp
--           backends/udisks/udisksblock.cpp
--           backends/udisks/udisksstoragevolume.cpp
--           backends/udisks/udisksdeviceinterface.cpp
--           backends/udisks/udisksopticaldisc.cpp
--           backends/udisks/udisksopticaldrive.cpp
--           backends/udisks/udisksstoragedrive.cpp
--           backends/udisks/udisksstorageaccess.cpp
--           backends/udisks/udisksgenericinterface.cpp
--          )
-        endif ( WITH_SOLID_UDISKS2 )
-    endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
---- a/solid/solid/managerbase.cpp
-+++ b/solid/solid/managerbase.cpp
-@@ -33,8 +33,6 @@
- #include "backends/hal/halmanager.h"
- #if defined (WITH_SOLID_UDISKS2)
- #include "backends/udisks2/udisksmanager.h"
--#else
--#include "backends/udisks/udisksmanager.h"
- #endif
- #include "backends/upower/upowermanager.h"
- 
-@@ -88,11 +86,9 @@
-                     m_backends << new Solid::Backends::UDev::UDevManager(0);
- #               endif
- #		if defined(WITH_SOLID_UDISKS2)
--                m_backends << new Solid::Backends::UDisks2::Manager(0)
--#		else
--                m_backends << new Solid::Backends::UDisks::UDisksManager(0)
-+                m_backends << new Solid::Backends::UDisks2::Manager(0);
- #		endif
--                           << new Solid::Backends::UPower::UPowerManager(0)
-+                m_backends << new Solid::Backends::UPower::UPowerManager(0)
-                            << new Solid::Backends::Fstab::FstabManager(0);
-             }
- #        endif
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
deleted file mode 100644
index 2325fb11c693..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
-Gentoo-bug: 562746
-Gentoo-bug: 583506
-
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
-+if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+  find_program(QT_QMAKE_EXECUTABLE NAMES qmake
-+    PATHS
-+      $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
-+      $ENV{EPREFIX}/usr/bin
-+      NO_DEFAULT_PATH
-+    DOC "The qmake executable for the Qt installation to use"
-+  )
-+else()
- FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-   $ENV{QTDIR}/bin
-   DOC "The qmake executable for the Qt installation to use"
- )
-+endif()
- 
- IF (QT_QMAKE_EXECUTABLE)
- 
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch
deleted file mode 100644
index dcbb565cedc6..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/CMakeLists.txt	2016-07-06 12:18:35.000000000 +0200
-+++ b/CMakeLists.txt	2016-07-21 21:40:26.080328514 +0200
-@@ -45,6 +45,9 @@
- ############### Give the user the option to build the deprecated WMI solid backend instead of the new win backend ###############
- option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows")
- 
-+############### Give the user the option to build without qtwebkit dependency  ###############
-+option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "ON")
-+
- ############### Load the CTest options ###############
- # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
- # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
-@@ -363,7 +366,9 @@
- add_subdirectory( plasma )
- endif(NOT WINCE)
- add_subdirectory( kunitconversion )
-+if(WITH_KDEWEBKIT)
- add_subdirectory( kdewebkit )
-+endif(WITH_KDEWEBKIT)
- add_subdirectory( includes )
- 
- add_subdirectory( experimental )
---- a/kdewidgets/CMakeLists.txt	2016-07-06 12:18:35.000000000 +0200
-+++ b/kdewidgets/CMakeLists.txt	2016-07-21 21:39:54.031052674 +0200
-@@ -90,6 +90,7 @@
- 
- 
-   # kdewebkit widgets
-+  if(WITH_KDEWEBKIT)
-   include_directories(
-     ${CMAKE_SOURCE_DIR}/kdewebkit
-   )
-@@ -121,7 +122,7 @@
-   endif(NOT WIN32)
- 
-   install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
--
-+  endif(WITH_KDEWEBKIT)
- 
-   if (QT_QT3SUPPORT_FOUND)
- 
---- a/plasma/CMakeLists.txt	2016-07-22 01:26:52.992198945 +0200
-+++ b/plasma/CMakeLists.txt	2016-07-22 01:28:10.487904045 +0200
-@@ -10,6 +10,10 @@
-     set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
- endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
- 
-+if(NOT WITH_KDEWEBKIT)
-+    set(PLASMA_NO_KDEWEBKIT TRUE)
-+endif(NOT WITH_KDEWEBKIT)
-+
- set(PLASMA_NO_PACKAGEKIT TRUE)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-@@ -121,7 +125,6 @@
-     framesvg.cpp
-     plasma.cpp
-     popupapplet.cpp
--    private/animablegraphicswebview.cpp
-     private/applethandle.cpp
-     private/associatedapplicationmanager.cpp
-     private/componentinstaller.cpp
-@@ -211,7 +214,6 @@
-     widgets/textbrowser.cpp
-     widgets/treeview.cpp
-     widgets/textedit.cpp
--    widgets/webview.cpp
- 
-     #Temporary QtJolie branch
-     private/qtjolie-branch/qtjolie/abstractadaptor.cpp
-@@ -245,6 +247,14 @@
-     )
- endif(NOT KDE_NO_DEPRECATED)
- 
-+if(NOT PLASMA_NO_KDEWEBKIT)
-+    set(plasma_LIB_SRCS
-+        ${plasma_LIB_SRCS}
-+        private/animablegraphicswebview.cpp
-+        widgets/webview.cpp
-+    )
-+endif(NOT PLASMA_NO_KDEWEBKIT)
-+
- kde4_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc)
- 
- kde4_add_ui_files(plasma_LIB_SRCS
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch
deleted file mode 100644
index 41a7aa874162..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-3dnow.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit f96d12c9dbc59be09a7f8e29ced43f681e6f3dce
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Jul 23 01:18:26 2017 +0200
-
-    Add missing HAVE_X86_3DNOW cmakedefine
-
-diff --git a/solid/solid/config-processor.h.cmake b/solid/solid/config-processor.h.cmake
-index f7c3d2b4bc..51ac8e18f5 100644
---- a/solid/solid/config-processor.h.cmake
-+++ b/solid/solid/config-processor.h.cmake
-@@ -10,5 +10,7 @@
- #cmakedefine HAVE_X86_SSE2
- 
- /* Defined to 1 if the assembler supports AltiVec instructions. */
--#cmakedefine HAVE_PPC_ALTIVEC  
-+#cmakedefine HAVE_PPC_ALTIVEC
- 
-+/* Defined to 1 if the assembler supports 3DNOW instructions. */
-+#cmakedefine HAVE_X86_3DNOW
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch
deleted file mode 100644
index 956b01c80d29..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-kde3support.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-commit 8c1dbc358be1f66ba6cf2bcd574aa3739affec57
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Thu Feb 16 19:41:52 2017 +0100
-
-    Make kde3support and Qt3Support optional (default on)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 463919b669..d7caade3cf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,6 +48,9 @@ option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows")
- ############### Give the user the option to build without qtwebkit dependency  ###############
- option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "ON")
- 
-+############### Give the user the option to build without qt3support dependency ###############
-+option(WITH_KDE3SUPPORT "Enables the deprecated kde3support" "ON")
-+
- ############### Load the CTest options ###############
- # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
- # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
-@@ -324,9 +327,9 @@ endif(NOT WINCE)
- add_subdirectory( kio )
- add_subdirectory( solid )
- add_subdirectory( kded       )
--if (QT_QT3SUPPORT_FOUND)
-+if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
-    add_subdirectory( kde3support  )
--endif (QT_QT3SUPPORT_FOUND)
-+endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
- add_subdirectory( kfile )
- add_subdirectory( kconf_update )
- if(NOT WINCE)
-diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
-index cdf014320e..a303647c76 100644
---- a/includes/CMakeLists.txt
-+++ b/includes/CMakeLists.txt
-@@ -1,4 +1,4 @@
--if (QT_QT3SUPPORT_FOUND)
-+if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
- install( FILES
-   K3BookmarkDrag
-   K3ButtonBox
-@@ -50,7 +50,7 @@ install( FILES
-   K3NamedCommand
-   K3RFCDate
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
--endif (QT_QT3SUPPORT_FOUND)
-+endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
- 
- install( FILES
-   KACL
-@@ -515,14 +515,14 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
- endif(NOT KDE_NO_DEPRECATED)
- 
- if (UNIX)
--   if (QT_QT3SUPPORT_FOUND)
-+   if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
-       install( FILES
-         K3ProcIO
-         K3Process
-         K3ProcessController
-         K3ShellProcess
-       DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
--   endif (QT_QT3SUPPORT_FOUND)
-+   endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
- 
-    install( FILES
-      KDEsuClient
-diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
-index ecb6b69a5e..62db88b7c4 100644
---- a/kdewidgets/CMakeLists.txt
-+++ b/kdewidgets/CMakeLists.txt
-@@ -124,7 +124,7 @@ if(QT_QTDESIGNER_FOUND)
-   install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-   endif(WITH_KDEWEBKIT)
- 
--  if (QT_QT3SUPPORT_FOUND)
-+  if (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
- 
-      include_directories(
-        ${CMAKE_SOURCE_DIR}/kde3support
-@@ -158,7 +158,7 @@ if(QT_QTDESIGNER_FOUND)
-      endif(NOT WIN32)
- 
-      install(TARGETS kde3supportwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
--  endif (QT_QT3SUPPORT_FOUND)
-+  endif (WITH_KDE3SUPPORT AND QT_QT3SUPPORT_FOUND)
- endif (QT_QTDESIGNER_FOUND)
- 
- ########### install files ###############
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch
deleted file mode 100644
index 977c1a5e5df8..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-plasma4.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit 8a9ec27390a9df359343d1d3537b52e16f680c25
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Jul 23 01:02:08 2017 +0200
-
-    Make Plasma-4 support optional (default on)
-    
-    This adds a new option WITH_PLASMA4SUPPORT.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d7caade3cf..8e7759ef0d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,6 +51,9 @@ option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "
- ############### Give the user the option to build without qt3support dependency ###############
- option(WITH_KDE3SUPPORT "Enables the deprecated kde3support" "ON")
- 
-+############### Give the user the option to build without Plasma-4 support ###############
-+option(WITH_PLASMA4SUPPORT "Enables the deprecated Plasma-4 Workspace support" "ON")
-+
- ############### Load the CTest options ###############
- # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
- # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
-@@ -358,9 +361,9 @@ endif(NOT WINCE)
- add_subdirectory( dnssd )
- add_subdirectory( kross )
- add_subdirectory( security )
--if(NOT WINCE)
-+if(NOT WINCE AND WITH_PLASMA4SUPPORT)
- add_subdirectory( plasma )
--endif(NOT WINCE)
-+endif(NOT WINCE AND WITH_PLASMA4SUPPORT)
- add_subdirectory( kunitconversion )
- if(WITH_KDEWEBKIT)
- add_subdirectory( kdewebkit )
-diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
-index cdf014320e..44f3fdd6e2 100644
---- a/includes/CMakeLists.txt
-+++ b/includes/CMakeLists.txt
-@@ -1051,6 +1051,7 @@ install(FILES
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Nepomuk/Vocabulary COMPONENT Devel)
- 
- 
-+if(WITH_PLASMA4SUPPORT)
- install(FILES
-   Plasma/AbstractDialogManager
-   Plasma/AbstractRunner
-@@ -1145,6 +1146,7 @@ install( FILES
-   Plasma/AnimationDriver
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel)
- endif(NOT KDE_NO_DEPRECATED)
-+endif(WITH_PLASMA4SUPPORT)
- 
- 
- install(FILES
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
deleted file mode 100644
index 3f571d63a03d..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid build failure due to harmless warnings on some platforms (eg. ARM) being
-forced fatal.
-
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1100,8 +1100,8 @@
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-    if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-       set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
--      set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
--      set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-+      set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-+      set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
- 
-       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
-       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
deleted file mode 100644
index 38cac84f6201..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Remove fake MIME types that cause warnings.
-
-The offending MIME types are commented out rather than
-physically removed because doing so would cause the patch
-to be too large.
-
---- a/mimetypes/kde.xml
-+++ b/mimetypes/kde.xml
-@@ -1784,7 +1784,8 @@
-     <glob pattern="*.abc"/>
-   </mime-type>
- 
--  <!-- all/ fake mime types -->
-+  <!-- 
-+  all/ fake mime types
-   <mime-type type="all/all">
-     <comment>all files and folders</comment>
-     <comment xml:lang="ar">كل الملفات و المجلدات</comment>
-@@ -1901,7 +1902,7 @@
-     <comment xml:lang="zh_CN">全部文件</comment>
-     <comment xml:lang="zh_TW">所有檔案</comment>
-   </mime-type>
--
-+  -->
-   <mime-type type="application/vnd.kde.fontspackage">
-     <sub-class-of type="application/zip"/>
-     <comment>fonts package</comment>
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch
deleted file mode 100644
index 0d25ada337b0..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl
---- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl	2008-05-21 13:07:13.000000000 +0200
-+++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl	2010-07-08 23:32:28.184204481 +0200
-@@ -35,7 +35,7 @@
-   </entry>
- </xsl:template>
- 
--<xsl:template match="sect*/title|emphasis">
-+<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis">
-   <entry header="2">
-     <xsl:apply-templates/>
-   </entry>
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
deleted file mode 100644
index 4b34f62c2be4..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt
---- kdelibs-4.6.3.old/kinit/CMakeLists.txt	2011-05-02 00:19:10.000000000 +0200
-+++ kdelibs-4.6.3/kinit/CMakeLists.txt	2011-05-02 00:20:32.000000000 +0200
-@@ -170,15 +170,6 @@
-   install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR})
- endif (NOT WIN32)
- 
--if (CMAKE_SYSTEM_NAME MATCHES Linux)
--    MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
--    set(KDEINIT_OOM_PROTECT 1)
--    install(CODE "
--        set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\")
--        EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\")
--    ")
--endif (CMAKE_SYSTEM_NAME MATCHES Linux)
--
- ########### install files ###############
- 
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch
deleted file mode 100644
index 83d5576ac023..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake	2012-02-29 22:55:52.000000000 +0100
-+++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake	2012-03-24 17:18:59.452942648 +0100
-@@ -1045,7 +1045,13 @@
- 
-       set(CMAKE_SKIP_BUILD_RPATH FALSE)
-       set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
-+      # the RPATH to be used when installing
-+      SET(CMAKE_INSTALL_RPATH "")
-+
-+      # don't add the automatically determined parts of the RPATH
-+      # which point to directories outside the build tree to the install RPATH
-+      SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-    endif (APPLE)
- endif (UNIX)
- 
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch
deleted file mode 100644
index b094d12f7227..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1204,7 +1204,7 @@
-    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
-    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
- 
--   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-+   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-    # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
- 
-@@ -1295,7 +1295,7 @@
-       endif(NOT _compile_result)
- 
-       if (GCC_IS_NEWER_THAN_4_2)
--         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden")
-+         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-       endif (GCC_IS_NEWER_THAN_4_2)
-    else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32)
-       set (__KDE_HAVE_GCC_VISIBILITY 0)
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
deleted file mode 100644
index ce48c2e3f5c4..000000000000
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-QT_MINIMAL="4.8.7"
-inherit cmake-utils toolchain-funcs flag-o-matic gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Libraries needed for programs by KDE"
-HOMEPAGE="https://www.kde.org/"
-SRC_URI="mirror://kde/stable/applications/17.08.2/src/${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-SLOT="4/4.14"
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam +handbook jpeg2k kerberos
-libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support
-spell test cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-lang/perl
-	>=dev-libs/libattica-0.4.2
-	dev-libs/libdbusmenu-qt[qt4]
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/designer-${QT_MINIMAL}:4
-	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?,ssl]
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	>=dev-qt/qtdeclarative-${QT_MINIMAL}:4
-	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
-	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt4]
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-misc/shared-mime-info
-	!kernel_SunOS? ( || (
-		sys-libs/libutempter
-		>=sys-freebsd/freebsd-lib-9.0
-	) )
-	acl? ( virtual/acl )
-	bzip2? ( app-arch/bzip2 )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper:= )
-	kerberos? ( virtual/krb5 )
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	plasma? (
-		app-crypt/qca:2[qt4]
-		>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?]
-	)
-	policykit? ( sys-auth/polkit-qt[qt4] )
-	spell? ( app-text/enchant:= )
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	>=dev-qt/qttest-${QT_MINIMAL}:4
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	kde-frameworks/kdelibs-env:4
-	kde-frameworks/oxygen-icons
-	sys-apps/dbus[X]
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-misc/xdg-utils
-	plasma? ( !sci-libs/plasma )
-	udev? ( app-misc/media-player-info )
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( >=sys-power/upower-0.9.23 )
-"
-PDEPEND="
-	dev-util/automoc
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	>=x11-libs/libXtst-1.1.0
-	x11-misc/xdg-utils
-	handbook? ( kde-apps/khelpcenter:* )
-	policykit? ( kde-plasma/polkit-kde-agent )
-"
-
-DOCS=( AUTHORS README{,-WIN32.TXT} TODO )
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
-	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
-	"${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
-	"${FILESDIR}/${PN}-4.14.22-webkit.patch"
-	"${FILESDIR}/${PN}-4.14.35-3dnow.patch"
-	"${FILESDIR}/${PN}-4.14.35-kde3support.patch"
-	"${FILESDIR}/${PN}-4.14.35-plasma4.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
-		plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
-		|| die "failed to sed out QT_QTOPENGL_FOUND"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKDE_DISTRIBUTION_TEXT=Gentoo
-		-DKDE4_BUILD_TESTS=OFF
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DWITH_Soprano=OFF
-		-DWITH_SharedDesktopOntologies=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
-		-DBUILD_doc=$(usex handbook)
-		-DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DHAVE_PPC_ALTIVEC=$(usex altivec)
-		-DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx)
-		-DHAVE_X86_SSE=$(usex cpu_flags_x86_sse)
-		-DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2)
-		-DWITH_ACL=$(usex acl)
-		-DWITH_BZip2=$(usex bzip2)
-		-DWITH_FAM=$(usex fam)
-		-DWITH_Jasper=$(usex jpeg2k)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_LibLZMA=$(usex lzma)
-		-DWITH_Libintl=$(usex nls)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_PLASMA4SUPPORT=$(usex plasma)
-		-DWITH_QCA2=$(usex plasma)
-		-DWITH_PolkitQt-1=$(usex policykit)
-		-DWITH_KDE3SUPPORT=$(usex qt3support)
-		-DWITH_ENCHANT=$(usex spell)
-		-DWITH_OpenSSL=$(usex ssl)
-		-DWITH_UDev=$(usex udev)
-		-DWITH_SOLID_UDISKS2=$(usex udisks)
-		-DWITH_KDEWEBKIT=OFF
-		-DWITH_Avahi=$(usex zeroconf)
-	)
-
-	use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
-
-	if use debug; then
-		# Set "real" debug mode
-		CMAKE_KDE_BUILD_TYPE="Debugfull"
-	else
-		# Handle common release builds
-		append-cppflags -DQT_NO_DEBUG
-	fi
-
-	tc-is-cross-compiler || cmakeargs+=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" )
-	#qmake -query QT_INSTALL_LIBS unavailable when cross-compiling
-	tc-is-cross-compiler && cmakeargs+=( -DQT_LIBRARY_DIR="${ROOT}"/usr/$(get_libdir)/qt4 )
-	#kde-config -path data unavailable when cross-compiling
-	tc-is-cross-compiler && cmakeargs+=( -DKDE4_DATA_DIR="${ROOT}"/usr/share/apps/ )
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	for doc in "${S}"/*/{AUTHORS,ChangeLog*,README*,TODO}; do
-		[[ -f ${doc} && -s ${doc} ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
-	done
-
-	cmake-utils_src_install
-
-	# We don't want /usr/share/doc/HTML to be compressed,
-	# because then khelpcenter can't find the docs
-	[[ -d ${ED}/usr/share/doc/HTML ]] &&
-		docompress -x /usr/share/doc/HTML
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym ../../../../etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dodoc -r ${P}-apidocs/*
-	fi
-
-	# We don't package it, so don't install headers
-	rm -r "${ED}"/usr/include/KDE/Nepomuk || die
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use zeroconf; then
-		elog
-		elog "To make zeroconf support available in applications make sure that the avahi daemon"
-		elog "is running."
-		elog
-		elog "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		elog "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		elog "to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml
deleted file mode 100644
index ed16b85b6d74..000000000000
--- a/kde-frameworks/kdelibs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="qt3support">Enable kde3support/qt3support for very old applications</flag>
-	</use>
-</pkgmetadata>
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index c3dc3c142948..ccd53b2672e2 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.46.0.tar.xz 316028 BLAKE2B 89673cce2423d98e9c7d80dbee487aa001de65ef32b984f0394b442f2dcb4ab84ad5e58df76affe47f4dbec6ef165a148d67cc66461e894bea648d4345e15c9b SHA512 06adddbe7db2c734707ba2d121b3fd9f5fb36a9fe38c9af926d051efb52158f7b970eebc06b1f23c8ff7af936a8f8c210b1beb5e384207a29915e872d4a2de8b
 DIST kirigami2-5.47.0.tar.xz 317692 BLAKE2B 5daafd0627cd41cd19e969c3c45e0426eaf27206ba49119dc3ff6acf80333e2558d4cbd8bee51829054abad2a21c1723b6d3ec1b6458326fe513e44c492ab5e5 SHA512 9c870ae2bfba2b7281eb054e834298c5f1be817156298b0908f526a0ce60773f8bf66b445b0b2d3631c05ed87be961cbf9abaa51a83d8bd9773d38f2bf374881
-EBUILD kirigami-5.46.0.ebuild 911 BLAKE2B b1eb7a73b575a378799a8d056c56df67d2affc39db38ec5039888b2f8c13b80601e04b7f67a695d2851139679603a75546dbdc9b2e4aa5ae0832fa89103ac8b2 SHA512 d5a78c529b31be0c47465e7af5c4b13b2247b64577ec05bf34d9f61739aa9a9366d638b1b2dfe92cf8e93d5c504a6e0b040971198e1c01d66d977ce521d790d7
-EBUILD kirigami-5.47.0.ebuild 913 BLAKE2B 21404f3d8a178e9e12cf4227b6b677738cbd533c018808442945c3ca73d2139f3091405fa8699cf5c68cf39a1482a7e57557296170c1fb2f05a72f106e738401 SHA512 9130f2caa10ccc8920b1596db893089c1babdb27b3bd646ce4fdf48cc27bf28038b1162702dc48ecf70ad791b46271886c495adfab5e3f027ba1d494c1353609
+EBUILD kirigami-5.46.0-r1.ebuild 933 BLAKE2B 561bd233a9e94d585c5c79f52ffc243a523736dc4b39a26731394039a32197661f9679f95ee7a76076a06247be3d5211ee4386fb55bd84cfb4b58bd54e256f48 SHA512 e937f977fae02bf5091b7760251cb136a05fce439d2149653a533995b46df96707f3c893521f08c667645ae39ae299b1ae5f72f7fa1a26332adfe332c3b911c1
+EBUILD kirigami-5.47.0-r1.ebuild 935 BLAKE2B 716ff4a224086f76f11bafb98382aa12d4a6932250291f219b05a5f849580105493208221d63cf809cef11b91a5004c9c0efd4a275f817e870527952aa441ee0 SHA512 4837cf73ffc2413af6ca663c54f692250e363de54f4a3be73b5432e5c5671d045199f116476f81718cf9a98cd66fda6456189d92bc60b403b55289799b3c6b13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.46.0.ebuild b/kde-frameworks/kirigami/kirigami-5.46.0-r1.ebuild
index 4d88e6e37472..a2de592fad5b 100644
--- a/kde-frameworks/kirigami/kirigami-5.46.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.46.0-r1.ebuild
@@ -19,6 +19,7 @@ IUSE=""
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
 RDEPEND="
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative '' '' '5=')
 	$(add_qt_dep qtgraphicaleffects)
 	$(add_qt_dep qtgui)
diff --git a/kde-frameworks/kirigami/kirigami-5.47.0.ebuild b/kde-frameworks/kirigami/kirigami-5.47.0-r1.ebuild
index b8fe3e3ed6b6..202e831c2807 100644
--- a/kde-frameworks/kirigami/kirigami-5.47.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.47.0-r1.ebuild
@@ -19,6 +19,7 @@ IUSE=""
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.10.0
 RDEPEND="
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative '' '' '5=')
 	$(add_qt_dep qtgraphicaleffects)
 	$(add_qt_dep qtgui)