From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1690385-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C5495158042
for <garchives@archives.gentoo.org>; Sat, 16 Nov 2024 08:22:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 208F3E08C4;
Sat, 16 Nov 2024 08:22:57 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 04849E08C4
for <gentoo-commits@lists.gentoo.org>; Sat, 16 Nov 2024 08:22:57 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 221A0342FA7
for <gentoo-commits@lists.gentoo.org>; Sat, 16 Nov 2024 08:22:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B9AF0AE7
for <gentoo-commits@lists.gentoo.org>; Sat, 16 Nov 2024 08:22:54 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1731744695.43e0b96f6c33b0a6b03bb04591585bfeb9537f1a.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/plasma-desktop/metadata.xml kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
X-VCS-Directories: kde-plasma/plasma-desktop/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 43e0b96f6c33b0a6b03bb04591585bfeb9537f1a
X-VCS-Branch: master
Date: Sat, 16 Nov 2024 08:22:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f2d983c0-1cd2-48ad-89c3-5e3933431fd5
X-Archives-Hash: 646ad72c413a6dc3b087a9927c03e347
commit: 43e0b96f6c33b0a6b03bb04591585bfeb9537f1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 08:11:11 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 08:11:35 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=43e0b96f
kde-plasma/plasma-desktop: Switch IUSE tablet -> input_devices_wacom
Bug: https://bugs.gentoo.org/942817
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-desktop/metadata.xml | 1 -
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index cd57c1d37f..a6a6f9e8ba 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -13,7 +13,6 @@
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
<flag name="screencast">Enable screencast portal thumbnails using <pkg>kde-plasma/kpipewire</pkg></flag>
<flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag>
- <flag name="tablet">Build system settings module for tablets using <pkg>dev-libs/libwacom</pkg></flag>
<flag name="webengine">Build the OpenDesktop integration plugin</flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index b197836176..de72a06e68 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS=""
-IUSE="ibus scim screencast sdl +semantic-desktop +tablet webengine"
+IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
RESTRICT="test" # missing selenium-webdriver-at-spi
@@ -82,14 +82,14 @@ COMMON_DEPEND="
dev-libs/glib:2
x11-libs/xcb-util-keysyms
)
- scim? ( app-i18n/scim )
- sdl? ( media-libs/libsdl2[joystick] )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
- tablet? (
+ input_devices_wacom? (
dev-libs/wayland
dev-libs/libwacom:=
>=dev-qt/qtwayland-${QTMIN}:6
)
+ scim? ( app-i18n/scim )
+ sdl? ( media-libs/libsdl2[joystick] )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
webengine? (
kde-apps/kaccounts-integration:6
>=net-libs/accounts-qt-1.17[qt6(+)]
@@ -98,7 +98,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-base/xorg-proto
- tablet? ( >=dev-libs/wayland-protocols-1.25 )
+ input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 )
test? (
>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
>=kde-plasma/kactivitymanagerd-${PVCUT}:6
@@ -124,7 +124,7 @@ BDEPEND="
dev-util/intltool
>=kde-frameworks/kcmutils-${KFMIN}:6
virtual/pkgconfig
- tablet? ( dev-util/wayland-scanner )
+ input_devices_wacom? ( dev-util/wayland-scanner )
"
PATCHES=(
@@ -153,9 +153,9 @@ 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)
- -DBUILD_KCM_TABLET=$(usex tablet)
$(cmake_use_find_package webengine AccountsQt6)
$(cmake_use_find_package webengine KAccounts6)
)