Remove unused patches.

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 7 insertions, 219 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 5083e1afebf5..87792f9acd24 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.890 2013/01/28 12:12:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.891 2013/01/28 13:32:13 kensington Exp $
+
+  28 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/kdelibs-4.8.4-bytecode.patch,
+  -files/kdelibs-4.9.3-python-bytecompilation.patch,
+  -files/kdelibs-4.9.4-zipfiles.patch:
+  Remove unused patches.
 
   28 Jan 2013; Agostino Sarubbo <ago@gentoo.org> -kdelibs-4.9.3.ebuild,
   -kdelibs-4.9.4-r1.ebuild:
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch
deleted file mode 100644
index 6920121afb8d..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- cmake/modules/PythonMacros.cmake.orig	2012-05-31 23:28:04.035788719 +0200
-+++ cmake/modules/PythonMacros.cmake	2012-05-31 23:30:13.997840354 +0200
-@@ -24,39 +24,41 @@
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
- 
-   # Byte compile and install the .pyc file.        
--  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
--  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
--  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
--  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
--  if(WIN32)
--    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
--
--  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
--  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
--
--  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
--  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ELSE(_abs_bin_py STREQUAL ${_absfilename})
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
--      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+    if(WIN32)
-+      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
-+
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
-+
-+    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+      ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+      )
-+    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+      ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
-+        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+      )
-+    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
-+    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
-+  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- ENDMACRO(PYTHON_INSTALL)
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch
deleted file mode 100644
index fbd14aee2450..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- cmake/modules/PythonMacros.cmake
-+++ cmake/modules/PythonMacros.cmake
-@@ -24,52 +24,54 @@
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
- 
-   # Byte compile and install the .pyc file.        
--  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
--  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
--  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
--  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
--  if(WIN32)
--    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
--
--  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
--  # Python 3.2 changed the pyc file location
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    # To get the right version for suffix
--    STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
--    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
--  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
--    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
--
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
--  SET(_message "Byte-compiling ${_bin_py}")
--
--  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
--  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ELSE(_abs_bin_py STREQUAL ${_absfilename})
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
--      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
--  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+    if(WIN32)
-+      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
-+
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+
-+    # Python 3.2 changed the pyc file location
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+      # To get the right version for suffix
-+      STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+      SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+      SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+    SET(_message "Byte-compiling ${_bin_py}")
-+
-+    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+      ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+      )
-+    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+      ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
-+        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+      )
-+    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-+    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-       INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
--  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+    ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
- 
-+  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- ENDMACRO(PYTHON_INSTALL)
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch b/kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch
deleted file mode 100644
index c7e5a48b712e..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
-index 3f1cadd..502a3e6 100644
---- a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
-@@ -47,7 +47,6 @@
- #include <ksharedconfig.h>
- #include <kstandarddirs.h>
- #include <kurl.h>
--#include <kmimetype.h>
- #include <kmimetypetrader.h>
- #include <kprotocolinfofactory.h>
- 
-@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
-             }
-         }
-     }
--    const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
--    if (!prot.isEmpty())
--        return prot;
--
--    // Check parent mimetypes
--    KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
--    if (mime) {
--        const QStringList parentMimeTypes = mime->allParentMimeTypes();
--        Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
--            const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
--            if (!res.isEmpty()) {
--                return res;
--            }
--        }
--    }
--
--    return QString();
-+    return d->protocolForArchiveMimetypes.value(mimeType);
- }
- 
- #undef PRIVATE_DATA