Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-base
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog8
-rw-r--r--kde-base/kdelibs/Manifest19
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch78
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch103
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.9.4-zipfiles.patch37
5 files changed, 22 insertions, 223 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/Manifest b/kde-base/kdelibs/Manifest
index cd386966678b..da8366556610 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 SHA512 33a7eeb58b65ce28f0fadc1f6c7133e670391330d084df39990bb0a5b4ddd78f52375c1ebc620823adfe4eee22f10b85064d3fdcb6df0f63c5f6e757357e7ca7 WHIRLPOOL c585ed614ae27e0694156a7af68e222fe13578db95e611b592896475772572c316a05a60b39d1797d28f2c7bea52736ac41c5ee096a92e09e945c34f07ecf69c
AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3 SHA512 de0a0c7f181dbd581ee4d11d7c00553abb7d16c4e7930274b67ce039db95c2db7002a028f3a35dc80aec5f5e6fdb12274a6819a329280b9abec6c9244e927eff WHIRLPOOL 46d6ea1201273d432d31046b844d5882af479f6d4f0ad73b11eff38179a517e960cb850e09cba487e19340bda4438014826fd34b09028684f0c9a3a977af6d64
AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be
@@ -7,14 +10,22 @@ AUX kdelibs-4.6.2-armlinking.patch 1129 SHA256 9b076d1587bb02b85353f3a155199fd6d
AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 WHIRLPOOL 8c9817b7595f64f7484ecaa2d3f57ae434ec573378a0d857a39d4dfbfa61af74ada92bc20be7964049ccba88b9444b4176bfaceb014d8f0b1d5bffd00b08a1e7
AUX kdelibs-4.7.96-mimetypes.patch 1195 SHA256 7d8ea698c29c6de0dbf61ef7c24bf6bf69dfc7f758994edd2cef5b1f660195aa SHA512 385c94bcdb0b1204b3ccaff4d704d3a05bd7dda772923e382a2b1589470fbe03efd4778efe5afee1bf8fc5f7bac602f6cb75adfe4d37cd97af544958e7afe28f WHIRLPOOL 0784412f9df8d3aa7e8f887ce585fdfeca9e9e4424ee1e146197c06a7adc3197d027144337e1f753b0c42fd1396f6b6cfad2a76735c0fd162ea9cf64722829dc
AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8
-AUX kdelibs-4.8.4-bytecode.patch 3304 SHA256 01b0323ec02ff345be9abe0995f07a8fbbef4716fc216f71a6f5c5a589b14f9a SHA512 f65fccdb54dcae094413fe40b79657928f385fafce36dc794bf0d7ad76a428f06a60e9e8e9efc86f6def794a6b9dd03249f2585d3c478167dbd56d1c5fbe894d WHIRLPOOL f89b8c510c57a696e48c46ab01932f19276e564d51f4655adfd21a3532fbf4764a242e4aa87701a53cff634d9029593cf8d94f269b13b9c8553ed2a15fc9c718
AUX kdelibs-4.8.95-udisks2-includes.patch 2174 SHA256 cb6551f247cf5948703062d22d68da29d11e4449735b867d2a1b2daa32563c4d SHA512 b7e7ce7d2d76b803e748e16e8848dcc85410b8641633c51cdc59efadfc1b25857c994907a5f9830df1e0b2cecb7e50b5b7bd8ac3d69a70f3ce878988154d5ea9 WHIRLPOOL 36efeb5ff779715156db1d447e6ca983a105552a30162a86d7ad86ab2e22b6a49584d16353d3d8a1df712090050c42e2bbce8601f5215eff60c3fd120370b727
-AUX kdelibs-4.9.3-python-bytecompilation.patch 4363 SHA256 f4775a75120b5f398c8b86dde2f126b67ab642e4fd17218db1420436b6b82812 SHA512 b0f602759efda9898bbeede266e99355c3008c9d993fc09fb9834aa1e904390f00b3449191cc006583752cb3e7f6f3a40dec831b89c44d9f461e0317fcabaef7 WHIRLPOOL 3b721f540ed942328f29af61d2a792043eada2149416aa2bc58ad327f097c143a36e05313afa3a78d861a71fb107ed746a50de008774a5d3fd28115cb57cfb47
AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7
-AUX kdelibs-4.9.4-zipfiles.patch 1160 SHA256 e8d5c8e31dabd88fc933d2a45d0f9d0351cce6bd998886a440f0b80e361fcabd SHA512 4c90969d25ae3adbc9831767d5176979a5ed7885f3a8e1cd9a87520579cf721eee18ab64b3d92b250ece8c91f5087ab27fb6ecb27f32b5dc0be5938c84fee4e4 WHIRLPOOL f2f0e8b6ea39a3effcb654a76d2566292f5150138a67aeff616a5bf6e6e54a95154a905ba715e228c3d367275737842cb962c5f2b06056bcb076ba9d919954f2
DIST kdelibs-4.8.95-udisks2.patch.xz 21552 SHA256 9b746dbeb86d581982fcfea101f95521523d8c87edd2a22e21fa294fb34e2af0 SHA512 cbd1c53111d42d033c2cbd241342129a50aee33e95f127758cad2bccc3298ff26b65466306819af502a7cfe27952ef69ba25d8250449ed72d133c3d3b0091060 WHIRLPOOL 276a84c2d4b6d1f667ebb0622d447bd69ed89a61aa02e0d15cfac413a350ae1102601ce7556ff93857c9149317df033d2f902474cc628cd71d8b9ab13cffc4b9
DIST kdelibs-4.9.5.tar.xz 11902204 SHA256 fc977af4efe00e6cab1051dc7b2424b1a8aa434536c5a5f8f1f54417519b3427 SHA512 a693270108e82a1fa80083a38a3f78fe4e35a1fda25828a62c70c1e7d613a23f677c1f2ea14535ca5e114bded8d32b9c3190a5368004269908db0a1a24e2b351 WHIRLPOOL 12e39ca323c34d7b159cace54516a72b8ee99c742438e57cb7d3219eef4e2acd5219ea6342c66a9d688286c43059dfa7654ae9ac0b505d9b2babd9160bdd085b
EBUILD kdelibs-4.9.5.ebuild 9081 SHA256 313fd20abae377c7d60f30b2bbda08d2c5e6b48d0a6cfc822ef8bb04b891db58 SHA512 560f6649adb8cf277a6bfbb3452f2825aeb056cc3f11b12dc0ac991d1bf059dd6199e07c861758f5ad628d45954eda82652d35ba34d64062fa4355e5a48daa57 WHIRLPOOL 07e76fbe63db5d710aeaa1c4f439b280abecb14e264073886abf56de45b28be3647753b0d17aa0262ec73a2f9bd836a8b46e0f013e402638cd6beb809dc0af25
-MISC ChangeLog 38100 SHA256 21db848793a7e9aebb972b20d8cc2a6b0f2b06976b0493cdade95bd04ab112a5 SHA512 8b75e6ee6d138f59a7443203ab3fefb0051ab12fae61e7a5cc376ae41f3393dc4fcf4ea38e06c930e64b246d03929797dd4ade7fb1dc0c22fb05ac0c97faced4 WHIRLPOOL 2d5930331cb7659a936046ae0978aa0057071163695e5c4e60a94547d781583911f209977249d1d3dd1fff5bfc7cfaacf6cf51aa5f437860366a733abc0bb63e
+MISC ChangeLog 38320 SHA256 215490d3cd7ae36719804f1d829b053f4f455391cc7ea6d1c9a8200e3af12c31 SHA512 8d184d871c36c9b3a45cbb0e63d688436b7b63dec23ef1b1a5bd218848ae425906e5bbab24257510fd635c66ff1a7d181ee71c849874ff363d9a1683b2c9a6c0 WHIRLPOOL b0610b724692773acccc994389ed247c6c6afd70f03dd1e621c2e2bc7499b7b634df035b560585904cf44d153d82ee4e01968047b78de2c6664588d10d824882
MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
MISC metadata.xml 571 SHA256 860818188925bff97257b33cf78adc426383fa3f6b05876b4a4580f449cdca40 SHA512 9e2b562bbb713445db1aaf5707c144f207b9ed7a93b1a1194f257eef911438692ce55bd0a9187a1b9177ed37abf04838ad2de6a47152a684debdb65dba5837c3 WHIRLPOOL d6487e1f5af8fa3c85b4c4e3ef0ebb7ca83a425c0dd8dae76b5f8755bf8fcc9b5abf93d8b4488ca327bb948d3e6e8449adf1191893fce658820a816c3638fdc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBn0QAAoJEMbwO6tnXQ0snSUH/00fsp8F+x4lTxiieTKrUC8A
+CnrVXiL9SkmSurbEM2TyikYcBswqU5iDMWaojxH7p0JA/rBggYsAUVJpDue0xwLp
+QBeY9wuOck74wQ7H6ER0T7MQ1THUxesuDZbAtnx67YbBruJflKaA0VY42y92guqv
+ef33RWPMPGYfwGGdWS7eYB2DZNV4Gu/1/mZsO8Zz45BBPc5gQKI7Ojw6N0OPsxnF
+5VNOzwQOH6YTSX202jFx3WveBfK6T08q1TfaaUpc3iAeoSy4ypP+mDjXRfl5Rthp
+5Rbp2g/7ICzQxecBpWm/0R+Kr32t12vGUsbogWPOgfbRM0Kfu/Ob2RVJMm/dgRI=
+=Ypmm
+-----END PGP SIGNATURE-----
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