gentoo resync : 12.05.2022

4 files changed, 5 insertions, 53 deletions

diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 898bc6d7ec31..7886bb092f80 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,8 +1,6 @@
 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
+EBUILD kwayland-5.92.0.ebuild 884 BLAKE2B 6354d55621540c294d19496bfb9f484ccd4a52b9c9603c379b8db1535b4e99e393490ce45143eafc4781e4f57b47f64b1e1dbf839ff12bf0f41ae02e4e03b224 SHA512 8997a29c9c5c46f060b4bac0c596032087bc7187a7843d6c9667801fbfa49afc101e984d90196d320b13aab832fa5caa355cc3bf225810057abcc80bc1ca577e
+EBUILD kwayland-5.93.0-r1.ebuild 948 BLAKE2B d31ecc9d4e56d296c4063d56d196962f02fc734a28cecc7adf6496cdf87af8a0428b1f6301a9452077e0def2d6450079b80c3745848a87a25874e4ce5529168b SHA512 d9fd1a7b06d1c6e4ead138c98a332ba2e04fba5f25f83647a8af19ff5a12dfd517889c8a8fc7f7c5b6b5c75eb27ff105ee181821bf5b1b500b9b675e8aefc8f2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwayland/kwayland-5.90.0.ebuild b/kde-frameworks/kwayland/kwayland-5.90.0.ebuild
deleted file mode 100644
index 9f3cc1c739dd..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.90.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
-"
diff --git a/kde-frameworks/kwayland/kwayland-5.92.0.ebuild b/kde-frameworks/kwayland/kwayland-5.92.0.ebuild
index b99be2cf1a42..07ae8574a7a3 100644
--- a/kde-frameworks/kwayland/kwayland-5.92.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.92.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
@@ -32,9 +32,6 @@ DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	>=dev-util/wayland-scanner-1.19.0
 "
diff --git a/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
index b8ea897904cf..d1168d736615 100644
--- a/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
@@ -32,10 +32,7 @@ DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	>=dev-util/wayland-scanner-1.19.0
 "