gentoo resync : 16.04.2022

3 files changed, 72 insertions, 0 deletions

diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index b1ec3ad881d1..898bc6d7ec31 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,8 @@
+AUX kwayland-5.93.0-pkgconfig.patch 848 BLAKE2B c82a1ef52b6387730d11c278399a8843a9da256b309b265116a52512e179f73e5225b013fe317eed92bb76c805ec8d050c9b632ff801da26f15609780716802e SHA512 00aed0607c93f6ecfb99d5b2246a081479405e7d56f6e395402cde41742f5a040b2bfe08030c515b0f593b17f411ba7c1bfbbbfdcb2574c9d20aff2fc7dacf28
 DIST kwayland-5.90.0.tar.xz 334260 BLAKE2B ac19196f247c330abe1fff7c168c464d10591e4987091082fb475d77067793827ba2c04cb56ab224a4904f5a62b18c911112397686de2298223ca2509b596f99 SHA512 583acc24dba3c21fbaab826cf7c98eaf4a4291f83d43f9dfef7490520e68199b1c4e1a687ace9a7f71b110e61227c653d98c35a06e29d3301a1eb083ae15fdf6
 DIST kwayland-5.92.0.tar.xz 335360 BLAKE2B 57d42694c46b090fd62d1886f4818134f9d5e19f78665d4a8bf9f05572d5523c3580ce4c4f8da869371c2bf1de9bbac4d3a0d7fa40993b94291e12af2e4c9472 SHA512 982140987c5cb561c25afc2d8e573db37764fde1b87d395af0c21d8d63e9a6a70dd4fdac3b70881588acca28b4c45a2af470fd9ca260fbd9bd14ed4e299fa2ed
+DIST kwayland-5.93.0.tar.xz 335328 BLAKE2B 1282d44e2858b2cc5206d98dd9be4f08950d0da22a499b527bea081890b8c2048459a6d1b619b2bcc92fbac62a8676068fc07273494a6bcf49272e377d4d49dd SHA512 26157575ee49916ff1e75fccccfbd192536dbb1f914432c6e784d52eb95343c61caf26b5d3e5e6ddf1f7f439494debadbd29263631cb9489e12b98b1b9eb30c4
 EBUILD kwayland-5.90.0.ebuild 923 BLAKE2B daf14d1458f1e785cab98201313b4306beb842c8688106d57b3e6ad5d2bd84bd3738108ddbadd7862afcd858a3be5aed94996232238a64a2b13037d22edc01ad SHA512 bbbab9143de3697657e58334bfbdd744f3d5a7a7ac987d62f9e0bd925f812e89ee36e0852956ae1de3e570cb73d6b21393de5645225b16635a07be3d65985aee
 EBUILD kwayland-5.92.0.ebuild 926 BLAKE2B 1418b4e08be7046a529c9bd35337c8fbc895cb375466d2db108171bc3b0a488f1e640a7e078d8d168cac052423c6dc5ad58f6661131327c4ed3ec3200a3e05d9 SHA512 670a55ce859cc4645d764d65fbc773cc9fabeb9ce5dc227abf95347f3a41111de50399c2ea83d7b64e878fb67a979834c304f95048dd559c00c667845dcedb18
+EBUILD kwayland-5.93.0-r1.ebuild 987 BLAKE2B 0f055179967adab73ec7ea2bc4573ef0ea5f155626c4b5039d9842cdc272a8fe42f6ea5b99454d7d631f91e1e3150eb25485426ed081939e59b855c8d8f6a532 SHA512 4391df758b987971be9eb4974079596bbcd7602aa6da178de9c3089d10bbfb5b5e551c1b87e7551a37399df8362eac38bd5a9344468e77c8eeb5987142932e19
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch b/kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch
new file mode 100644
index 000000000000..8b58aa012669
--- /dev/null
+++ b/kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch
@@ -0,0 +1,27 @@
+From 9e70125d2991a2a2ab64e606ccabd223848945b0 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 15 Apr 2022 16:34:56 +0200
+Subject: [PATCH] Fix include path in the generated pkgconfig file
+
+Reported at
+https://invent.kde.org/frameworks/kwayland/-/merge_requests/52#note_433191
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34bb0ff..873c8cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwayland_version.h
+ 
+ if (NOT WIN32)
+     ecm_generate_pkgconfig_file(BASE_NAME KF5WaylandClient
+-      INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}
++      INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KWayland
+       DEPS Qt${QT_MAJOR_VERSION}Gui
+     INSTALL)
+ endif()
+-- 
+GitLab
+
diff --git a/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
new file mode 100644
index 000000000000..b8ea897904cf
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.4.0
+	>=dev-libs/wayland-protocols-1.15
+	sys-kernel/linux-headers
+"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	>=dev-util/wayland-scanner-1.19.0
+"
+
+PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" ) # bug 838376