gentoo auto-resync : 15:01:2023 - 17:55:24

3 files changed, 10 insertions, 86 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 0df7e488be2a..0cabb9d5f294 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,5 @@
-DIST plasma-framework-5.101.0.tar.xz 3303508 BLAKE2B e951f30e69cf979cde50fc46dbd197ee92d53875532efc3146bd421d121ba37bfed2f520a2b18afd0cb8a932b5738671049a25a312b762644bc2825a300b9cb9 SHA512 c1bd66810213634d533e7d63d256c57a923f0d26c2bdcca17ab29be46664bc3bfa578b739c89b3cf429bda10cf6a71ec8cc1ec60a554273719e9b6e041dcdad5
 DIST plasma-framework-5.102.0.tar.xz 3305096 BLAKE2B 225bb5a2d3cc5e0631defa59bafaeef49e6b1c4cf650d19d4b15cd270ec47ab2a613d4e3689bdea8d6cee19ed26aff78cb5c24a1ef0c8245fac4b80fa2a2147d SHA512 0db243ad6425c1f543149f4d939b7787cc20af526d4e81246debf7910b05a318cf18822ab0518d70dbb2641ad5853359a4e23104138f131c3a4073237c56d4b1
 DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb
-EBUILD plasma-5.101.0.ebuild 1929 BLAKE2B 3c196da48b5361359df601ce88846a2f566b2a72c030747d1ba7878d8fe4832343161bbd038aace80b5f9e43ab2a22b77d5470c7419433ce14557427b68a66be SHA512 9bd131a8cd874c9a9d444c6a2db43d67e52987f64146df90ed90e37f8a585c26ec651655f0fab57bdc17eb5463e41705722fdc8cb4452c531434c4e499e951c6
-EBUILD plasma-5.102.0.ebuild 1929 BLAKE2B 1d1b1f5c97f73e7c8fd6f768d8c4bee693562092bb68ba44de9bdb23b5931e75a3ad1b7345c715923848bcd242a5631899147aa1e94510da8c9152aa67fde932 SHA512 c60b37c3173723cac7c30e97b8fd29294e2ff0c6a30bc8473e3ec8aaf315c533b2686964bd4dde10742eb27adbfd801d463aab5ba4698e4e1c1581ed5a2018db
+EBUILD plasma-5.102.0-r1.ebuild 1945 BLAKE2B 3108cbd3ea42e08678c6aabc3eebcb84a5a547aaf995d3de52e5cf3394a4aa7f75cd54f665f04b85538b82d8fe93ec84f444de8ad2b38f9e2d3b4a699295758a SHA512 7cf34b6f753f4c6bfe80389969796eeb8c6ab57042c585da1e8d1229ed8e4401ea994e5a909f7c9ff78d0431d24ae06b9672895a4cdfdb5f6c64d6d8152e65dc
 EBUILD plasma-5.99.0.ebuild 1926 BLAKE2B f241e720ae257014353cc38da113054dee7165a535a4e38d4c116c9f3a3680308f16d286ce4e76f28d50e56e3acbbb0c26d410f21449d9e88b32624ca30c83bf SHA512 7400aa7e239e3f9855850cb534f5bb6e173326cd2c2c7f05f66435c9bf96afcb3fa61d5e86d3a387c45b0ed75a8b438e7b895fd3e0c9b86b0fefe705c1c236a6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/plasma-5.101.0.ebuild b/kde-frameworks/plasma/plasma-5.101.0.ebuild
deleted file mode 100644
index a27e1ef1b167..000000000000
--- a/kde-frameworks/plasma/plasma-5.101.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		-DWITHOUT_X11=$(usex !X)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.102.0.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r1.ebuild
index 7ca2834ea35a..d664114eab21 100644
--- a/kde-frameworks/plasma/plasma-5.102.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.102.0-r1.ebuild
@@ -13,18 +13,20 @@ DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
+IUSE="gles2-only man wayland"
 
 RESTRICT="test"
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	=kde-frameworks/kactivities-${PVCUT}*:5
 	=kde-frameworks/karchive-${PVCUT}*:5
 	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
@@ -41,21 +43,18 @@ RDEPEND="
 	=kde-frameworks/kpackage-${PVCUT}*:5
 	=kde-frameworks/kservice-${PVCUT}*:5
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
+	x11-libs/libX11
+	x11-libs/libxcb
+	!gles2-only? ( media-libs/libglvnd[X] )
 	wayland? (
 		=kde-frameworks/kwayland-${PVCUT}*:5
 		media-libs/libglvnd
 	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
 "
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
+	x11-base/xorg-proto
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
@@ -65,7 +64,6 @@ src_configure() {
 		$(cmake_use_find_package man KF5DocTools)
 		$(cmake_use_find_package wayland EGL)
 		$(cmake_use_find_package wayland KF5Wayland)
-		-DWITHOUT_X11=$(usex !X)
 	)
 
 	ecm_src_configure