commit: 50c1b4fc542dfb7a2b85259fc236119628ff2ce9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Mar 9 15:39:11 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@ <flag name="oxygen-theme">Pull in Oxygen icons, sound theme and visual style for KDE Plasma</flag> <flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag> <flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag> + <flag name="qt5">Pull in required packages for seamless integration of KF5/Qt5-based applications</flag> <flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag> <flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag> <flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag> 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 +}