gentoo auto-resync : 10:03:2024 - 00:44:50

4 files changed, 23 insertions, 10 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 33bb398d7d68..e2e006d64404 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 58122d8698d9..c23977c8ffa9 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD plasma-meta-5.27.10.ebuild 4194 BLAKE2B e32ea70e8b0abc8e783ebb27faf4edd95ed499106fa8511200e3719d8e7e4c2a9b49fe985464cde450114e2553be210c699830e79d0872ec72ea2a755350fd65 SHA512 70907c2772149612c09285b647a00c3379eb011ddc78f4b3f1914c0ea343218fd7fdbd339f68e5a0d14c1f7c9cf2d4ba89e8625102faf505ec016c156eec1e06
 EBUILD plasma-meta-5.27.11.ebuild 4197 BLAKE2B abc05a2dd2db7b6b9da7d68818bec5eb6a4973afd1562dbf46e0e0eca5cfaa11429a5176713f09a46e527abb6a88ea9e220b69d164b408357cf90aa767e82e75 SHA512 8e27eefd6c20d79bce00640de47b9d748582e162956ee17700043ddd9a8bbe931adc574eb3df0de7fa23e3a7bbd74b9be7220b0f9214869299367951f61e889b
-EBUILD plasma-meta-6.0.1.ebuild 4168 BLAKE2B e85200c0fa732edf36c48045481dc31d288514f8790a3ffc9d31825ca5c5ea9e92965d373523d646b4aeaaeded983bf9e02ec285d8dc413849009b4e21a61a6a SHA512 0fc0638cdd4855fe9b0e25283fe79e732a2b6efc3ab33fe18d50cf15f3d0b84dd10688c5eeabfbbba4c02e5020977c27c5bf5eb51876613c309fb0f45a884a69
-MISC metadata.xml 2827 BLAKE2B 55b4d1b5e6092152dbb9fafe3d3339fba986e33031b62b55b2c699d8949d75894f0a459ddafaa9b59d3a9b3bb2b32cc68d3b2c932e7fcb7cd4ac3f7815ee4b07 SHA512 54f3b4a50181e20dcd74cc4d35c47594d9e2725f3d53992425a84dec573f93ef2a4447a8e80c75c7b7cfdb8e1e75e5f27bba47238474465d257888e1db022cda
+EBUILD plasma-meta-6.0.1-r1.ebuild 4642 BLAKE2B ebb4226aee28596b93cfca9f0c42b295e0d9e7995818c33cd61508665440ae34e8e0c69958401972e7db4654754f5048b9d69124e68da77ec992d470708839cd SHA512 a0c7279a4f622b1082c7f4a1c8157b1f9258dea922124c470a688a0ed2b02d487159a51412bd7dbb1a0c47546af3e308be91d1594d3e41fe019c7a1b221091a7
+MISC metadata.xml 3059 BLAKE2B d3e3485ebb608a603d13f0263533dd97d04ed0f9e9610ee429808f521770a92e59f9fea4992c8d280139cfbe5468029af073813d8195745c7182ae56a95e5d2a SHA512 0576008409be1377c1ac443aad3d039a525e62aba4b7fc93230869a0054640abea0ba40ea69aa3013a8ec7ad48e0c35ba312468626fee5662b41ccaaf86ceb63
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 @@
 		<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>
@@ -32,6 +33,7 @@
 		<flag name="unsupported">Allow packages that are known to ruin runtime experience ** DO NOT FILE BUGS WITH THIS ENABLED **</flag>
 		<flag name="wacom">Pull in <pkg>kde-plasma/wacomtablet</pkg> control center module</flag>
 		<flag name="wallpapers">Install wallpapers for the Plasma Workspace</flag>
+		<flag name="webengine">Use <pkg>kde-apps/khelpcenter</pkg> to access the locally installed KDE Help System Handbook</flag>
 		<flag name="xwayland">Enable Wayland windows screensharing to XWayland applications via <pkg>gui-apps/xwaylandvideobridge</pkg></flag>
 	</use>
 </pkgmetadata>
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
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
+}