gentoo resync : 15.12.2017

4 files changed, 6 insertions, 41 deletions

diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 38aca1eac3dd..80d320fd5d21 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,6 +1,5 @@
-AUX kidletime-5.37.0-qtdbus.patch 1195 BLAKE2B 21a7ec380c3a0f0c7eb30f736c52050e0f2f10567e535095d896f6bc8d3d8a59ee1f0c0b1f9d7c1e0109cb3efe7a3fa862af0ad6031cd97fbb105da819daa8aa SHA512 eb6d69f1b96fbd11e4487d869851d51247eafb63985c0b5e0b0849215c8f6257cb929e5fcafe515bb57621297022bc0cb91ccb1392f60844d4e0035101ebf38d
-DIST kidletime-5.37.0.tar.xz 26608 SHA256 3a472778722f38e5175ac55ff71a5e464ec98ecfd2ec759b7003612fe8c0a406 SHA512 444cfc25d162c4390ec0aa49b035bda1e5628972a634eb08c0cc9c48d513676669729470fc91cdf25ed98b9b6dd76b71159659bfecb4cbd61e029ad42398be27 WHIRLPOOL 20062019e3f8e3ade9d4c9e342508231c3741cf835f2db6a034d7fc09d452b7475e51998e05c978acb45da84e7e3cff8942943a23f70952e06e77fe3a1d315d7
-DIST kidletime-5.40.0.tar.xz 26616 SHA256 29e5a50cd961a1080c45334484abef1622dac50c20afa263ffdb6975f738da60 SHA512 b8c8c1de1c2261ad52ba80a11388a90ffa18c80153b58b0063184e14fe1c744465c150ef4e9be6692ca81330c52230029b406e8ae240e6738300f8977411a6ba WHIRLPOOL 0b4856c547eae7a119564a8faaff0fffdc8b60185929b7c9b961382d500fbe86058649254a6e0ca8d7abe025c167f422140dd9237e08a344d374d3aaa87dc785
-EBUILD kidletime-5.37.0.ebuild 907 BLAKE2B 96926de4e6dcd9ef717491a00bdcf4af45a6f2f3eba57d3606af64b96ba67cf39b5a4ec99f0027031d21775ee746c30d872c4ddfdcdd0a24ac10d228916d4fdf SHA512 2264aedc4ab159f280291fed6cb146ea1e2a906d9d5fdfaa788c4088b02a1c9b70289d80167e78f459c23847f9241eda4bae8e45b5f83beb5197509a72ba406b
-EBUILD kidletime-5.40.0.ebuild 855 BLAKE2B 99ec8be0c387a72843f913c347186bcb970cae569ed125e4ae2756a4f5fd38d5c379dc3be71e021f1ef7d4e1b3eb106212d452d74e60d0bec66dcf120fcaec0b SHA512 f89fb2f67dcd07089de6972dc3ea38a4e253fa8f2d03be62a5913e204dfe6a14190b518dc37ace6202bf295df36f28149db4613079a288c4392505e3d7f8f166
+DIST kidletime-5.40.0.tar.xz 26616 BLAKE2B 17c3e7d87156ad732f38ed0e4d0bdc4e4eb816d10686fd084a553216ba8ac4e5d0fc35590d5bcccb9deb100619539e79ec417643c31105e26b13ba392ff702b0 SHA512 b8c8c1de1c2261ad52ba80a11388a90ffa18c80153b58b0063184e14fe1c744465c150ef4e9be6692ca81330c52230029b406e8ae240e6738300f8977411a6ba
+DIST kidletime-5.41.0.tar.xz 26612 BLAKE2B c501488b442e3127816d870f6273f69f6c6fa1378003ccc96400b0e9110808a3b25b7a8f8f18990709e3b555ac439464be13d048bbd98d7748f809ff0138c411 SHA512 7dab05f459592ff4b81f56761cd04845c4c236a1674cdc273aef5604fcf5b649cc3a9ca6092d9222dfafaf2b38d9d783820e632d44228b5e5e26d1337f98f9ec
+EBUILD kidletime-5.40.0.ebuild 854 BLAKE2B f3ca435bdb9bd4165f9508f27dad19f15c8401f5c25c40a9985538ba295ee15be293420c45ab97cb3c17559905b144b4c7384ffb884cfa1de029228c6811be6d SHA512 f6f111cd2156340f0c1f1eb241cd8d2fc1e5046b9bd41155b948a2315f2f25beb9152956e34f1638c832374ec275ae9f7ba28561b3fad43856c245a1fad170a8
+EBUILD kidletime-5.41.0.ebuild 856 BLAKE2B 6b71eb90b450f32e2d18e37143afda59c4227041fff18744780216b912be6ec5c4c85e934c6d10a4e627d7ac2efe76ea3cba1093b0fa4856b03ebe74fa024a61 SHA512 6ec16458eb70ad62bc3cd7eb5c4106ba4055cbc67f697d6745e4b0b5903edc97dd2bb1dc7f19b67ce342fad60317df77a2fdb1961325910d4e8581c07ef195f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/files/kidletime-5.37.0-qtdbus.patch b/kde-frameworks/kidletime/files/kidletime-5.37.0-qtdbus.patch
deleted file mode 100644
index 44d1bc4beac2..000000000000
--- a/kde-frameworks/kidletime/files/kidletime-5.37.0-qtdbus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit e86d576d4030231617d191a569354e368a038384
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sat Aug 5 23:45:39 2017 +0200
-
-    Qt5DBus is only required with HAVE_XSCREENSAVER
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3c89d8..39cae72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,10 +32,6 @@ include(KDECMakeSettings)
- set(REQUIRED_QT_VERSION 5.6.0)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
- 
--if(NOT WIN32 AND NOT APPLE)
--    find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
--endif()
--
- if(APPLE)
-     cmake_find_frameworks(CoreFoundation Carbon)
- endif()
-@@ -66,6 +62,10 @@ if(X11_FOUND)
-     set(HAVE_XSCREENSAVER ${X11_Xscreensaver_FOUND})
-     add_feature_info("X-Screensaver based poller" HAVE_XSCREENSAVER "KIdleTime fallback mode (libXss)")
- 
-+    if(HAVE_XSCREENSAVER AND NOT WIN32)
-+        find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
-+    endif()
-+
-     if(NOT HAVE_XSCREENSAVER AND NOT HAVE_XSYNC)
-         message(FATAL_ERROR "\nNeither the XSync (libXext) nor XScreensaver (libXss) development package was found.\nPlease install one of them (XSync is recommended)")
-     endif()
diff --git a/kde-frameworks/kidletime/kidletime-5.40.0.ebuild b/kde-frameworks/kidletime/kidletime-5.40.0.ebuild
index c120bc0daa6a..fbdfe676f23f 100644
--- a/kde-frameworks/kidletime/kidletime-5.40.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.40.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kidletime/kidletime-5.37.0.ebuild b/kde-frameworks/kidletime/kidletime-5.41.0.ebuild
index 42a72b4b659c..f9b3ebb4a974 100644
--- a/kde-frameworks/kidletime/kidletime-5.37.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.41.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
@@ -29,8 +29,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.37.0-qtdbus.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	if ! use xscreensaver; then