gentoo resync : 23.06.2018

6 files changed, 46 insertions, 7 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index f922874b7dd5..edb8881905b8 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index 7f6923ce188e..f2095b4e2620 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1,5 +1,5 @@
 DIST rsibreak-0.12.7.tar.xz 396000 BLAKE2B 0c8f217b34083db2cdf06c89c6890a80c4304f89a6709ad1168b4f9a0a24a0ab40d023b8a7d7f25e70a48f6cdb491bb69795f9ff165976d8ee3fe1d3c966d184 SHA512 77da791a705549da159dee18ff160e051a79184e909af7ac9efcdbc2bcad66f6fc4994af71e0ccdf0033596cccc93c8d4642ae578846dc2aa38223c1a462008f
 DIST rsibreak-0.12.8.tar.xz 401368 BLAKE2B 3c082d4e957f7d48b7bdaef1ddd95cd2f41f616ed157d0f97cbd91558168c583c669caaad04b35f6f1b7ca2c2832134a2d08d986b134d21e1e6472eb7954dc1b SHA512 6ab0c43232e56278525ce5ba07a6c7a5f7bc5da74a8461e3cdaed7ae832304ac9f3c1b3ff0adfdeaab6b8231bdcecae4e8fee9529df97b8ce2208f4cf74f0eb1
 EBUILD rsibreak-0.12.7.ebuild 1230 BLAKE2B 8512b423ce0772cd296c0bb4d754d89070bd8c046981fa1a6205c51e2d15647ac0ea3534904a92982c690dc498bd5f99e930f2511354d1451728fdabbaaa762c SHA512 f30b0151577299570f512451e969defb2f12750cc40cde87df5b5e13ea0bfe1c10cab9a5553bb2ee4ed3384fe5844b588dc365733cde95c30f825fa87b106457
-EBUILD rsibreak-0.12.8.ebuild 1232 BLAKE2B fd30d257de25e17e0627168cfc4172674411b5051994c5d4270ed43ed96d9c27121790519e8723e819d6060836b753cbc33c74ed59d901de3a3b4f6fccc7b144 SHA512 3f2d4970ca228736cb183d44ae220c9539e74c9cc8907792a798789fec50ba8fc3317fc6cb6a29c80b3edf7956556511ee98319329ae448c82f4cb4ae0bda175
+EBUILD rsibreak-0.12.8.ebuild 1234 BLAKE2B 7977b4e16f278ec5216c01735ca268d00de6831a221689114f8328f218e18f5aba3da37e709534db26875359c06b9a296b8a9e6a989b8d95135d99ee087cd0a0 SHA512 7371161e5c496b047d55e3dbf710d21fcc6e5a5e8a47fb27c0d9136e4d823a206d2447c298ce20df9dde4165e985641e663a64d86b3b7bb874704b307c6c9324
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/rsibreak/rsibreak-0.12.8.ebuild b/kde-misc/rsibreak/rsibreak-0.12.8.ebuild
index 66fbdb8bcdfa..b93f7f61df6d 100644
--- a/kde-misc/rsibreak/rsibreak-0.12.8.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.12.8.ebuild
@@ -4,16 +4,17 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-inherit kde5 versionator
+VIRTUALX_REQUIRED="test"
+inherit kde5 eapi7-ver
 
 DESCRIPTION="Small utility which bothers you at certain intervals"
 HOMEPAGE="https://userbase.kde.org/RSIBreak"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
 fi
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/systemd-kcm/Manifest b/kde-misc/systemd-kcm/Manifest
index 0ce8df4852e0..d7849f47c181 100644
--- a/kde-misc/systemd-kcm/Manifest
+++ b/kde-misc/systemd-kcm/Manifest
@@ -1,3 +1,4 @@
+AUX systemd-kcm-1.2.1-qt-5.11b3.patch 1166 BLAKE2B 3b53dbe00b4395cd73cea1ac659e34d110baa9b8aa73d49a154aa6b556c58691fdf4ec7297fb7ddd4b8291f300f532a09476f43ee2f384be501aa80875cc1bd6 SHA512 27cf2430e6428459a2a172acf50066abed43478723ace6b033efacdc78b021c7af9e42d0de51539e76b4408e00e601d353fb51831626320e6b078507af1567fe
 DIST systemd-kcm-1.2.1.tar.xz 86268 BLAKE2B ca9c1682d3dc352b4165fa6e08c5ddc249fa7ae47da3e16e3f8de02f6e2e3020252125464c856d48b1cda3e42f61892d3113a89397cac05ef66658595e74ebcb SHA512 e3dcf6db6513b88b37e724b3a472939fbb155642a605527ca669e71c5a0b8616c4c6add1796037c94170af788bce519415c698f22f010f1133c0e14452245e76
-EBUILD systemd-kcm-1.2.1.ebuild 810 BLAKE2B 860359d44466b65bbac4486d245b76708cd219512e7dec1d0c9aec98bf3f55d5a9a8b448a635e6d111b3e2bb005168791b20008ba7c4355ceba784b2035ec925 SHA512 5cd40f03d197f265f7f98d5a4366aef3c56974a8e883bbb240b7efb9054a04c211a171032568427fb1558b8574a4addf353b2f22392c53b5292449986bd6f797
+EBUILD systemd-kcm-1.2.1.ebuild 835 BLAKE2B db5a5c34dfa312157c9212bf06ce2bc31637029d051ca4c7051d5596917cf4815fbcebfc367f248b40b5f725ebd0d95b0731e3738d2b28b3e52f3266b31918b3 SHA512 c8bab6517292aa82507c333933de117e64aba507e5ce6d73d366aaecfb404323988e42af802b3fd610469f44e4272754cf49620a2e939d92328a5b4847232084
 MISC metadata.xml 722 BLAKE2B 54cc68f238e06b902ac59eaed20ee66aba3647f6eacacf33456ceaef56f4723d4722e4810643f39014da05b0635270b01c029261be0d441e752e93cdea2535cd SHA512 7306fea413580f75843812f0b0ce1510cee6387f31df5e411ddfa6b25d6409cfeb8465e40bffe352255a13cec21278b38ceb18276964406549b35220f8a8e9c7
diff --git a/kde-misc/systemd-kcm/files/systemd-kcm-1.2.1-qt-5.11b3.patch b/kde-misc/systemd-kcm/files/systemd-kcm-1.2.1-qt-5.11b3.patch
new file mode 100644
index 000000000000..5a4140c6bdbb
--- /dev/null
+++ b/kde-misc/systemd-kcm/files/systemd-kcm-1.2.1-qt-5.11b3.patch
@@ -0,0 +1,36 @@
+From 67246a4a2c52343d2805b597e48a1713b5b9918c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 17 Jun 2018 22:05:02 +0200
+Subject: [PATCH] Fix build with Qt 5.11.0_beta3 (no more qt5_use_modules)
+
+Reviewers: rthomsen, svuorela
+
+Reviewed By: svuorela
+
+Differential Revision: https://phabricator.kde.org/D13545
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ca373fd..d01670a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,6 +27,8 @@ ki18n_wrap_ui(kcmsystemd_SRCS ../ui/kcmsystemd.ui)
+ 
+ add_library(kcm_systemd MODULE ${kcmsystemd_SRCS})
+ target_link_libraries(kcm_systemd
++                      Qt5::Widgets
++                      Qt5::DBus
+                       KF5::Auth
+                       KF5::ConfigWidgets
+                       KF5::CoreAddons
+@@ -37,5 +39,3 @@ target_link_libraries(kcm_systemd
+                       ${Boost_LIBRARIES}
+                       ${JOURNALD_LIBRARIES})
+ install(TARGETS kcm_systemd DESTINATION ${CMAKE_INSTALL_PLUGINDIR})
+-
+-qt5_use_modules(kcm_systemd Widgets DBus)
+-- 
+2.17.1
+
diff --git a/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild b/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
index 1fac61ed3d98..b5c491e0a3e9 100644
--- a/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
+++ b/kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,10 +27,11 @@ CDEPEND="
 	sys-apps/systemd
 "
 DEPEND="${CDEPEND}
-	>=dev-libs/boost-1.45
 	sys-devel/gettext
 "
 RDEPEND="${CDEPEND}
 	!kde-misc/kcmsystemd:4
 	!kde-misc/systemd-kcm:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )