From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33722138010 for ; Sat, 22 Sep 2012 17:54:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1191BE0504; Sat, 22 Sep 2012 17:54:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C9858E0508 for ; Sat, 22 Sep 2012 17:54:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB54A33D384 for ; Sat, 22 Sep 2012 17:54:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 67055E5442 for ; Sat, 22 Sep 2012 17:54:25 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <1348336215.36014c93623cf3880b03bd1c057a3eb2a9029e65.abcd@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch kde-base/kdelibs/files/kdelibs-4.8.4-power.patch kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 36014c93623cf3880b03bd1c057a3eb2a9029e65 X-VCS-Branch: master Date: Sat, 22 Sep 2012 17:54:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0bb18c3a-cd3c-45f2-a765-93ae05b98d14 X-Archives-Hash: 8c64e7f357e55307f14ce6bb9cab7d66 commit: 36014c93623cf3880b03bd1c057a3eb2a9029e65 Author: Jonathan Callen gentoo org> AuthorDate: Sat Sep 22 17:50:15 2012 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sat Sep 22 17:50:15 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=36014c93 [kde-base/kdelibs] Clean up filesdir; trust that dependencies work (Portage version: 2.2.0_alpha129/git/Linux x86_64, unsigned Manifest commit) --- .../kdelibs/files/kdelibs-4.6.3-bytecode.patch | 81 -------------------- .../kdelibs/files/kdelibs-4.8.4-kiopointer.patch | 21 ----- kde-base/kdelibs/files/kdelibs-4.8.4-power.patch | 25 ------ .../files/kdelibs-4.8.4-sopranorevert1.patch | 28 ------- .../files/kdelibs-4.8.4-sopranorevert2.patch | 29 ------- kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 13 +--- kde-base/kdelibs/kdelibs-9999.ebuild | 13 +--- 7 files changed, 6 insertions(+), 204 deletions(-) diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch deleted file mode 100644 index 736e2ae..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.6.3-bytecode.patch +++ /dev/null @@ -1,81 +0,0 @@ -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/files/kdelibs-4.8.4-kiopointer.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch deleted file mode 100644 index a01b221..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/kio/kio/accessmanager.cpp -+++ b/kio/kio/accessmanager.cpp -@@ -37,7 +37,7 @@ - #include - - #include --#include -+#include - #include - #include - #include -@@ -87,7 +87,7 @@ - bool emitReadyReadOnMetaDataChange; - KIO::MetaData requestMetaData; - KIO::MetaData sessionMetaData; -- QWidget* window; -+ QPointer window; - }; - - namespace Integration { - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch deleted file mode 100644 index 61ea0aa..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5926264d13900efec70aaac434b7b67f9d8e6837 Mon Sep 17 00:00:00 2001 -From: Lukas Tinkl -Date: Tue, 19 Jun 2012 18:27:04 +0200 -Subject: [PATCH 5/5] correctly report power saving status - ---- - solid/solid/powermanagement.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/solid/solid/powermanagement.cpp b/solid/solid/powermanagement.cpp -index 8dc8535..faadea4 100644 ---- a/solid/solid/powermanagement.cpp -+++ b/solid/solid/powermanagement.cpp -@@ -73,7 +73,7 @@ Solid::PowerManagement::Notifier::Notifier() - - bool Solid::PowerManagement::appShouldConserveResources() - { -- return globalPowerManager->powerSaveStatus; -+ return globalPowerManager->managerIface.GetPowerSaveStatus(); - } - - QSet Solid::PowerManagement::supportedSleepStates() --- -1.7.9.2 - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch deleted file mode 100644 index 59c3174..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 76e0376d7582cfe5b898c56bf3779ca2279dace8 Mon Sep 17 00:00:00 2001 -From: Vishesh Handa -Date: Thu, 14 Jun 2012 02:55:32 +0530 -Subject: [PATCH 1/5] Revert "Disconnect before re-connecting. Soprano does - not do that for us." - -This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. - -This is being done so that KDE 4.8.x works with Soprano 2.7.6 ---- - nepomuk/core/nepomukmainmodel.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp -index 8dc0b1f..ff742d7 100644 ---- a/nepomuk/core/nepomukmainmodel.cpp -+++ b/nepomuk/core/nepomukmainmodel.cpp -@@ -97,7 +97,6 @@ public: - if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { - delete localSocketModel; - localSocketModel = 0; -- localSocketClient.disconnect(); - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); - kDebug() << "Connecting to local socket" << socketName; - if ( localSocketClient.connect( socketName ) ) { --- -1.7.9.2 - diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch deleted file mode 100644 index 206e654..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bde5aad1e9f7bfb6f8d5c60197797de4a315158d Mon Sep 17 00:00:00 2001 -From: Vishesh Handa -Date: Thu, 14 Jun 2012 02:56:31 +0530 -Subject: [PATCH 2/5] Revert "Always rec-connect if forced (ie. when Nepomuk - server restarts)" - -This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. - -This is done so that 4.8.x works with Soprano 2.7.6 ---- - nepomuk/core/nepomukmainmodel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp -index ff742d7..be23b38 100644 ---- a/nepomuk/core/nepomukmainmodel.cpp -+++ b/nepomuk/core/nepomukmainmodel.cpp -@@ -94,7 +94,7 @@ public: - - // we may get disconnected from the server but we don't want to try - // to connect every time the model is requested -- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { -+ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { - delete localSocketModel; - localSocketModel = 0; - QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); --- -1.7.9.2 - diff --git a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild index f6d4261..4178699 100644 --- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild @@ -198,18 +198,10 @@ src_prepare() { } src_configure() { - if use zeroconf; then - if has_version net-dns/avahi; then - mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) - else - die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found." - fi - else - mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) - fi - mycmakeargs+=( + mycmakeargs=( -DWITH_HSPELL=OFF -DWITH_ASPELL=OFF + -DWITH_DNSSD=OFF -DKDE_DEFAULT_HOME=.kde4 -DKAUTH_BACKEND=POLKITQT-1 -DBUILD_libkactivities=OFF @@ -236,6 +228,7 @@ src_configure() { $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) $(cmake-utils_use_with upnp HUpnp) + $(cmake-utils_use_with zeroconf Avahi) ) kde4-base_src_configure } diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index c87f773..7275417 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -201,18 +201,10 @@ src_prepare() { } src_configure() { - if use zeroconf; then - if has_version net-dns/avahi; then - mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) - else - die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found." - fi - else - mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) - fi - mycmakeargs+=( + mycmakeargs=( -DWITH_HSPELL=OFF -DWITH_ASPELL=OFF + -DWITH_DNSSD=OFF -DKDE_DEFAULT_HOME=.kde4 -DKAUTH_BACKEND=POLKITQT-1 -DBUILD_libkactivities=OFF @@ -239,6 +231,7 @@ src_configure() { $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) $(cmake-utils_use_with upnp HUpnp) + $(cmake-utils_use_with zeroconf Avahi) ) kde4-base_src_configure }