summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kdelibs/Manifest33
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch81
-rw-r--r--kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild1
-rw-r--r--kde-base/kdelibs/kdelibs-4.6.80-r1.ebuild1
-rw-r--r--kde-base/kdelibs/kdelibs-9999.ebuild1
5 files changed, 101 insertions, 16 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index c368aca0440..d37d9ba1fcc 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -11,26 +11,27 @@ AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0
AUX kdelibs-4.5.90-mimetypes.patch 1629 RMD160 46289674dd977b2b2289ba935d88c1b0c9de5916 SHA1 78c70127486231e24f464f5cce978e06293510e5 SHA256 0276732204ba9b7a9f119ce26a2b992b1d23c321606efc1a6957914329f33109
AUX kdelibs-4.6.2-armlinking.patch 1129 RMD160 48174cfa4af1a871f4d05a880beded4a16b0408e SHA1 6fa4163e94990ed574caf3b9f0026b18b30c86df SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6
AUX kdelibs-4.6.2-nonepomuk.patch 736 RMD160 3f6ab4acd649d47f045e2445544df3b84e7a700e SHA1 1f5af0271c6a5135bf0bc0acbd6f11abf256c81b SHA256 f27ec69f92e197bff33ecd6f25e3e47303e7599cdc28302477bca52ebe94b2a4
+AUX kdelibs-4.6.3-bytecode.patch 3511 RMD160 a91034b19ad7eef7bf37aebdd0149371f9d32d8d SHA1 b46a1868837c2e9452ddef41338401ca6253cf45 SHA256 d7c06948ce564177f703e9216bd9be40d0f68fe305e0965305926cad5bf31a4c
AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa949ad19b67814 SHA1 8536664b5d46f2dfd32828a4a0523f280ebe6bdf SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb
DIST kdelibs-4.6.80.tar.bz2 12020588 RMD160 159c47e473c004cab6c7027a0bd35e97c34fdf60 SHA1 313e051b08762ec68d7d7aaceb5471ede2bf66ac SHA256 4b206b607fefece3f1be1c70a590cd719df0e0ff5faa657b50d987e069c9c801
-EBUILD kdelibs-4.6.49.9999.ebuild 9835 RMD160 88117edefb07f3480850d482719d98bc71b0ea1c SHA1 9ae1b9352e18c71bf88e04d05aa55332962ca4cf SHA256 abe0a6754cb2c8837e09d612defba64a0c74affef4a879e68b0a34e55c77a408
-EBUILD kdelibs-4.6.80-r1.ebuild 9418 RMD160 a20fc846433922e05495a830dc93e6803b68d8cf SHA1 6749a3f328bd46d559c5d9b5d356b0a62fe14027 SHA256 b9f21ac293c71b7c9d4ea38fe0aecfdd9f00990c3e5b709245af8c57efdceda8
-EBUILD kdelibs-9999.ebuild 9383 RMD160 64ab58a7edbbf8a028e8a41e8fd8bfa8481d3467 SHA1 e63f9416498eb9972452d98247bea39f0f112f5c SHA256 5e1d3a2c2b00feac7478fe1758bb75e2a742da39b6afbba0219bbe2becee311c
+EBUILD kdelibs-4.6.49.9999.ebuild 9877 RMD160 41f78ccf347ac1f3e37061fa3a9689b88129b8ec SHA1 9ff04c6b2efc761ea22b663080aae4edb7f816d2 SHA256 50b05b6390ce9f161e9a977b3afeba5c623c16df878fa3e220782ecdb6057cb8
+EBUILD kdelibs-4.6.80-r1.ebuild 9460 RMD160 03e9d9eb8f0fca031abbb042457b02001ead1bef SHA1 155dc965029172f906c563b2c37dfd417ee327a4 SHA256 f2a4cab258f696c80183452f3c9e423e1bfecd3a72723529def1f1356479ae3e
+EBUILD kdelibs-9999.ebuild 9425 RMD160 5f3f8f177845339958c54dfd2e0758e669f2e860 SHA1 9f2415a4591cc0f74dab5acc71c3ff3620ac8c78 SHA256 ca350af1b05053018a7311f90c5c4aac45b04a10658a62f5fc722a5872175687
MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJN/HvJAAoJELHSF2kinlg4OUsQAIEDO8cPr2h4urfmLVw2N6LK
-Nc7ky5a93ycTS7hdVd62RHeJMCaz7ug9l79ouP/7ljT4zToWYSFdVd933Pb3wW1A
-GznBHdKEWve+G1uremYR094LHdJwL2/01cYz8CkCeOos5wQyJFSxRdgcgY2PPlQ8
-RgS8F61BfnALqB91WOE0qJQ5qunYfnwFEFxlWGGTjer4XOcjveSGXnqvblu7hbPL
-yuZ0qUIwEEIgqMe3C15khjyBgJAxNvM7IbBnuW9gHv9Z6AyfgQ9Fa4dGDe/173VO
-tzMSrbneNCnvQmZGwrEo2ZILszKK5X0cNaslyOch9FYxIaETTqLv9pJBekGaR8Mu
-+R76sj621/ZXvrvu4YnW8HSiCFZvrtB6yyOMQQDNJ/f7yFm1d6NxDVkpvPCLsEQf
-pY+qi24uG3+OaCFaIUyhc8L5vhVqpiovJsnGn5oy+oh4+lANfv3r0K6BrwmBSHmL
-bQeFYN20CasiUWbReydaNQLaCSxgrnift3gfWdXUETa6MraP/+Jmk8CwgQT9YhRD
-YzRv8dP2q9I/KTrQMQoPqn3dg86gka1iim5AR05e+hrUCR4fVw8tXb8xaJ5FNpM/
-qcXS665z+xFqAxzjDUGJmvoZ3KTN+uOqIk0psGdO1RrnVKIr4rLFpsfObZ2Ed1fF
-Veiy4ZYAtCWOCxMIO0R/
-=z+HQ
+iQIcBAEBCgAGBQJOAQFQAAoJENwGBM22xffelUUP/RXNFbHHm60IVfTIQnVdqqm3
+8vxDdlhNoojcq/QUtQjRTNKuHOLwpJ3KTcQeiB6tzgKlXnO70YNw5/xgVpUtmoVb
+bRcEYV2FVCqy3PM7ykyBKoMmwq7TbyNG3jgy11Vg4RDuLNXWO9/GCh3Us9VJ+WIh
+d2tQB1LylJjVw4hlD92OubwsDLXrUtLXNFI3l+E3f0CBalI9JiQtb4mYi2rNRdRA
+WAgcqdEidr+8BaXfj8aoO8i6VuQv4Uv10pSX3MIXT1Rb3x6/bP1IXKIl7ZpG9N0X
+Ia3jX/s2nwQYPKmBFS6MeFgW02QGp8BgrR+dh0VZndOx61kBMTuYsV8TTbdMWjHC
+r3DWs2W4EHSZjg2bnaidcJ/bItIh/E2GnW4vGs5nA2uoQf+MZSyaWG6Ob19uOqV1
+Jf2GepnNZbzcNv422O5MNehUXLx/nglMDT4BWU3DV3QRjaW2DVxYyTYxyZ7OcDfe
+c9LKoupvwlvkGppvbNgFNCupfk3nTN4GSGSa1GMI1+WSeva2TUtat7fgXdRWchVD
+TxKL7foNYkH479frhVun4KuNJMfO/K6r3Fmk+rX2G5h17mOA4jo5YTe+PVao4xtX
+RfZEEv1SB8JtAeYrwD+5fe+hvgMsoQtG9o8NHnyRbf24eP1Gt8CesK9K5RT0VnJH
+zzmNe6e4esL4xW5955jU
+=ljL8
-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch
new file mode 100644
index 00000000000..736e2ae782b
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch
@@ -0,0 +1,81 @@
+diff -ruN kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake kdelibs-4.6.3/cmake/modules/PythonMacros.cmake
+--- kdelibs-4.6.3.orig/cmake/modules/PythonMacros.cmake 2011-04-01 15:55:50.000000000 +0200
++++ kdelibs-4.6.3/cmake/modules/PythonMacros.cmake 2011-06-21 22:30:18.957765437 +0200
+@@ -23,40 +23,42 @@
+ # Install the source file.
+ 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})
++ # Byte compile and install the .pyc file.
++ 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/kdelibs-4.6.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
index cd2dfd82495..6fea3fd7118 100644
--- a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.90-xslt.patch"
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+ "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
)
pkg_pretend() {
diff --git a/kde-base/kdelibs/kdelibs-4.6.80-r1.ebuild b/kde-base/kdelibs/kdelibs-4.6.80-r1.ebuild
index 5a9fce3f672..a87ae07f312 100644
--- a/kde-base/kdelibs/kdelibs-4.6.80-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.80-r1.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.90-xslt.patch"
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+ "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
)
pkg_pretend() {
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index a2dfdf27e2d..1cf8d088d0c 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.90-xslt.patch"
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+ "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
)
pkg_pretend() {