commit: c8b649325d8e53ff99ff612900f0dd2998356f0e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 10:26:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
</upstream>
<use>
<flag name="ibus">Use ibus input method via
<pkg>app-i18n/ibus</pkg></flag>
- <flag name="kaccounts">Build the OpenDesktop integration
plugin</flag>
<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="webengine">Build the OpenDesktop integration
plugin</flag>
</use>
</pkgmetadata>
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
