gentoo auto-resync : 27:11:2024 - 02:00:00

2 files changed, 11 insertions, 6 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 74805e4d63b0..725a39ab978e 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -3,8 +3,9 @@ AUX plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch 2741 BLAKE2B d9d52f034b
 AUX plasma-desktop-6.2.3-tablet-kcm-optional.patch 3229 BLAKE2B f74fe4e69930e366911d09d7887486e7ab9c8517ecb628246833d510da7f5c114ea3c6dfd71c32c3d8f3e7c9205ece26618e077b7bac97b23ca7a1e73cec5103 SHA512 1bc677637d9eb1bc929a805362d7d8b88c5479eac0652d45b38f538702197355f58ae3f14659af93afee2d6e25236b0c8e2a5fba0da1138710dd7830aa998e22
 DIST plasma-desktop-6.1.5.tar.xz 16144320 BLAKE2B 60b8ad791325e506551746790d23347c501caaa1550c470e5157e8902da07162691b30a36c53c6910d1daa32ea3e3801562d4acbf0feceaf35d72ad32662f809 SHA512 db5698874bd66be0194f868cc037af2521b924afb02a56036696504c2b3e8dec3d59ba9228203f7b0d08ffaaa36137f10081207fa79d748c5044b37063507b6f
 DIST plasma-desktop-6.2.3.tar.xz 16334344 BLAKE2B 4dfa7c55e6d2bedcc1a52057bc86663b014b1aff54450cc521f0cb79814c08c1bf449408b3161b32d1b157a026f80c1a96dab0aad892322754d725ae3a3b4cb9 SHA512 72e8af1b71d3ed7e22f14ec044108a5a49daa4764586549e878378f4b4ffdfde72ef83c862102571e576724748c712b40e2f6dc302dafe68eee50c401d3f7645
+DIST plasma-desktop-6.2.4.tar.xz 16335912 BLAKE2B 95b7ca6b5c98f372ffe9c57f1d06bd0dc6ed7050891640fc4a523cc5373c904086f7c47cec84f168be2384798cde0eb6d8bdaa8f8cc0759baf3e52fdab888ffa SHA512 9a766a2799bc96a803433a649884307fc40eb4e5d3c10578a3568ab433833b2a65462b5efb9275295dba5384eccb0365c52e7d98d42374c297adee9f42678f1e
 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
 EBUILD plasma-desktop-6.1.5-r1.ebuild 5230 BLAKE2B 4e2a80948e6150c64e95529ba68de9107e274b5a05567bb834f621e24d9d2af9f2a4493eecf4e91f2c5638effc1e105ab40d8d9fb4b884ae79434875ce29f7d9 SHA512 f8abbeb311568051381a42b442928ddc05327cdb61c383e3a76543fa3b33a637a21cfe98a5cdff70dc80e4c22b2bf56d2bd340dc50d0588220c7e3604a35b57a
 EBUILD plasma-desktop-6.2.3-r1.ebuild 5497 BLAKE2B c331d4d27ef3f398a3da037d347dce3f73328503ab45c2878deb78a49a1630856308577208a48fb7bb6aad1b8f141e11007f705e130129b128b28595b24236a7 SHA512 bbd3a1d5e152e64bd854f52d745f2d163a29c762bc41a4ad860488b5508ac08e7f1ffb47677fe58f1efcf2e7512139dff9aa0b9193e1609b21b577749cf1f0f8
-EBUILD plasma-desktop-6.2.3.ebuild 5221 BLAKE2B db5dc4f8d2bd80d79164a6b376c199e3566c891a39135033be26b8a365b2023d8ec3dda70d4c18050ef15ac2af3f1f0aa154838fc8eb0b9c70b087c739ed1ac9 SHA512 29ba20714a5ee5ad2325320b95ad2485ef0c0e59b7fd10957445e1069a2cddbecb1b7a65ca0184be97da096ac0c6921a6d416256185b125ac1b0302958f08a96
+EBUILD plasma-desktop-6.2.4.ebuild 5435 BLAKE2B 2890eb498c41f356056f9d4d73b595d3f297e68cc185a5a744c005f3bad5ed1bc118d03761c3e86fecdbbf863ef89655976f2c7c625f45968df3e79d25852bb9 SHA512 557b7c46a64d617bd805fbcedba4935c3d9230c92c9bf2c80a41db554d5b82dc7f1942d82411cf93def911c6e18f4e72bfb9a087b5b1afeb9cf17060deb1731d
 MISC metadata.xml 560 BLAKE2B 04dc70f5284d8fc3e486718b5eb17ee773f90ff807828640f7ff63c0dffcc3bbe4f84600262d4f11ccb6df8d3af5e69aac1b81ddfd2a5ec50dee9bbbb5a5f656 SHA512 7a1df153e7327f1c3fcf7e5027745612bf6c7c24ceb66b71aec77ceecf43aada94f8dba7a33bac72524067845691831ec5cda411650fd9e834245d7d3dd86f0e
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild
index 6b64626f5104..f22e598f9785 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ibus scim screencast sdl +semantic-desktop webengine"
+IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
 
@@ -25,12 +25,10 @@ RESTRICT="test" # missing selenium-webdriver-at-spi
 # kde-frameworks/kwindowsystem[X]: Uses KX11Extras
 COMMON_DEPEND="
 	dev-libs/icu:=
-	dev-libs/wayland
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwayland-${QTMIN}:6
 	>=kde-frameworks/attica-${KFMIN}:6
 	>=kde-frameworks/karchive-${KFMIN}:6
 	>=kde-frameworks/kauth-${KFMIN}:6
@@ -84,6 +82,10 @@ COMMON_DEPEND="
 		dev-libs/glib:2
 		x11-libs/xcb-util-keysyms
 	)
+	input_devices_wacom? (
+		dev-libs/wayland
+		>=dev-qt/qtwayland-${QTMIN}:6
+	)
 	scim? ( app-i18n/scim )
 	sdl? ( media-libs/libsdl2[joystick] )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
@@ -93,9 +95,9 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/wayland-protocols-1.25
 	dev-libs/boost
 	x11-base/xorg-proto
+	input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 )
 	test? (
 		>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 		>=kde-plasma/kactivitymanagerd-${PVCUT}:6
@@ -119,13 +121,14 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="
 	dev-util/intltool
-	dev-util/wayland-scanner
 	>=kde-frameworks/kcmutils-${KFMIN}:6
 	virtual/pkgconfig
+	input_devices_wacom? ( dev-util/wayland-scanner )
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${PN}-6.2.3-tablet-kcm-optional.patch" # bug 942817
 )
 
 src_prepare() {
@@ -150,6 +153,7 @@ src_configure() {
 		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
 		$(cmake_use_find_package ibus GLIB2)
+		-DBUILD_KCM_TABLET=$(usex input_devices_wacom)
 		$(cmake_use_find_package sdl SDL2)
 		$(cmake_use_find_package semantic-desktop KF6Baloo)
 		$(cmake_use_find_package webengine AccountsQt6)