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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     eff3696ad87ec672df1b91cd21c9df2b9ed8c276
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 19:41:00 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 19:43:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eff3696a

[kde-base/kdelibs] Remove patch merged upstream.

Upstream is fast today!

http://quickgit.kde.org/?p=kdelibs.git&a=commit&h=5966ecd67bb1572e0149834501be9eba537e4f54

Package-Manager: portage-2.1.11.31

---
 .../kdelibs-4.10.0-python-bytecompilation.patch    |  109 --------------------
 kde-base/kdelibs/kdelibs-9999.ebuild               |    1 -
 2 files changed, 0 insertions(+), 110 deletions(-)

diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-python-bytecompilation.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-python-bytecompilation.patch
deleted file mode 100644
index 1d76e2e..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.10.0-python-bytecompilation.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=276151
-
---- cmake/modules/PythonMacros.cmake
-+++ cmake/modules/PythonMacros.cmake
-@@ -26,54 +26,56 @@
-   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)
--    # remove drive letter
--    string(REGEX REPLACE "^[a-zA-Z]:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
--
--  set(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
--  # Python 3.2 changed the pyc file location
--  if(PYTHON_VERSION_STRING VERSION_GREATER 3.1)
--    # To get the right version for suffix
--    set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc")
--    set(_py_install_dir "${DESTINATION_DIR}/__pycache__/")
--  else()
--    set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc")
--    set(_py_install_dir "${DESTINATION_DIR}")
--  endif()
--
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
--  # Setting because it will be displayed later, in compile_python_files
--  set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc}")
--
--  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()
--    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()
--
--  install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}")
--  unset(_py_install_dir)
--  unset(_message)
-+  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)
-+      # remove drive letter
-+      string(REGEX REPLACE "^[a-zA-Z]:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
-+
-+    set(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+
-+    # Python 3.2 changed the pyc file location
-+    if(PYTHON_VERSION_STRING VERSION_GREATER 3.1)
-+      # To get the right version for suffix
-+      set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc")
-+      set(_py_install_dir "${DESTINATION_DIR}/__pycache__/")
-+    else()
-+      set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc")
-+      set(_py_install_dir "${DESTINATION_DIR}")
-+    endif()
-+
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+    # Setting because it will be displayed later, in compile_python_files
-+    set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc}")
-+
-+    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()
-+      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()
-+
-+    install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}")
-+    unset(_py_install_dir)
-+    unset(_message)
- 
-+  endif("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- endmacro(PYTHON_INSTALL)
- 

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index ad8bb86..e57d8e4 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -144,7 +144,6 @@ 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.10.0-python-bytecompilation.patch"
 )
 
 pkg_pretend() {