kde-base/kdelibs: Fix EAPI 6 bump

Package-Manager: portage-2.2.28

9 files changed, 19 insertions, 19 deletions

diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
index 228914fbb82..c12c2aba9ae 100644
--- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
+++ b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
@@ -3,8 +3,8 @@ KDE4 applications outside of KDE4 environment.
 
 Index: kded/vfolder_menu.cpp
 ===================================================================
---- kded/vfolder_menu.cpp	(revision 1014368)
-+++ kded/vfolder_menu.cpp	(working copy)
+--- a/kded/vfolder_menu.cpp	(revision 1014368)
++++ b/kded/vfolder_menu.cpp	(working copy)
 @@ -770,7 +770,9 @@
     QString result;
  
diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
index 3049b0a7a28..074847ae995 100644
--- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
+++ b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
@@ -5,8 +5,8 @@ Set up XDG_CONFIG_DIRS lookup in order:
 
 Index: kdecore/kernel/kstandarddirs.cpp
 ===================================================================
---- kdecore/kernel/kstandarddirs.cpp	(revision 1014759)
-+++ kdecore/kernel/kstandarddirs.cpp	(working copy)
+--- 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)));
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
index 7de5ec960ea..63e9b308838 100644
--- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
@@ -1,8 +1,8 @@
 udisks1 is deprecated and going away, so removing this clause
 will permit us to build without udisks at all.
 
---- solid/solid/CMakeLists.txt
-+++ solid/solid/CMakeLists.txt
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
 @@ -283,20 +283,6 @@
             backends/udisks2/udisksgenericinterface.cpp
             backends/udisks2/dbus/manager.cpp
@@ -24,8 +24,8 @@ will permit us to build without udisks at all.
         endif ( WITH_SOLID_UDISKS2 )
     endif (CMAKE_SYSTEM_NAME MATCHES Linux)
 
---- solid/solid/managerbase.cpp
-+++ solid/solid/managerbase.cpp
+--- a/solid/solid/managerbase.cpp
++++ b/solid/solid/managerbase.cpp
 @@ -33,8 +33,6 @@
  #include "backends/hal/halmanager.h"
  #if defined (WITH_SOLID_UDISKS2)
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
index 4d413b73b62..dcd27a5762c 100644
--- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
@@ -10,8 +10,8 @@ Once qmake is found, it is queried for the correct location of all other items.
 
 Gentoo-bug: 562746
 
---- cmake/modules/FindQt4.cmake
-+++ cmake/modules/FindQt4.cmake
+--- 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
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
index 78c1ac77dcb..3f571d63a03 100644
--- a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
@@ -1,8 +1,8 @@
 Avoid build failure due to harmless warnings on some platforms (eg. ARM) being
 forced fatal.
 
---- cmake/modules/FindKDE4Internal.cmake
-+++ cmake/modules/FindKDE4Internal.cmake
+--- 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")
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
index dc8f87e678e..38cac84f620 100644
--- a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
@@ -4,8 +4,8 @@ The offending MIME types are commented out rather than
 physically removed because doing so would cause the patch
 to be too large.
 
---- mimetypes/kde.xml
-+++ mimetypes/kde.xml
+--- a/mimetypes/kde.xml
++++ b/mimetypes/kde.xml
 @@ -1784,7 +1784,8 @@
      <glob pattern="*.abc"/>
    </mime-type>
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
index 22e6279e63a..006ca00a458 100644
--- a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
@@ -1,6 +1,6 @@
 diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp
---- kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:05:26.284881642 -0500
-+++ kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:11:23.393094384 -0500
+--- a/kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:05:26.284881642 -0500
++++ b/kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:11:23.393094384 -0500
 @@ -68,7 +68,7 @@ namespace KKeyServer {
  #ifdef QT_MAC_USE_COCOA
      static TISInputSourceRef lastLayout = 0;
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch
index 6ec0b7d9a3e..b094d12f722 100644
--- a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch
@@ -1,5 +1,5 @@
---- cmake/modules/FindKDE4Internal.cmake
-+++ cmake/modules/FindKDE4Internal.cmake
+--- 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")
diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild
index 205aabbd53d..adf4ac5fb6b 100644
--- a/kde-base/kdelibs/kdelibs-4.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild
@@ -212,7 +212,7 @@ src_configure() {
 		-DWITH_ENCHANT=$(usex spell)
 		-DWITH_OpenSSL=$(usex ssl)
 		-DWITH_UDev=$(usex udev)
-		-DWITH_SOLID_UDISKS2=$(usex udisks2)
+		-DWITH_SOLID_UDISKS2=$(usex udisks)
 		-DWITH_Avahi=$(usex zeroconf)
 	)