From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A740615802E for ; Mon, 1 Jul 2024 19:10:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D543DE2AB8; Mon, 1 Jul 2024 19:10:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B86C6E2AB8 for ; Mon, 1 Jul 2024 19:10:26 +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 02765343051 for ; Mon, 1 Jul 2024 19:10:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34C991DB1 for ; Mon, 1 Jul 2024 19:10:23 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1719859358.c8b649325d8e53ff99ff612900f0dd2998356f0e.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-6.1.49.9999.ebuild 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: c8b649325d8e53ff99ff612900f0dd2998356f0e X-VCS-Branch: master Date: Mon, 1 Jul 2024 19:10:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cbdfed89-0402-46cd-a117-7cf4921e8339 X-Archives-Hash: 205752e7f767b7adf5693bfbde56e143 commit: c8b649325d8e53ff99ff612900f0dd2998356f0e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 30 10:26:45 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 1 18:42:38 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8b64932 kde-plasma/plasma-desktop: Rename IUSE kaccounts -> webengine kde-apps/kaccounts-integration inevitably pulls in -providers which pulls in dev-qt/qtwebengine. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-desktop/metadata.xml | 2 +- .../plasma-desktop/plasma-desktop-6.1.49.9999.ebuild | 16 ++++++++-------- kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index 0d0782816b..a6a6f9e8ba 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -10,9 +10,9 @@ Use ibus input method via app-i18n/ibus - Build the OpenDesktop integration plugin Enable applets that use app-i18n/scim Enable screencast portal thumbnails using kde-plasma/kpipewire Enable gamepad support using media-libs/libsdl2 + Build the OpenDesktop integration plugin diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.1.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.1.49.9999.ebuild index d01673fc6a..596f8ef412 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.1.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.1.49.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 kaccounts scim screencast sdl +semantic-desktop" +IUSE="ibus scim screencast sdl +semantic-desktop webengine" RESTRICT="test" # missing selenium-webdriver-at-spi @@ -84,13 +84,13 @@ COMMON_DEPEND=" dev-libs/glib:2 x11-libs/xcb-util-keysyms ) - kaccounts? ( - kde-apps/kaccounts-integration:6 - >=net-libs/accounts-qt-1.16_p20220803[qt6] - ) 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.16_p20220803[qt6] + ) " DEPEND="${COMMON_DEPEND} >=dev-libs/wayland-protocols-1.25 @@ -115,8 +115,8 @@ RDEPEND="${COMMON_DEPEND} sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs - kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] ) screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) + webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] ) " BDEPEND=" dev-util/intltool @@ -151,10 +151,10 @@ src_configure() { -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged $(cmake_use_find_package ibus GLIB2) - $(cmake_use_find_package kaccounts AccountsQt6) - $(cmake_use_find_package kaccounts KAccounts6) $(cmake_use_find_package sdl SDL2) $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package webengine AccountsQt6) + $(cmake_use_find_package webengine KAccounts6) ) ecm_src_configure diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 203580bc45..4b1fd9b2fb 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 kaccounts scim screencast sdl +semantic-desktop" +IUSE="ibus scim screencast sdl +semantic-desktop webengine" RESTRICT="test" # missing selenium-webdriver-at-spi @@ -84,13 +84,13 @@ COMMON_DEPEND=" dev-libs/glib:2 x11-libs/xcb-util-keysyms ) - kaccounts? ( - kde-apps/kaccounts-integration:6 - >=net-libs/accounts-qt-1.16_p20220803[qt6] - ) 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.16_p20220803[qt6] + ) " DEPEND="${COMMON_DEPEND} >=dev-libs/wayland-protocols-1.25 @@ -115,8 +115,8 @@ RDEPEND="${COMMON_DEPEND} sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs - kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] ) screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) + webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] ) " BDEPEND=" dev-util/intltool @@ -151,10 +151,10 @@ src_configure() { -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged $(cmake_use_find_package ibus GLIB2) - $(cmake_use_find_package kaccounts AccountsQt6) - $(cmake_use_find_package kaccounts KAccounts6) $(cmake_use_find_package sdl SDL2) $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package webengine AccountsQt6) + $(cmake_use_find_package webengine KAccounts6) ) ecm_src_configure