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 6850F158041 for ; Sat, 9 Mar 2024 20:42:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F9E7E2A38; Sat, 9 Mar 2024 20:42:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 60B45E2A38 for ; Sat, 9 Mar 2024 20:42:52 +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 7417F33BEF1 for ; Sat, 9 Mar 2024 20:42:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C31F41049 for ; Sat, 9 Mar 2024 20:42:49 +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: <1710016955.50c1b4fc542dfb7a2b85259fc236119628ff2ce9.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-meta/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-meta/metadata.xml kde-plasma/plasma-meta/plasma-meta-6.0.49.9999.ebuild kde-plasma/plasma-meta/plasma-meta-9999.ebuild X-VCS-Directories: kde-plasma/plasma-meta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 50c1b4fc542dfb7a2b85259fc236119628ff2ce9 X-VCS-Branch: master Date: Sat, 9 Mar 2024 20:42:49 +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: b44dedc9-40fd-4efb-9c23-b8e3c3851aaa X-Archives-Hash: ac03327b6771312088878103566a878b commit: 50c1b4fc542dfb7a2b85259fc236119628ff2ce9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 9 15:39:11 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 9 20:42:35 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=50c1b4fc kde-plasma/plasma-meta: Add IUSE qt5 to trickle down integration USEdeps USE=qt5 is currently globally enabled by desktop profiles. Add a postinst warning coupled with the existence of dev-qt/qtgui. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-meta/metadata.xml | 1 + .../plasma-meta/plasma-meta-6.0.49.9999.ebuild | 21 ++++++++++++++++----- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 21 ++++++++++++++++----- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index 56bd305d63..3d7b2e409d 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -23,6 +23,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 diff --git a/kde-plasma/plasma-meta/plasma-meta-6.0.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.0.49.9999.ebuild index db33b4830c..1b0e517fbf 100644 --- a/kde-plasma/plasma-meta/plasma-meta-6.0.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-6.0.49.9999.ebuild @@ -11,14 +11,14 @@ SLOT="6" KEYWORDS="" 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 ++kwallet +networkmanager oxygen-theme plymouth pulseaudio qt5 +sddm sdk +smart systemd thunderbolt unsupported wacom +wallpapers +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} @@ -88,7 +87,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 +95,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? ( @@ -115,3 +115,14 @@ RDEPEND=" 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 +} diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index db33b4830c..1b0e517fbf 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -11,14 +11,14 @@ SLOT="6" KEYWORDS="" 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 ++kwallet +networkmanager oxygen-theme plymouth pulseaudio qt5 +sddm sdk +smart systemd thunderbolt unsupported wacom +wallpapers +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} @@ -88,7 +87,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 +95,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? ( @@ -115,3 +115,14 @@ RDEPEND=" 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 +}