gentoo resync : 22.10.2018

3 files changed, 13 insertions, 12 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 5e0bad5e0e5a..47aee3a8a189 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,9 +1,9 @@
 AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771c4557c65f68dfe8cd5e6dcb55f6f65d5e1d0b220cde0901f56baeb8ffd194c604115f64c6d6496b19be6e9254cf37f567d SHA512 e564dc6c0e28762917713d37aec099d1ff522f64e26aabc906ffbb7dd4056316bbab43b1b3c71e1f55659471e270f17afe8673a76dcd75efa1a5c8e399bdd7f5
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
-DIST kwin-5.12.5.tar.xz 4981704 BLAKE2B 0631d7cd1f387ef63512601be39fcc280ad3dd751fa0ac8836da969fe526b68a95e81027d1943d8f0679a78ae9e9e062f4d292482497ba19227997a5d746a35e SHA512 9a99645455f17b14ede45d656a83eb753fcd02c2ed4cca10045db84a75c610ba0732ffacca780805b3f990ab1ada6861f9036588d45c1bf487dbf1ff5bf9ba22
 DIST kwin-5.12.7.tar.xz 6521368 BLAKE2B 5cf898b85ead7c7b88017b86ddee2c4c0444637414094c07b972681be45c2eeac43cb4c3ceb167d22b5e3f685216922c065b76e5db555d22fd378faa2b2e7a94 SHA512 acb58cd5681727aa2ebcfb75d2abc3ea636811b490d8b15a4b89e55cfb81ce8aeed9568a52d4d1c3274852f26823ec5301a6721d9be64ba9a2b65e04f6029760
 DIST kwin-5.13.5.tar.xz 6525660 BLAKE2B b159dd8223f018e7a17d8e17296c8f6bd40d95ed666839198a82b6c65c13965e0ba49af45ac13ac579567a4f2e3f088c571f2f300103a4477284327609076272 SHA512 73f2d16403b7972db8ebe228569504d1e6345a633f8b006b6399575b0ed26dc5a3d047be0f476dedfce16acaaba0e3870e62059d96e4f8471fecafca7eee5a14
-EBUILD kwin-5.12.5.ebuild 2661 BLAKE2B 260007308479977f25dddb9c01d014a63e8067901dbd7a9a126074380a6ac36d6290709533a7e051a57dc39dbaede636060971874cc78f57bfe52c3262dbdb7f SHA512 a4ca33fc2c85625ce1c38aed86f8977983e9f307021ada8cf5ec1c2692542dea34a82ad3c3bacc92faebe0062fa13e5e8f88e1c9c1064435fb944cb86a7144ea
+DIST kwin-5.14.1.tar.xz 6569548 BLAKE2B dc2cd037b5b22e25425f2240a92d2c1a8266cb7a50c85e0f0399638901e5ea3bb624bbb275f894978ffe22c48d8a15171babfee3ae3e04793ec2b9bfc564fb88 SHA512 ffe553458ef684060be298df4e2d20c2349d0987fc42746af67d6b08f8cf6f49539ac285c4cf8f788ce2d2f6f81049aaebc70164f45b77678eac2ae5b4a02ece
 EBUILD kwin-5.12.7.ebuild 2619 BLAKE2B 68d90c5bba00288f04507d62226667e9d53d1f226950b7438e9118cdc921454443a0f6b44443d29d4e7ebe6de34f7e1f77a3aaf2a2f0cac556d9aa249de1b388 SHA512 8e322ba5508901d2436a00e09fac55040b04ddd5aa82ed50fffd7a24037c5ddab243474ea1a02f32fb55d78fbdbdac46db9b3ef672c5d2d3aaa3e53f252a9c6d
-EBUILD kwin-5.13.5.ebuild 2665 BLAKE2B dce20fb008d41dd8ba00e3dd66d0876130fe4c1f17ede1be73324d5d0b5f2fa5ce7788b615ef0db09e2c6b56daa80718aa1bf12ec5095fa6870e4f62d06adbc1 SHA512 e12ce093ac4f57f4bbed727f3f07099d877447dce8aa8c420a618b653e75c78720c7db42ab11bcfaf12c87dec514a7ea0abf4361d4916f5e5fe08fb0ece3b6a8
+EBUILD kwin-5.13.5.ebuild 2660 BLAKE2B 2b4ccd708c175999c1d6699b982705aab487fef681dda1df36c7c80b658cf26c4e28bcd2f4c02aca0938fe8f60e2fab6b064b7f18b4b95705c7639c8a66fd34d SHA512 5eb976f750d8b8d0d30f3d454957512f423a2df194e4d626479dfa8a3b2e8af11726682f2e2a35d40a2e0f772e4f4c727e751eabf5c47814bd1f76c74957f99c
+EBUILD kwin-5.14.1.ebuild 2633 BLAKE2B b250135395b592bf38f073284691a62570952393c8e10f7bbabb513f4a12155a65a2d49c35ce9ea22ef02c3ebac645680001b12541cb79cb7666dc936f2db288 SHA512 e6395ce7a4ff1fb1784b2eb34847b36b1c3e890a743f146174c87dedfd3e7663baee2353eb2d2fcec1f9751de90d6726c158e2b8fef04699f5503d2423925e1f
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.13.5.ebuild b/kde-plasma/kwin/kwin-5.13.5.ebuild
index a692b36f42e2..903f56fb309d 100644
--- a/kde-plasma/kwin/kwin-5.13.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="caps gles2 multimedia"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kwin/kwin-5.12.5.ebuild b/kde-plasma/kwin/kwin-5.14.1.ebuild
index 2541c24b2488..d144e2c92230 100644
--- a/kde-plasma/kwin/kwin-5.12.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="caps gles2 multimedia"
 
 COMMON_DEPEND="
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtsensors)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.5
+	>=dev-libs/libinput-1.9
 	>=dev-libs/wayland-1.2
 	media-libs/fontconfig
 	media-libs/freetype
@@ -70,10 +70,10 @@ COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
 	$(add_qt_dep qtvirtualkeyboard)
 	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
 	!kde-plasma/kwin:4
 	!kde-plasma/systemsettings:4
 "
@@ -82,11 +82,12 @@ DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtconcurrent)
 	x11-base/xorg-proto
 "
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-5.10.95-test-optional.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"