gentoo resync : 15.12.2019

4 files changed, 16 insertions, 271 deletions

diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index b0226859d502..ae8b9733321b 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,6 +1,5 @@
-AUX kwayland-5.60.0-system-wl-protocols.patch 10861 BLAKE2B 9e49babd1bd48214196fd76d303b7746cb33161741f2ba0a25473533990bca0cafd534eda4b6f73d9122d309ca9b2ec0e640debc9ccdd728ace6a7bb5bcab225 SHA512 0fd535a8141b2e57071b4297eb1093291327a0350617cd9ae3feab966558bbda2095e1c9f5f57560f7ffd7943b2f2131056e15afb1428ad9857d3184d1c9713d
-DIST kwayland-5.60.0.tar.xz 344868 BLAKE2B 54f021380a461b19941d1c17f81887fd102f3c172a650fd2d5cb51d4539a0accc80c942122e190f29d9c3edcaccbb46ae42576d51659a0001e7b3e13ee058467 SHA512 63c4e968a7a492f0e1b2af2f6c511b02e4e56adc35a0504ba9c7c8cea4e463847e36c2ca7c498d3dd2307949fcf62b247f0a85c83ccfd8ab74ac5908dc2784ea
 DIST kwayland-5.64.0.tar.xz 339244 BLAKE2B 59c036163c022912f1c71568a6a493d279508d87310285b96f0e44e6cc0d414e02d718e6bdffeeb980e61fd2f09a2eb50eed3a5ed7839b11e41d1ddab817b70e SHA512 b56fb196f9fa3328c30c63d72ec474ef0ad81cef4b873d3ce9fbd67faa95a968609763ce19122058ef27f97857391436513c242bc300e305542bb0386dd1978d
-EBUILD kwayland-5.60.0.ebuild 666 BLAKE2B 9d536411cadf9fbb5615e266fe490e6c083548c1eee13ff7b7267889b63fa25c54a1f86a964f380139c20bc41202f4adb23992496871aa07616a1212807364c6 SHA512 55a1f22651d20309c113395cac513e13b298c934bd9dec404fa6b39ccbebcda243c257d259d715dc6fce38b37163fd4ae9465fca72932a3badba405ae0677818
-EBUILD kwayland-5.64.0.ebuild 708 BLAKE2B 1f634172ca6bd1ae73c3d7d507e641d8003d1da6c6772408bc4008944c0ea13b588b702f66587e8dfafcc3759d2a0c6143c7889a5fcbea0ebe523bfdabd48915 SHA512 67a7bbdcb0179955f51d22d5d1a1a97a953ef1ff5da7561d9f8ab74433101d7d346be33e9665edb2391e735da54e3e5a797187985e3d92f52abdb1955a55838d
+DIST kwayland-5.65.0.tar.xz 340220 BLAKE2B ffdcf10aff95926efb62f905fb4bf104efc7421f18a6e2d86b97c10aba6191503f23a56e6d9d84c3af1111e5429a165d8ece5db030daae62f82aeb943925b6fb SHA512 e7ecc5e2b2044fbc90e9b0d2358fbb813ed01e6873f0c37ed2fa561aae3b5c14e7ca8f491de41e3c0a0f0e055cd16cbe83eb3bba248a0611a4eb1964192b5336
+EBUILD kwayland-5.64.0.ebuild 705 BLAKE2B 1f47e282b1adb0a004616008beb558f14658876837c31dfd6992f3505566dc01775c2a6d5ffa70bd7cc6f6ccd92565b5fc699e003d80bdaacf77215bc88fe357 SHA512 be9f956b5d20fb5cfbb153027749ff504b66ccb513f080bea807d042b9ce2065d8e93c83da2a40b421cc85202b399864b2945b37ab0961d4bdc85867213bfd71
+EBUILD kwayland-5.65.0.ebuild 708 BLAKE2B 1f634172ca6bd1ae73c3d7d507e641d8003d1da6c6772408bc4008944c0ea13b588b702f66587e8dfafcc3759d2a0c6143c7889a5fcbea0ebe523bfdabd48915 SHA512 67a7bbdcb0179955f51d22d5d1a1a97a953ef1ff5da7561d9f8ab74433101d7d346be33e9665edb2391e735da54e3e5a797187985e3d92f52abdb1955a55838d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/files/kwayland-5.60.0-system-wl-protocols.patch b/kde-frameworks/kwayland/files/kwayland-5.60.0-system-wl-protocols.patch
deleted file mode 100644
index 641acf7bc7b0..000000000000
--- a/kde-frameworks/kwayland/files/kwayland-5.60.0-system-wl-protocols.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From ed0138f2f56d3cc0e523f10c3a9180d3119fc8f0 Mon Sep 17 00:00:00 2001
-From: Vlad Zagorodniy <vladzzag@gmail.com>
-Date: Mon, 8 Jul 2019 00:05:53 +0200
-Subject: [PATCH] Use wayland-protocols
-
-Summary:
-So far we've been copying protocol specifications from wayland-protocols
-repo to kwayland repo. The main issue with copying is that we have to
-keep xml files in sync manually. A better approach would be to use xml
-specs straight from wayland-protocols package.
-
-Test Plan: Compiles.
-
-Reviewers: #kwin, #frameworks, romangg, davidedmundson
-
-Reviewed By: #kwin, romangg, davidedmundson
-
-Subscribers: davidedmundson, apol, romangg, asturmlechner, kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D22216
----
- CMakeLists.txt                           |  7 ++-
- cmake/Modules/FindWaylandProtocols.cmake | 60 ++++++++++++++++++++++++
- src/client/CMakeLists.txt                | 18 +++----
- src/server/CMakeLists.txt                | 18 +++----
- 4 files changed, 83 insertions(+), 20 deletions(-)
- create mode 100644 cmake/Modules/FindWaylandProtocols.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 480d2d0..5d3e468 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ include(FeatureSummary)
- find_package(ECM 5.59.0  NO_MODULE)
- set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
- feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
--set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake/Modules)
- 
- include(FeatureSummary)
- include(GenerateExportHeader)
-@@ -33,13 +33,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWAYLAND
- set(REQUIRED_QT_VERSION 5.10.0)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent Gui)
- 
--find_package(Wayland 1.13 COMPONENTS Client Server)
-+find_package(Wayland 1.15 COMPONENTS Client Server)
- set_package_properties(Wayland PROPERTIES
-                        TYPE REQUIRED
-                       )
- 
- find_package(WaylandScanner)
- 
-+find_package(WaylandProtocols 1.15)
-+set_package_properties(WaylandProtocols PROPERTIES TYPE REQUIRED)
-+
- find_package(EGL)
- set_package_properties(EGL PROPERTIES TYPE REQUIRED)
- 
-diff --git a/cmake/Modules/FindWaylandProtocols.cmake b/cmake/Modules/FindWaylandProtocols.cmake
-new file mode 100644
-index 0000000..a3879d3
---- /dev/null
-+++ b/cmake/Modules/FindWaylandProtocols.cmake
-@@ -0,0 +1,60 @@
-+#.rst:
-+# FindWaylandProtocols
-+# -------
-+#
-+# Try to find wayland-protocols on a Unix system.
-+#
-+# This will define the following variables:
-+#
-+# ``WaylandProtocols_FOUND``
-+#     True if (the requested version of) wayland-protocols is available
-+# ``WaylandProtocols_VERSION``
-+#     The version of wayland-protocols
-+# ``WaylandProtocols_DATADIR``
-+#     The wayland protocols data directory
-+
-+#=============================================================================
-+# Copyright 2019 Vlad Zagorodniy <vladzzag@gmail.com>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PKG_wayland_protocols QUIET wayland-protocols)
-+
-+set(WaylandProtocols_VERSION ${PKG_wayland_protocols_VERSION})
-+pkg_get_variable(WaylandProtocols_DATADIR wayland-protocols pkgdatadir)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(WaylandProtocols
-+    FOUND_VAR WaylandProtocols_FOUND
-+    REQUIRED_VARS WaylandProtocols_DATADIR
-+    VERSION_VAR WaylandProtocols_VERSION
-+)
-+
-+include(FeatureSummary)
-+set_package_properties(WaylandProtocols PROPERTIES
-+    DESCRIPTION "Specifications of extended Wayland protocols"
-+    URL "https://wayland.freedesktop.org/"
-+)
-diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
-index e50d5c4..d3aa7a3 100644
---- a/src/client/CMakeLists.txt
-+++ b/src/client/CMakeLists.txt
-@@ -143,27 +143,27 @@ ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
-     BASENAME text-input-v2
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-shell-unstable-v6.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml
-     BASENAME xdg-shell-v6
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/relative-pointer-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
-     BASENAME relativepointer-unstable-v1
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/pointer-gestures-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
-     BASENAME pointer-gestures-unstable-v1
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/pointer-constraints-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
-     BASENAME pointer-constraints-unstable-v1
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-foreign-unstable-v2.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
-     BASENAME xdg-foreign-unstable-v2
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/idle-inhibit-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
-     BASENAME idle-inhibit-unstable-v1
- )
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
-@@ -176,17 +176,17 @@ ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
- )
- 
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-output-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-output/xdg-output-unstable-v1.xml
-     BASENAME xdg-output-unstable-v1
- )
- 
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-shell.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
-     BASENAME xdg-shell
- )
- 
- ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-decoration-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
-     BASENAME xdg-decoration-unstable-v1
- )
- 
-diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
-index c8860c3..3263108 100644
---- a/src/server/CMakeLists.txt
-+++ b/src/server/CMakeLists.txt
-@@ -125,7 +125,7 @@ ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/relative-pointer-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
-     BASENAME relativepointer-unstable-v1
- )
- 
-@@ -150,27 +150,27 @@ ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-shell-unstable-v6.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml
-     BASENAME xdg-shell-v6
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/pointer-gestures-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
-     BASENAME pointer-gestures-unstable-v1
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/pointer-constraints-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
-     BASENAME pointer-constraints-unstable-v1
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-foreign-unstable-v2.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
-     BASENAME xdg-foreign-unstable-v2
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/idle-inhibit-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
-     BASENAME idle-inhibit-unstable-v1
- )
- 
-@@ -190,17 +190,17 @@ ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-output-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-output/xdg-output-unstable-v1.xml
-     BASENAME xdg-output
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-shell.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
-     BASENAME xdg-shell
- )
- 
- ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
--    PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-decoration-unstable-v1.xml
-+    PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
-     BASENAME xdg-decoration
- )
- 
--- 
-2.22.0
-
diff --git a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
index dc0c7976a439..b1e978e691f9 100644
--- a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://cgit.kde.org/kwayland.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kwayland/kwayland-5.60.0.ebuild b/kde-frameworks/kwayland/kwayland-5.65.0.ebuild
index 52a9c981f861..dc0c7976a439 100644
--- a/kde-frameworks/kwayland/kwayland-5.60.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.65.0.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://cgit.kde.org/kwayland.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui 'egl')
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
 	>=dev-libs/wayland-1.15.0
 	media-libs/mesa[egl]
+"
+DEPEND="${COMMON_DEPEND}
 	>=dev-libs/wayland-protocols-1.15
 "
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtwayland 'egl(+)')
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtwayland-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-system-wl-protocols.patch" )
-
 # All failing, I guess we need a virtual wayland server
 RESTRICT+=" test"