gentoo Easter resync : 12.04.2020

4 files changed, 6 insertions, 33 deletions

diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 5df17946ad22..12db330eaf22 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,6 +1,5 @@
-AUX kwayland-5.64.0-qt-5.14.0.patch 696 BLAKE2B 4f10c013496cd26dc7eb088db43ec30b822832e1eac22fdb604c64ee0ac28cc4858fc002175b62ff50718aaa757cdbadb1914c8bfc175a2b05a96331760158e3 SHA512 d4afe4336ec261d8cbf2ca8be41f5ca5e3443f9ed809436e112b1709da278bb80fd3f244f97984e905850f577eded18f5fa33ef6ebc2d53319a9c1ef8149e6a4
-DIST kwayland-5.64.0.tar.xz 339244 BLAKE2B 59c036163c022912f1c71568a6a493d279508d87310285b96f0e44e6cc0d414e02d718e6bdffeeb980e61fd2f09a2eb50eed3a5ed7839b11e41d1ddab817b70e SHA512 b56fb196f9fa3328c30c63d72ec474ef0ad81cef4b873d3ce9fbd67faa95a968609763ce19122058ef27f97857391436513c242bc300e305542bb0386dd1978d
 DIST kwayland-5.67.0.tar.xz 339916 BLAKE2B d1a4758c733fdb6af84f86789561fd1212a13e7a4f77dae11461c6a2f9018a89973e8ec1fa3e85f07edebcdc3acf28cd75c88135961400ee1bdc828a6acc8a14 SHA512 4f8c4aa2b9faba02b4198cec3c787bfb7e8da6133123146d9c8bac3f20dc9ceb4cc136260dc3af7408e52561156ebf09c67ea62f2551b11a1991e24a72ae0121
-EBUILD kwayland-5.64.0.ebuild 753 BLAKE2B 10514c4c96c8cc9c54af88ad08648d94bc1f6917ba008deeb1b34d4dea0c206f4fc7482c63d743c7e08a0bb581dd004b1137ecb0be3e2e819638434cde24ac7b SHA512 980617cd2459d3bb5d6961a4e029edb0e0cec1ee5d07aff06164dca5c37de7238e23ecaea8970eea1ac882ee5019005652fc1a71067b9cd094796842eb849938
-EBUILD kwayland-5.67.0.ebuild 708 BLAKE2B 4f3afbfacde03ee4b646ab8a3c54a8cbcf88dfb283a8bedb6a4c3dd87fdd079185640b10e9356f852005650b054316f41ff3c6081360f8361f32c7bdd998e96b SHA512 062e8b400e6b657ba1389015ff9f8e0a3b87923df26df22b41ce366ba8c905bc5bb2d6c0a338a3a785d3f83deba1f9b4528f4757d495e07f45cba3dd41542293
+DIST kwayland-5.69.0.tar.xz 346224 BLAKE2B d166c74771673146e783e6fc55ebd7915079641548afb18d0a97d1fc619e78727a093a33ae65f182a7cc3fa6daf4b7ef2260d5aadec45747cdea2e0b7c4d48a4 SHA512 e1931969ad7cd2d9af45d5dc9cdadd2517a7a4109ac143c7405a0132601fc822043a540e916d26bdbcb109daf2888699d9a57a781853f1e37518b9e9cb18304a
+EBUILD kwayland-5.67.0.ebuild 705 BLAKE2B 2ca0123df648e10334285e8cb370eb05a5837bef3380ecb3fa0e5de68cf935c66f276ba0ac0cdfc45e4ae4095a062bd6b82154fe52745606dd298f3169acb427 SHA512 08fb9acfc4a8850fc4436e7c8534daf3ac8445949c2fdf36649552b94767def7f8e4e4a9745dc52a3d148d5ad9d0739a7159754f82ad0d80b32b9d76e2afe148
+EBUILD kwayland-5.69.0.ebuild 708 BLAKE2B 4f3afbfacde03ee4b646ab8a3c54a8cbcf88dfb283a8bedb6a4c3dd87fdd079185640b10e9356f852005650b054316f41ff3c6081360f8361f32c7bdd998e96b SHA512 062e8b400e6b657ba1389015ff9f8e0a3b87923df26df22b41ce366ba8c905bc5bb2d6c0a338a3a785d3f83deba1f9b4528f4757d495e07f45cba3dd41542293
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch b/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch
deleted file mode 100644
index 818e9894765e..000000000000
--- a/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d Mon Sep 17 00:00:00 2001
-From: Roman Gilg <subdiff@gmail.com>
-Date: Fri, 22 Nov 2019 15:26:23 +0100
-Subject: Add missing include for Qt 5.14 build
-
----
- src/server/xdgoutput_interface.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/server/xdgoutput_interface.cpp b/src/server/xdgoutput_interface.cpp
-index e32ccf9..b2b2cba 100644
---- a/src/server/xdgoutput_interface.cpp
-+++ b/src/server/xdgoutput_interface.cpp
-@@ -25,6 +25,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- 
- #include <wayland-xdg-output-server-protocol.h>
- 
-+#include <QHash>
-+
- namespace KWayland
- {
- namespace Server
--- 
-cgit v1.1
diff --git a/kde-frameworks/kwayland/kwayland-5.67.0.ebuild b/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
index 62e01942123b..67d9b40b80da 100644
--- a/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.67.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.64.0.ebuild b/kde-frameworks/kwayland/kwayland-5.69.0.ebuild
index 5a81ee17e71e..62e01942123b 100644
--- a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.69.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="
@@ -30,5 +30,3 @@ RDEPEND="${COMMON_DEPEND}
 
 # All failing, I guess we need a virtual wayland server
 RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14.0.patch" )