gentoo resync : 29.05.2018

4 files changed, 2 insertions, 149 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index cefaab6d86ac..76b4694e8cb9 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,5 @@
 AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771c4557c65f68dfe8cd5e6dcb55f6f65d5e1d0b220cde0901f56baeb8ffd194c604115f64c6d6496b19be6e9254cf37f567d SHA512 e564dc6c0e28762917713d37aec099d1ff522f64e26aabc906ffbb7dd4056316bbab43b1b3c71e1f55659471e270f17afe8673a76dcd75efa1a5c8e399bdd7f5
-AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
-DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
 DIST kwin-5.12.5.tar.xz 4981704 BLAKE2B 0631d7cd1f387ef63512601be39fcc280ad3dd751fa0ac8836da969fe526b68a95e81027d1943d8f0679a78ae9e9e062f4d292482497ba19227997a5d746a35e SHA512 9a99645455f17b14ede45d656a83eb753fcd02c2ed4cca10045db84a75c610ba0732ffacca780805b3f990ab1ada6861f9036588d45c1bf487dbf1ff5bf9ba22
-EBUILD kwin-5.11.5.ebuild 2413 BLAKE2B 3cc059fee6f94872050cf63e5d15998de7a25f9b2f22cfe31a11cd8f4b632f43d6b7b77902ed3207620b5755389a102d10902e8b7cf464d7b110f3f718a9c575 SHA512 93e83dfd948e22611a514b084bf964eacdeea645b49330e57df71d522438a4766836e71d60742e53890022d4e5a4cd9b3130fd026c6738a00ea70c0dda3f263a
-EBUILD kwin-5.12.5.ebuild 2662 BLAKE2B 655a43e911d1880bb1dc85cc74ef5b446b44051158e5e820fbc595115df660c7184cada567cfbfca89327c8317ebe1f4fbe93acd74043de8661be02f10c35f87 SHA512 86bbc11d51ce5384cb4a4702c983595c790f56cac36f876bf5f4c135f445cbc82cff5c1fffda560b0b21348fa41a3cd7cbb1ddd90b0f743a9023432ed788767e
+EBUILD kwin-5.12.5.ebuild 2661 BLAKE2B 260007308479977f25dddb9c01d014a63e8067901dbd7a9a126074380a6ac36d6290709533a7e051a57dc39dbaede636060971874cc78f57bfe52c3262dbdb7f SHA512 a4ca33fc2c85625ce1c38aed86f8977983e9f307021ada8cf5ec1c2692542dea34a82ad3c3bacc92faebe0062fa13e5e8f88e1c9c1064435fb944cb86a7144ea
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch b/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch
deleted file mode 100644
index 1b7c61455783..000000000000
--- a/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cd544890ced4192d07467c89e23adbb62d8cea5c Mon Sep 17 00:00:00 2001
-From: Milian Wolff <mail@milianw.de>
-Date: Mon, 18 Dec 2017 11:40:35 +0100
-Subject: Fix build with CMake 3.10
-
-Looks like a classic false-positive, but this makes the compile
-pass for me without making the code harder to read:
-
-AutoMoc error
--------------
-  "/ssd/milian/projects/kf5/src/kde/workspace/kwin/kcmkwin/kwinscripts/main.cpp"
-The file contains a K_PLUGIN_FACTORY macro, but does not include "main.moc"!
-Consider to
- - add #include "main.moc"
- - enable SKIP_AUTOMOC for this file
-
-So we just add the include and then get rid of the duplicate
-definition of the plugin factory and the problem is resolved.
----
- kcmkwin/kwinscripts/main.cpp   | 2 ++
- kcmkwin/kwinscripts/module.cpp | 2 --
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kcmkwin/kwinscripts/main.cpp b/kcmkwin/kwinscripts/main.cpp
-index f5ee04b..baa5175 100644
---- a/kcmkwin/kwinscripts/main.cpp
-+++ b/kcmkwin/kwinscripts/main.cpp
-@@ -22,3 +22,5 @@
- 
- K_PLUGIN_FACTORY(KcmKWinScriptsFactory,
-                  registerPlugin<Module>("kwin-scripts");)
-+
-+#include "main.moc"
-diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
-index a0d698e..ccf7d41 100644
---- a/kcmkwin/kwinscripts/module.cpp
-+++ b/kcmkwin/kwinscripts/module.cpp
-@@ -40,8 +40,6 @@
- 
- #include "version.h"
- 
--K_PLUGIN_FACTORY_DECLARATION(KcmKWinScriptsFactory)
--
- Module::Module(QWidget *parent, const QVariantList &args) :
-     KCModule(parent, args),
-     ui(new Ui::Module),
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/kwin/kwin-5.11.5.ebuild b/kde-plasma/kwin/kwin-5.11.5.ebuild
deleted file mode 100644
index d18de789f3a5..000000000000
--- a/kde-plasma/kwin/kwin-5.11.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.5
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(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
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.10.95-test-optional.patch"
-	"${FILESDIR}/${PN}-5.11.5-cmake-3.10.patch"
-)
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-}
diff --git a/kde-plasma/kwin/kwin-5.12.5.ebuild b/kde-plasma/kwin/kwin-5.12.5.ebuild
index 93d07a79efef..2541c24b2488 100644
--- a/kde-plasma/kwin/kwin-5.12.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.12.5.ebuild
@@ -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="