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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1839158041 for ; Sat, 9 Mar 2024 23:27:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAF4AE2A11; Sat, 9 Mar 2024 23:27:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3618E2A11 for ; Sat, 9 Mar 2024 23:27:05 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE1F9335D2B for ; Sat, 9 Mar 2024 23:27:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F116F1121 for ; Sat, 9 Mar 2024 23:27:02 +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: <1710026792.5210a456080df3357837c6ca7408b47f5ebfe94b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-meta/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-meta/metadata.xml kde-plasma/plasma-meta/plasma-meta-6.0.1-r1.ebuild kde-plasma/plasma-meta/plasma-meta-6.0.1.ebuild X-VCS-Directories: kde-plasma/plasma-meta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5210a456080df3357837c6ca7408b47f5ebfe94b X-VCS-Branch: master Date: Sat, 9 Mar 2024 23:27:02 +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: 6f059900-b1f8-4a24-a9b8-7472b38791cc X-Archives-Hash: 31654f50b697d8a53927a1c4f03a5201 commit: 5210a456080df3357837c6ca7408b47f5ebfe94b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 9 23:13:33 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 9 23:26:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5210a456 kde-plasma/plasma-meta: Add IUSE qt5, webengine USE=qt5 is currently globally enabled by desktop profiles, its addition here is used to sync down integration USEdeps in the relevant dependencies. Also add a postinst warning coupled with the existence of dev-qt/qtgui. Add IUSE webengine for kde-apps/khelpcenter:6 to avoid dependency on dev-qt/qtwebengine:6. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-meta/metadata.xml | 2 ++ ...ta-6.0.1.ebuild => plasma-meta-6.0.1-r1.ebuild} | 27 +++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index 715252bddc69..d99c868979a6 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -25,6 +25,7 @@ Pull in Oxygen icons, sound theme and visual style for KDE Plasma Pull in Breeze theme for sys-boot/plymouth Install Plasma applet for PulseAudio volume management + Pull in required packages for seamless integration of KF5/Qt5-based applications Pull in the x11-misc/sddm display manager and system settings module Pull in kde-plasma/plasma-sdk for Plasma development Pull in kde-plasma/plasma-disks for disk health monitoring @@ -32,6 +33,7 @@ Allow packages that are known to ruin runtime experience ** DO NOT FILE BUGS WITH THIS ENABLED ** Pull in kde-plasma/wacomtablet control center module Install wallpapers for the Plasma Workspace + Use kde-apps/khelpcenter to access the locally installed KDE Help System Handbook Enable Wayland windows screensharing to XWayland applications via gui-apps/xwaylandvideobridge diff --git a/kde-plasma/plasma-meta/plasma-meta-6.0.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.0.1-r1.ebuild similarity index 82% rename from kde-plasma/plasma-meta/plasma-meta-6.0.1.ebuild rename to kde-plasma/plasma-meta/plasma-meta-6.0.1-r1.ebuild index cbd2949a4727..e38e671c9a36 100644 --- a/kde-plasma/plasma-meta/plasma-meta-6.0.1.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-6.0.1-r1.ebuild @@ -10,15 +10,15 @@ LICENSE="metapackage" SLOT="6" KEYWORDS="~amd64" IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt -cups discover +display-manager +elogind +firewall flatpak grub gtk +handbook -+kwallet +networkmanager oxygen-theme plymouth pulseaudio +sddm sdk +smart -systemd thunderbolt unsupported wacom +wallpapers +xwayland" +cups discover +display-manager +elogind +firewall flatpak grub gtk +kwallet ++networkmanager oxygen-theme plymouth pulseaudio qt5 +sddm sdk +smart systemd +thunderbolt unsupported wacom +wallpapers webengine +xwayland" REQUIRED_USE="^^ ( elogind systemd )" RDEPEND=" !${CATEGORY}/${PN}:5 - >=kde-plasma/breeze-${PV}:${SLOT} + >=kde-plasma/breeze-${PV}:${SLOT}[qt5?] >=kde-plasma/kactivitymanagerd-${PV}:${SLOT} >=kde-plasma/kde-cli-tools-${PV}:${SLOT} >=kde-plasma/kdecoration-${PV}:${SLOT} @@ -33,7 +33,6 @@ RDEPEND=" >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksystemstats-${PV}:${SLOT} >=kde-plasma/kwayland-${PV}:${SLOT} - >=kde-plasma/kwayland-integration-${PV}:5 >=kde-plasma/kwin-${PV}:${SLOT}[lock] >=kde-plasma/kwrited-${PV}:${SLOT} >=kde-plasma/layer-shell-qt-${PV}:${SLOT} @@ -45,7 +44,7 @@ RDEPEND=" >=kde-plasma/plasma-activities-${PV}:${SLOT} >=kde-plasma/plasma-activities-stats-${PV}:${SLOT} >=kde-plasma/plasma-desktop-${PV}:${SLOT} - >=kde-plasma/plasma-integration-${PV}:${SLOT} + >=kde-plasma/plasma-integration-${PV}:${SLOT}[qt5?] >=kde-plasma/plasma-systemmonitor-${PV}:${SLOT} >=kde-plasma/plasma-welcome-${PV}:${SLOT} >=kde-plasma/plasma-workspace-${PV}:${SLOT} @@ -80,7 +79,6 @@ RDEPEND=" >=kde-plasma/kde-gtk-config-${PV}:${SLOT} x11-misc/appmenu-gtk-module ) - handbook? ( kde-apps/khelpcenter:* ) kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} ) networkmanager? ( >=kde-plasma/plasma-nm-${PV}:${SLOT} @@ -88,7 +86,7 @@ RDEPEND=" ) oxygen-theme? ( >=kde-frameworks/oxygen-icons-6.0.0:* - >=kde-plasma/oxygen-${PV}:${SLOT} + >=kde-plasma/oxygen-${PV}:${SLOT}[qt5?] >=kde-plasma/oxygen-sounds-${PV}:${SLOT} ) plymouth? ( @@ -96,6 +94,7 @@ RDEPEND=" >=kde-plasma/plymouth-kcm-${PV}:${SLOT} ) pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} ) + qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 ) sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} ) smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} ) systemd? ( @@ -109,9 +108,21 @@ RDEPEND=" ) wacom? ( >=kde-plasma/wacomtablet-${PV}:${SLOT} ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} ) + webengine? ( kde-apps/khelpcenter:6 ) xwayland? ( >=gui-apps/xwaylandvideobridge-0.4.0 ) " # Optional runtime deps: kde-plasma/plasma-desktop RDEPEND="${RDEPEND} accessibility? ( app-accessibility/orca ) " + +pkg_postinst() { + if ! use qt5 && has_version dev-qt/qtgui; then + ewarn "KF5- and Qt5-based applications will exhibit various integration bugs" + ewarn "and generally look out of place in Plasma 6 without the dependencies" + ewarn "enforced by kde-plasma/plasma-meta[qt5]." + ewarn + ewarn "This warning message is being displayed because dev-qt/qtgui:5 is" + ewarn "currently installed which indicates the use of such applications." + fi +}