diff options
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch (renamed from kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch) | 45 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 2 |
3 files changed, 37 insertions, 12 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch index 6920121afb8..fbd14aee245 100644 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch +++ b/kde-base/kdelibs/files/kdelibs-4.9.3-python-bytecompilation.patch @@ -1,7 +1,7 @@ ---- 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}) +--- 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) @@ -14,11 +14,19 @@ - endif(WIN32) - - SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) +- +- # 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 "-DMESSAGE=Byte-compiling ${_bin_py}") +- 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. @@ -37,6 +45,10 @@ - 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) @@ -48,11 +60,19 @@ + endif(WIN32) + + SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) ++ ++ # 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 "-DMESSAGE=Byte-compiling ${_bin_py}") ++ 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. @@ -71,8 +91,13 @@ + 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) -- 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.9.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild index 4178699bf3e..afc779ccab9 100644 --- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild @@ -142,7 +142,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.8.4-bytecode.patch" + "${FILESDIR}/${PN}-4.9.3-python-bytecompilation.patch" ) pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index 7275417b4e0..e92eb283655 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -145,7 +145,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.8.4-bytecode.patch" + "${FILESDIR}/${PN}-4.9.3-python-bytecompilation.patch" ) pkg_pretend() { |