[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

[Michael Palimaka]

commit:     797e8400f92c9d8d723ecce57f17871b42e4f898
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 16:14:58 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 16:14:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=797e8400

[kde-base/kdelibs] Remove unused patches. Clean metadata.

Package-Manager: portage-2.1.11.50

---
 .../files/kdelibs-4.8.95-udisks2-includes.patch    |   48 ----
 .../kdelibs/files/kdelibs-4.9.90-findkipi.patch    |  242 --------------------
 .../files/kdelibs-4.9.95-findsomething.patch       |  242 --------------------
 kde-base/kdelibs/metadata.xml                      |    2 -
 4 files changed, 0 insertions(+), 534 deletions(-)

diff --git a/kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch b/kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch
deleted file mode 100644
index d8ece11..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.95-udisks2-includes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.cpp kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.cpp
---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.cpp	2012-06-28 00:14:38.443073422 +0200
-+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.cpp	2012-06-28 00:18:20.459086056 +0200
-@@ -27,7 +27,7 @@
- #include <QtCore/QFile>
- #include <QtDBus/QDBusConnection>
- 
--#include "../shared/udevqtclient.h"
-+#include "../shared/udevqt.h"
- 
- #include "udisks2.h"
- #include "udisksopticaldisc.h"
-diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.h kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.h
---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksopticaldisc.h	2012-06-28 00:14:38.444073422 +0200
-+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksopticaldisc.h	2012-06-28 00:15:14.569076596 +0200
-@@ -24,7 +24,7 @@
- 
- #include <solid/ifaces/opticaldisc.h>
- 
--#include "../shared/udevqtdevice.h"
-+#include "../shared/udevqt.h"
- 
- #include "udisksstoragevolume.h"
- #include "udisksdevice.h"
-diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.cpp kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.cpp
---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.cpp	2012-06-28 00:14:38.445073422 +0200
-+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.cpp	2012-06-28 00:18:02.424084839 +0200
-@@ -21,7 +21,7 @@
- 
- #include "udisksstoragedrive.h"
- 
--#include "../shared/udevqtclient.h"
-+#include "../shared/udevqt.h"
- 
- #include <QtCore/QDebug>
- #include <QtCore/QFile>
-diff -ruN kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.h kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.h
---- kdelibs-4.8.95.orig/solid/solid/backends/udisks2/udisksstoragedrive.h	2012-06-28 00:14:38.445073422 +0200
-+++ kdelibs-4.8.95/solid/solid/backends/udisks2/udisksstoragedrive.h	2012-06-28 00:15:14.569076596 +0200
-@@ -24,7 +24,7 @@
- 
- #include <ifaces/storagedrive.h>
- 
--#include "../shared/udevqtdevice.h"
-+#include "../shared/udevqt.h"
- 
- #include "udisksblock.h"
- 

diff --git a/kde-base/kdelibs/files/kdelibs-4.9.90-findkipi.patch b/kde-base/kdelibs/files/kdelibs-4.9.90-findkipi.patch
deleted file mode 100644
index 050262f..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.9.90-findkipi.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-diff -ruN kdelibs-4.9.90.orig/cmake/modules/FindKipi.cmake kdelibs-4.9.90/cmake/modules/FindKipi.cmake
---- kdelibs-4.9.90.orig/cmake/modules/FindKipi.cmake	2012-11-14 16:58:29.000000000 +0100
-+++ kdelibs-4.9.90/cmake/modules/FindKipi.cmake	2012-12-17 22:21:25.000000000 +0100
-@@ -1,116 +1,133 @@
--# - Try to find the Kipi library
-+# Module that tries to find the Kipi library
- #
--# If you have put a local version of libkipi into your source tree,
--# set KIPI_LOCAL_DIR to the relative path to the local directory.
-+# Input values :
- #
--# Once done this will define
-+# KIPI_LOCAL_DIR    - If you have put a local version of libkipi into your source tree,
-+#                     set this variable to the relative path from the local directory.
- #
--#  KIPI_FOUND - system has libkipi
--#  KIPI_INCLUDE_DIR - the libkipi include directory
--#  KIPI_LIBRARIES - Link these to use libkipi
-+# Output values :
-+#
-+#  KIPI_FOUND       - System has libkipi
-+#  KIPI_INCLUDE_DIR - The libkipi include directory
-+#  KIPI_LIBRARIES   - Link these to use libkipi
- #  KIPI_DEFINITIONS - Compiler switches required for using libkipi
-+#  KIPI_VERSION     - The release version of the Kipi library
-+#  KIPI_SO_VERSION  - The binary SO version of the Kipi library
- #
- 
--# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@×××××.com>
-+# Copyright (c) 2012, Victor Dodon <dodonvictor at gmail dot com>
-+# Copyright (c) 2012, Gilles Caulier <caulier dot gilles at gmail dot com>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
--if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS)
--
--  message(STATUS "Found Kipi library in cache: ${KIPI_LIBRARIES}")
--
--  # in cache already
--  set(KIPI_FOUND TRUE)
--
--else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS)
-+IF(${Kipi_FIND_VERSION} STREQUAL "")
-+    SET(Kipi_FIND_VERSION "1.2.0")
-+    MESSAGE(STATUS "No Kipi library version required. Check default version : ${Kipi_FIND_VERSION}")
-+ELSE()
-+    MESSAGE(STATUS "Kipi library version required : ${Kipi_FIND_VERSION}")
-+ENDIF()
-+
-+IF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
-+
-+  IF(NOT Kipi_FIND_QUIETLY)
-+    MESSAGE(STATUS "Found kipi library in cache ${KIPI_LIBRARIES}")
-+  ENDIF(NOT Kipi_FIND_QUIETLY)
-+  # Already in cache
-+  SET(KIPI_FOUND TRUE)
-+
-+ELSE(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)
-+
-+  IF(NOT Kipi_FIND_QUIETLY)
-+    MESSAGE(STATUS "Check Kipi library in local sub-folder...")
-+  ENDIF(NOT Kipi_FIND_QUIETLY)
-+
-+  IF(KIPI_LOCAL_DIR)
-+    FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} NO_DEFAULT_PATH)
-+    IF(NOT KIPI_LOCAL_FOUND)
-+      MESSAGE(WARNING "KIPI_LOCAL_DIR specified as \"${KIPI_LOCAL_DIR}\" but libkipi could not be found there.")
-+    ENDIF(NOT KIPI_LOCAL_FOUND)
-+  ELSE(KIPI_LOCAL_DIR)
-+    FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libkipi NO_DEFAULT_PATH)
-+    IF(KIPI_LOCAL_FOUND)
-+      SET(KIPI_LOCAL_DIR libkipi)
-+    ENDIF(KIPI_LOCAL_FOUND)
-+
-+    FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
-+    IF(KIPI_LOCAL_FOUND)
-+      SET(KIPI_LOCAL_DIR libs/libkipi)
-+    ENDIF(KIPI_LOCAL_FOUND)
-+  ENDIF(KIPI_LOCAL_DIR)
-+
-+  IF(KIPI_LOCAL_FOUND)
-+
-+    SET(KIPI_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
-+    SET(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
-+    SET(KIPI_LIBRARIES kipi)
-+    IF(NOT Kipi_FIND_QUIETLY)
-+      MESSAGE(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}")
-+    ENDIF(NOT Kipi_FIND_QUIETLY)
-+    SET(KIPI_FOUND TRUE)
-+    SET(KIPI_VERSION_H_FILENAME "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}/libkipi/version.h")
-+
-+  ELSE(KIPI_LOCAL_FOUND)
-+
-+    IF(NOT WIN32)
-+      IF(NOT Kipi_FIND_QUIETLY)
-+        MESSAGE(STATUS "Check Kipi library using pkg-config...")
-+      ENDIF(NOT Kipi_FIND_QUIETLY)
-+
-+      INCLUDE(FindPkgConfig)
-+      PKG_CHECK_MODULES(KIPI libkipi>=${Kipi_FIND_VERSION})
-+    ENDIF(NOT WIN32)
-+
-+    FIND_LIBRARY(KIPI_LIBRARIES NAMES libkipi PATHS ${KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR})
-+    FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KIPI_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR})
-+    SET(KIPI_VERSION_H_FILENAME "${KIPI_INCLUDE_DIR}/libkipi/version.h")
-+    SET(KIPI_DEFINITIONS ${KIPI_CFLAGS} CACHE STRING "Kipi defintions")
-+
-+    INCLUDE(FindPackageHandleStandardArgs)
-+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARIES KIPI_INCLUDE_DIR)
-+
-+  ENDIF(KIPI_LOCAL_FOUND)
-+
-+  IF(KIPI_FOUND)
-+
-+    IF(NOT KIPI_VERSION)
-+      FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT)
-+      STRING(REGEX REPLACE ".*static +const +char +kipi_version\\[\\] += +\"([^\"]+)\".*" "\\1" KIPI_VERSION "${KIPI_VERSION_H_CONTENT}")
-+      MESSAGE(STATUS "Kipi library version: ${KIPI_VERSION}")
-+    ENDIF(NOT KIPI_VERSION)
-+
-+    IF(NOT KIPI_SO_VERSION)
-+      FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT)
-+      STRING(REGEX REPLACE
-+             ".*static +const +int +kipi_binary_version +=  ([^ ;]+).*"
-+             "\\1"
-+             KIPI_SO_VERSION_FOUND
-+             "${KIPI_VERSION_H_CONTENT}"
-+            )
-+      SET(KIPI_SO_VERSION ${KIPI_SO_VERSION_FOUND} CACHE STRING "libkipi so version")
-+      MESSAGE(STATUS "Kipi library SO binary version: ${KIPI_SO_VERSION}")
-+    ENDIF(NOT KIPI_SO_VERSION)
-+
-+    UNSET(KIPI_VERSION_H_CONTENT)
-+    UNSET(KIPI_VERSION_H_FILENAME)
-+  ENDIF(KIPI_FOUND)
-+
-+  IF(KIPI_FOUND)
-+    MESSAGE(STATUS "libkipi: Found version ${KIPI_VERSION} (required: ${Kipi_FIND_VERSION})")
-+    IF(${KIPI_VERSION} VERSION_LESS ${Kipi_FIND_VERSION})
-+        SET(KIPI_FOUND FALSE)
-+    ELSE()
-+        MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS KIPI_VERSION KIPI_SO_VERSION)
-+    ENDIF()
-+  ELSE(KIPI_FOUND)
-+    UNSET(KIPI_INCLUDE_DIR)
-+    UNSET(KIPI_LIBRARIES)
-+    UNSET(KIPI_DEFINITIONS)
-+    UNSET(KIPI_VERSION)
-+    UNSET(KIPI_SO_VERSION)
-+  ENDIF(KIPI_FOUND)
- 
--  message(STATUS "Check Kipi library in local sub-folder...")
--
--  # Check if library is not in local sub-folder
--
--  if (KIPI_LOCAL_DIR)
--    set (KIPI_LOCAL_FOUND TRUE)
--  else (KIPI_LOCAL_DIR)
--    find_file(KIPI_LOCAL_FOUND libkipi/kipi.h ${CMAKE_SOURCE_DIR}/libkipi ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
--
--    if (KIPI_LOCAL_FOUND)
--      # Was it found in libkdcraw/ or in libs/libkdcraw?
--      find_file(KIPI_LOCAL_FOUND_IN_LIBS libkipi/kipi.h ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH)
--      if (KIPI_LOCAL_FOUND_IN_LIBS)
--        set(KIPI_LOCAL_DIR libs/libkipi)
--      else (KIPI_LOCAL_FOUND_IN_LIBS)
--        set(KIPI_LOCAL_DIR libkipi)
--      endif (KIPI_LOCAL_FOUND_IN_LIBS)
--    endif (KIPI_LOCAL_FOUND)
--  endif (KIPI_LOCAL_DIR)
--
--  if (KIPI_LOCAL_FOUND)
--    # we need two include directories: because the version.h file is put into the build directory
--    # TODO KIPI_INCLUDE_DIR sounds like it should contain only one directory...
--    set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR})
--    set(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}")
--    set(KIPI_LIBRARIES kipi)
--    message(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}")
--    set(KIPI_FOUND TRUE)
--    mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS)
--
--  else (KIPI_LOCAL_FOUND)
--
--    if (NOT WIN32)
--      message(STATUS "Check Kipi library using pkg-config...")
--
--      # use pkg-config to get the directories and then use these values
--      # in the FIND_PATH() and FIND_LIBRARY() calls
--      include(UsePkgConfig)
--
--      PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
--
--      if (_KIPILinkFlags)
--        # query pkg-config asking for a libkipi >= 0.2.0
--        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--        if (_return_VALUE STREQUAL "0")
--            message(STATUS "Found libkipi release >= 0.2.0")
--            set(KIPI_VERSION_GOOD_FOUND TRUE)
--        else (_return_VALUE STREQUAL "0")
--            message(STATUS "Found libkipi release < 0.2.0, too old")
--            set(KIPI_VERSION_GOOD_FOUND FALSE)
--            set(KIPI_FOUND FALSE)
--        endif (_return_VALUE STREQUAL "0")
--      else (_KIPILinkFlags)
--        set(KIPI_VERSION_GOOD_FOUND FALSE)
--        set(KIPI_FOUND FALSE)
--      endif (_KIPILinkFlags)
--    else (NOT WIN32)
--      set(KIPI_VERSION_GOOD_FOUND TRUE)
--    endif (NOT WIN32)
--    if (KIPI_VERSION_GOOD_FOUND)
--        set(KIPI_DEFINITIONS ${_KIPICflags})
--
--        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
--        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
--
--        if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
--            set(KIPI_FOUND TRUE)
--        endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
--      endif (KIPI_VERSION_GOOD_FOUND)
--      if (KIPI_FOUND)
--          if (NOT Kipi_FIND_QUIETLY)
--              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
--          endif (NOT Kipi_FIND_QUIETLY)
--      else (KIPI_FOUND)
--          if (Kipi_FIND_REQUIRED)
--              if (NOT KIPI_INCLUDE_DIR)
--                  message(FATAL_ERROR "Could NOT find libkipi header files")
--              endif (NOT KIPI_INCLUDE_DIR)
--              if (NOT KIPI_LIBRARIES)
--                  message(FATAL_ERROR "Could NOT find libkipi library")
--              endif (NOT KIPI_LIBRARIES)
--          endif (Kipi_FIND_REQUIRED)
--      endif (KIPI_FOUND)
--
--    mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS)
--
--  endif (KIPI_LOCAL_FOUND)
--  
--endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS)
-+ENDIF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION)

diff --git a/kde-base/kdelibs/files/kdelibs-4.9.95-findsomething.patch b/kde-base/kdelibs/files/kdelibs-4.9.95-findsomething.patch
deleted file mode 100644
index 9963130..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.9.95-findsomething.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-diff -wruN kdelibs-4.9.95.orig/cmake/modules/FindKdcraw.cmake kdelibs-4.9.95/cmake/modules/FindKdcraw.cmake
---- kdelibs-4.9.95.orig/cmake/modules/FindKdcraw.cmake	2012-12-17 15:14:16.000000000 +0100
-+++ kdelibs-4.9.95/cmake/modules/FindKdcraw.cmake	2012-12-28 21:20:21.000000000 +0100
-@@ -1,107 +1,121 @@
--# - Try to find the Kdcraw library
-+# Try to find the Kdcraw library
- #
--# If you have put a local version of libkdcraw into your source tree,
--# set KDCRAW_LOCAL_DIR to the relative path to the local directory.
-+# Parameters:
-+#  KDCRAW_LOCAL_DIR - If you have put a local version of libkdcraw into
-+#                     your source tree, set KDCRAW_LOCAL_DIR to the
-+#                     relative path from the root of your source tree
-+#                     to the libkdcraw local directory.
- #
- # Once done this will define
- #
--#  KDCRAW_FOUND - system has libkdcraw
--#  KDCRAW_INCLUDE_DIR - the libkdcraw include directory
-+#  KDCRAW_FOUND - System has libkdcraw
-+#  KDCRAW_INCLUDE_DIR - The libkdcraw include directory/directories (for #include <libkdcraw/...> style)
- #  KDCRAW_LIBRARIES - Link these to use libkdcraw
- #  KDCRAW_DEFINITIONS - Compiler switches required for using libkdcraw
-+#  KDCRAW_VERSION - Version of libkdcraw which was found
- #
--
--# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@×××××.com>
-+# Copyright (c) 2008-2011, Gilles Caulier, <caulier.gilles@×××××.com>
-+# Copyright (c) 2011, Michael G. Hansen, <mike@××××××××.de>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-+# Kdcraw_FIND_QUIETLY and Kdcraw_FIND_REQUIRED may be defined by CMake.
- 
--if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS)
-+if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION)
- 
-+  if (NOT Kdcraw_FIND_QUIETLY)
-   message(STATUS "Found Kdcraw library in cache: ${KDCRAW_LIBRARIES}")
-+  endif (NOT Kdcraw_FIND_QUIETLY)
- 
-   # in cache already
-   set(KDCRAW_FOUND TRUE)
- 
--else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS)
-+else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION)
- 
--  message(STATUS "Check Kdcraw library in local sub-folder...")
--
--  # Check if library is not in local sub-folder
-+  if (NOT Kdcraw_FIND_QUIETLY)
-+    message(STATUS "Check for Kdcraw library in local sub-folder...")
-+  endif (NOT Kdcraw_FIND_QUIETLY)
- 
-+  # Check for a local version of the library.
-   if (KDCRAW_LOCAL_DIR)
--    set (KDCRAW_LOCAL_FOUND TRUE)
-+    find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR} NO_DEFAULT_PATH)
-+    if (NOT KDCRAW_LOCAL_FOUND)
-+      message(WARNING "KDCRAW_LOCAL_DIR specified as \"${KDCRAW_LOCAL_DIR}\" but libkdcraw could not be found there.")
-+    endif (NOT KDCRAW_LOCAL_FOUND)
-   else (KDCRAW_LOCAL_DIR)
--    find_file(KDCRAW_LOCAL_FOUND libkdcraw/kdcraw.h ${CMAKE_SOURCE_DIR}/libkdcraw ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
--
-+    find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/libkdcraw NO_DEFAULT_PATH)
-     if (KDCRAW_LOCAL_FOUND)
--      # Was it found in libkdcraw/ or in libs/libkdcraw?
--      find_file(KDCRAW_LOCAL_FOUND_IN_LIBS libkdcraw/kdcraw.h ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
--      if (KDCRAW_LOCAL_FOUND_IN_LIBS)
--        set(KDCRAW_LOCAL_DIR libs/libkdcraw)
--      else (KDCRAW_LOCAL_FOUND_IN_LIBS)
-         set(KDCRAW_LOCAL_DIR libkdcraw)
--      endif (KDCRAW_LOCAL_FOUND_IN_LIBS)
-+    endif (KDCRAW_LOCAL_FOUND)
-+    find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH)
-+    if (KDCRAW_LOCAL_FOUND)
-+      set(KDCRAW_LOCAL_DIR libs/libkdcraw)
-     endif (KDCRAW_LOCAL_FOUND)
-   endif (KDCRAW_LOCAL_DIR)
- 
-   if (KDCRAW_LOCAL_FOUND)
--
--    # we need two include directories: because the version.h file is put into the build directory
-+    # We need two include directories: because the version.h file is put into the build directory
-     # TODO KDCRAW_INCLUDE_DIR sounds like it should contain only one directory...
-     set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR})
-     set(KDCRAW_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}")
-     set(KDCRAW_LIBRARIES kdcraw)
-+    if (NOT Kdcraw_FIND_QUIETLY)
-     message(STATUS "Found Kdcraw library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}")
-+    endif (NOT Kdcraw_FIND_QUIETLY)
-     set(KDCRAW_FOUND TRUE)
--    mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
- 
--  else(KDCRAW_LOCAL_FOUND)
-+    set(kdcraw_version_h_filename "${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}/libkdcraw/version.h")
- 
--    message(STATUS "Check Kdcraw library using pkg-config...")
-+  else (KDCRAW_LOCAL_FOUND)
-     if (NOT WIN32)
--      # use pkg-config to get the directories and then use these values
--      # in the FIND_PATH() and FIND_LIBRARY() calls
--      include(UsePkgConfig)
--    
--      PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
--    
--      if (_KDCRAWLinkFlags)
--        # query pkg-config asking for a libkdcraw >= 0.2.0
--        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--        if (_return_VALUE STREQUAL "0")
--            message(STATUS "Found libkdcraw release >= 0.2.0")
--            set(KDCRAW_VERSION_GOOD_FOUND TRUE)
--        else (_return_VALUE STREQUAL "0")
--            message(STATUS "Found libkdcaw release < 0.2.0, too old")
-+      if (NOT Kdcraw_FIND_QUIETLY)
-+        message(STATUS "Check Kdcraw library using pkg-config...")
-+      endif (NOT Kdcraw_FIND_QUIETLY)
-+
-+      # use FindPkgConfig to get the directories and then use these values
-+      # in the find_path() and find_library() calls
-+      include(FindPkgConfig)
-+
-+      pkg_check_modules(PC_KDCRAW libkdcraw)
-+
-+      if (PC_KDCRAW_FOUND)
-+        # make sure the version is >= 0.2.0
-+        # TODO: WHY?
-+        if (PC_KDCRAW_VERSION VERSION_LESS 0.2.0)
-+          message(STATUS "Found libkdcraw release < 0.2.0, too old")
-             set(KDCRAW_VERSION_GOOD_FOUND FALSE)
-             set(KDCRAW_FOUND FALSE)
--        endif (_return_VALUE STREQUAL "0")
--      else (_KDCRAWLinkFlags)
-+        else (PC_KDCRAW_VERSION VERSION_LESS 0.2.0)
-+          set(KDCRAW_VERSION "${PC_KDCRAW_VERSION}")
-+          if (NOT Kdcraw_FIND_QUIETLY)
-+            message(STATUS "Found libkdcraw release ${KDCRAW_VERSION}")
-+          endif (NOT Kdcraw_FIND_QUIETLY)
-+          set(KDCRAW_VERSION_GOOD_FOUND TRUE)
-+        endif (PC_KDCRAW_VERSION VERSION_LESS 0.2.0)
-+      else (PC_KDCRAW_FOUND)
-         set(KDCRAW_VERSION_GOOD_FOUND FALSE)
--        set(KDCRAW_FOUND FALSE)
--      endif (_KDCRAWLinkFlags)
-+      endif (PC_KDCRAW_FOUND)
-     else (NOT WIN32)
-+      # TODO: Why do we just assume the version is good?
-       set(KDCRAW_VERSION_GOOD_FOUND TRUE)
-     endif (NOT WIN32)
- 
-     if (KDCRAW_VERSION_GOOD_FOUND)
--        set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
-+      set(KDCRAW_DEFINITIONS "${PC_KDCRAW_CFLAGS_OTHER}")
-+
-+      find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h ${PC_KDCRAW_INCLUDE_DIRS})
-+      set(kdcraw_version_h_filename "${KDCRAW_INCLUDE_DIR}/libkdcraw/version.h")
-     
--        find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h
--        ${_KDCRAWIncDir}
--        )
--    
--        find_library(KDCRAW_LIBRARIES NAMES kdcraw
--        PATHS
--        ${_KDCRAWLinkDir}
--        )
-+      find_library(KDCRAW_LIBRARIES NAMES kdcraw HINTS ${PC_KDCRAW_LIBRARY_DIRS})
-     
-         if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-             set(KDCRAW_FOUND TRUE)
-+      else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-+        set(KDCRAW_FOUND FALSE)
-         endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-      endif (KDCRAW_VERSION_GOOD_FOUND) 
-+
-      if (KDCRAW_FOUND)
-          if (NOT Kdcraw_FIND_QUIETLY)
-              message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
-@@ -109,16 +123,35 @@
-      else (KDCRAW_FOUND)
-          if (Kdcraw_FIND_REQUIRED)
-              if (NOT KDCRAW_INCLUDE_DIR)
--                 message(FATAL_ERROR "Could NOT find libkdcraw header files")
-+          message(FATAL_ERROR "Could NOT find libkdcraw header files.")
-+        else(NOT KDCRAW_INCLUDE_DIR)
-+          message(FATAL_ERROR "Could NOT find libkdcraw library.")
-              endif (NOT KDCRAW_INCLUDE_DIR)
--             if (NOT KDCRAW_LIBRARIES)
--                 message(FATAL_ERROR "Could NOT find libkdcraw library")
--             endif (NOT KDCRAW_LIBRARIES)
-          endif (Kdcraw_FIND_REQUIRED)
-      endif (KDCRAW_FOUND)
-     
--    mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS)
--
-   endif(KDCRAW_LOCAL_FOUND)
-   
--endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS)
-+  if (KDCRAW_FOUND)
-+    # Find the version information, unless that was reported by pkg_search_module.
-+    if (NOT KDCRAW_VERSION)
-+      file(READ "${kdcraw_version_h_filename}" kdcraw_version_h_content)
-+      # This is the line we are trying to find: static const char kdcraw_version[] = "1.22.4-beta_5+dfsg";
-+      string(REGEX REPLACE ".*char +kdcraw_version\\[\\] += +\"([^\"]+)\".*" "\\1" KDCRAW_VERSION "${kdcraw_version_h_content}")
-+      unset(kdcraw_version_h_content)
-+
-+    endif (NOT KDCRAW_VERSION)
-+    unset(kdcraw_version_h_filename)
-+  endif (KDCRAW_FOUND)
-+
-+  if (KDCRAW_FOUND)
-+    mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS KDCRAW_VERSION KDCRAW_FOUND)
-+  else (KDCRAW_FOUND)
-+    # The library was not found, reset all related variables.
-+    unset(KDCRAW_INCLUDE_DIR)
-+    unset(KDCRAW_LIBRARIES)
-+    unset(KDCRAW_DEFINITIONS)
-+    unset(KDCRAW_VERSION)
-+  endif (KDCRAW_FOUND)
-+
-+endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION)
-diff -wruN kdelibs-4.9.95.orig/cmake/modules/FindKexiv2.cmake kdelibs-4.9.95/cmake/modules/FindKexiv2.cmake
---- kdelibs-4.9.95.orig/cmake/modules/FindKexiv2.cmake	2012-12-17 15:14:16.000000000 +0100
-+++ kdelibs-4.9.95/cmake/modules/FindKexiv2.cmake	2012-12-28 21:19:39.000000000 +0100
-@@ -67,13 +67,13 @@
-       PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags)
-     
-       if(_KEXIV2LinkFlags)
--        # query pkg-config asking for a libkexiv2 >= 0.2.0
--        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-+        # query pkg-config asking for a libkexiv2 >= 1.0.0
-+        exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=1.0.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-         if(_return_VALUE STREQUAL "0")
--            message(STATUS "Found libkexiv2 release >= 0.2.0")
-+            message(STATUS "Found libkexiv2 release >= 1.0.0")
-             set(KEXIV2_VERSION_GOOD_FOUND TRUE)
-         else(_return_VALUE STREQUAL "0")
--            message(STATUS "Found libkexiv2 release < 0.2.0, too old")
-+            message(STATUS "Found libkexiv2 release < 1.0.0, too old")
-             set(KEXIV2_VERSION_GOOD_FOUND FALSE)
-             set(KEXIV2_FOUND FALSE)
-         endif(_return_VALUE STREQUAL "0")

diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index 5dfbf53..5f0250f 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -4,8 +4,6 @@
   <herd>kde</herd>
   <use>
 	<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
-	<flag name="udisks">Use udisks for block device access (e.g., automounting)</flag>
-	<flag name="udisks2">Use the udisks2 support backported from kf5</flag>
 	<flag name="upower">Use upower for power management</flag>
 	<flag name="upnp">Build the Solid backend to provide information about UPnP devices on the network</flag>
   </use>