summaryrefslogtreecommitdiff
path: root/kde-plasma/plasma-meta
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/plasma-meta')
-rw-r--r--kde-plasma/plasma-meta/Manifest6
-rw-r--r--kde-plasma/plasma-meta/metadata.xml2
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-6.1.5.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-6.1.4-r1.ebuild)6
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-6.2.2.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-5.27.11-r2.ebuild)88
4 files changed, 71 insertions, 31 deletions
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 49d312297e7a..553f5a42273d 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-meta-5.27.11-r2.ebuild 4216 BLAKE2B 52a4b3e6b4f18d3881f29883ef9510e7ee9f8b5be5645f2fd4285e08b8af3d7371f5b5d29f0a6897c32a1b8f86f123750bab380de6e7e0c7776cb05d84f0f8ec SHA512 456e5d864a99dc50b642f8965529c6ed465f670cf01a2d1be2297bbea5098a802dd96c75b29ab0786591806a98c885b34ff6e516d750705483b97d5a846993d3
-EBUILD plasma-meta-6.1.4-r1.ebuild 5367 BLAKE2B 0a7b0c8289c5f4e8d79051012cbfb41e26ed066d1ac5924d67471aa76ab00498ce3a1fa9235e389157b1d4f72dcbf1314893d65d6d92b71759bf851300271dc1 SHA512 578890951e037b15145d9127e5677ea4f741db862539213264493f06acc23133c62cb001a60d884525b55e94a909b64d44601ae3a867079d532e55b5df39be20
-MISC metadata.xml 3059 BLAKE2B d3e3485ebb608a603d13f0263533dd97d04ed0f9e9610ee429808f521770a92e59f9fea4992c8d280139cfbe5468029af073813d8195745c7182ae56a95e5d2a SHA512 0576008409be1377c1ac443aad3d039a525e62aba4b7fc93230869a0054640abea0ba40ea69aa3013a8ec7ad48e0c35ba312468626fee5662b41ccaaf86ceb63
+EBUILD plasma-meta-6.1.5.ebuild 5432 BLAKE2B 4b00c94a24d32cf2e587a0a13fa1ff1211366c6fe7a8a775f1013d2b1935fcbb9c29f41b0fd31a7ec104a9aab9b6c24888d6ca045097f526b91342593e46ce12 SHA512 da80de091831e783b445621e99b604183ce1bebbc7c64fd30d50510d447f3f3265ebb7e6bd8a62f53b00c89a67787f0867f8a3478da9671c8c561ab72b65d259
+EBUILD plasma-meta-6.2.2.ebuild 5509 BLAKE2B 45a0458cea4df11f9cfc9a0e770d3ccf00f943e73055760a5830d7736297718ee261f3fa7a423a6bf120a24da0e9f10d44fa0cc5cb5247314d9df8d04369321e SHA512 2878deeaedec2e0563140371f6c69f5f35dd8264d519d5dc26516eb9be5d36096846ef046a3af592b687786af47c2d5e808812ef42f58eaaab0c4df092e12595
+MISC metadata.xml 2824 BLAKE2B 505cc4fe402e3bade5a67c5536c3394166767563d696c2acc026437cfa1a527269e137cfec8edcfb70f73c08149d3cc25ff9847e30e5e999f1d65b282e33bd2b SHA512 302cf58eb160ef91f2d05da23621ac1c0e0fc69c0c92a93510b6388e9427d345c52f14328fbd557f6a02d8c6966a008e6c7dad3994e7f0e07eddddfdd8c2e456
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index d99c868979a6..718ebb9d085e 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -13,7 +13,6 @@
<flag name="colord">Enable <pkg>kde-plasma/kwin</pkg> color management via <pkg>x11-misc/colord</pkg></flag>
<flag name="crash-handler">Pull in <pkg>kde-plasma/drkonqi</pkg> for assisted upstream crash reports</flag>
<flag name="crypt">Pull in <pkg>kde-plasma/plasma-vault</pkg> for encrypted vaults integration</flag>
- <flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Plasma</flag>
<flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag>
<flag name="display-manager">Pull in a graphical display manager</flag>
<flag name="firewall">Pull in <pkg>kde-plasma/plasma-firewall</pkg> for system firewall administration</flag>
@@ -21,7 +20,6 @@
<flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag>
<flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag>
<flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag>
- <flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
<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>
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.1.4-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.1.5.ebuild
index 5ba65dc8fea9..e663790990ff 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.1.4-r1.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
LICENSE="metapackage"
SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
cups discover +display-manager +elogind +firewall flatpak grub gtk +kwallet
+networkmanager oxygen-theme plymouth pulseaudio qt5 rdp +sddm sdk +smart systemd
@@ -24,8 +24,10 @@ RDEPEND="
>=kde-plasma/breeze-${PV}:${SLOT}[qt5?]
>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+ >=kde-plasma/kde-cli-tools-common-${PV}
>=kde-plasma/kdecoration-${PV}:${SLOT}
>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+ >=kde-plasma/kdesu-gui-${PV}
>=kde-plasma/kgamma-${PV}:${SLOT}
>=kde-plasma/kglobalacceld-${PV}:${SLOT}
>=kde-plasma/kinfocenter-${PV}:${SLOT}
@@ -70,7 +72,7 @@ RDEPEND="
display-manager? (
sddm? (
>=kde-plasma/sddm-kcm-${PV}:${SLOT}
- >=x11-misc/sddm-0.21.0_p20240723-r10[elogind?,systemd?]
+ >=x11-misc/sddm-0.21.0_p20240302[elogind?,systemd?]
)
!sddm? ( x11-misc/lightdm )
)
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.27.11-r2.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.2.2.ebuild
index cd5fee311e54..1ae4a0296343 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.27.11-r2.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.2.2.ebuild
@@ -3,50 +3,63 @@
EAPI=8
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+inherit toolchain-funcs
+
+DESCRIPTION="Merge this to pull in all Plasma 6 packages"
HOMEPAGE="https://kde.org/plasma-desktop/"
LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
-cups +desktop-portal discover +display-manager +elogind +firewall flatpak grub
-gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm
-sdk +smart systemd thunderbolt +wallpapers"
+cups discover +display-manager +elogind +firewall flatpak grub gtk +kwallet
++networkmanager oxygen-theme plymouth pulseaudio qt5 rdp +sddm sdk +smart systemd
+thunderbolt unsupported wacom +wallpapers webengine +xwayland"
REQUIRED_USE="^^ ( elogind systemd )"
RDEPEND="
- >=kde-plasma/breeze-${PV}:${SLOT}
+ !${CATEGORY}/${PN}:5
+ !kde-plasma/khotkeys:5
+ >=kde-plasma/breeze-${PV}:${SLOT}[qt5?]
>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+ >=kde-plasma/kde-cli-tools-common-${PV}
>=kde-plasma/kdecoration-${PV}:${SLOT}
>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+ >=kde-plasma/kdesu-gui-${PV}
>=kde-plasma/kgamma-${PV}:${SLOT}
- >=kde-plasma/khotkeys-${PV}:${SLOT}
+ >=kde-plasma/kglobalacceld-${PV}:${SLOT}
>=kde-plasma/kinfocenter-${PV}:${SLOT}
>=kde-plasma/kmenuedit-${PV}:${SLOT}
+ >=kde-plasma/kpipewire-${PV}:${SLOT}
>=kde-plasma/kscreen-${PV}:${SLOT}
>=kde-plasma/kscreenlocker-${PV}:${SLOT}
>=kde-plasma/ksshaskpass-${PV}:${SLOT}
>=kde-plasma/ksystemstats-${PV}:${SLOT}
- >=kde-plasma/kwayland-integration-${PV}:${SLOT}
+ >=kde-plasma/kwayland-${PV}:${SLOT}
>=kde-plasma/kwin-${PV}:${SLOT}[lock]
>=kde-plasma/kwrited-${PV}:${SLOT}
>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
>=kde-plasma/libkscreen-${PV}:${SLOT}
>=kde-plasma/libksysguard-${PV}:${SLOT}
+ >=kde-plasma/libplasma-${PV}:${SLOT}
>=kde-plasma/milou-${PV}:${SLOT}
- >=kde-plasma/oxygen-${PV}:${SLOT}
- >=kde-plasma/oxygen-sounds-${PV}:${SLOT}
+ >=kde-plasma/ocean-sound-theme-${PV}:${SLOT}
+ >=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-login-sessions-${PV}:${SLOT}
>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
>=kde-plasma/plasma-welcome-${PV}:${SLOT}
>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+ >=kde-plasma/plasma5support-${PV}:${SLOT}
>=kde-plasma/polkit-kde-agent-${PV}:*
>=kde-plasma/powerdevil-${PV}:${SLOT}
+ >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT}
>=kde-plasma/systemsettings-${PV}:${SLOT}
+ >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT}
sys-apps/dbus[elogind?,systemd?]
sys-auth/polkit[systemd?]
sys-fs/udisks:2[elogind?,systemd?]
@@ -55,13 +68,15 @@ RDEPEND="
colord? ( x11-misc/colord )
crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
- cups? ( kde-plasma/print-manager:${SLOT} )
- desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+ cups? (
+ >=kde-plasma/print-manager-${PV}:${SLOT}
+ net-print/cups-meta
+ )
discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
display-manager? (
sddm? (
>=kde-plasma/sddm-kcm-${PV}:${SLOT}
- <x11-misc/sddm-0.21.0_p20240723-r10[elogind?,systemd?]
+ >=x11-misc/sddm-0.21.0_p20240302[elogind?,systemd?]
)
!sddm? ( x11-misc/lightdm )
)
@@ -71,20 +86,26 @@ RDEPEND="
gtk? (
>=kde-plasma/breeze-gtk-${PV}:${SLOT}
>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+ sys-apps/xdg-desktop-portal-gtk
x11-misc/appmenu-gtk-module
)
- handbook? ( kde-apps/khelpcenter:5 )
kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
- legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
networkmanager? (
>=kde-plasma/plasma-nm-${PV}:${SLOT}
net-misc/networkmanager[elogind?,systemd?]
)
+ oxygen-theme? (
+ >=kde-frameworks/oxygen-icons-6.0.0:*
+ >=kde-plasma/oxygen-${PV}:${SLOT}[qt5?]
+ >=kde-plasma/oxygen-sounds-${PV}:${SLOT}
+ )
plymouth? (
>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
)
pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+ qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 )
+ rdp? ( >=kde-plasma/krdp-${PV}:${SLOT} )
sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
systemd? (
@@ -92,7 +113,13 @@ RDEPEND="
firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
)
thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+ !unsupported? (
+ !gui-apps/qt6ct
+ )
+ 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}
@@ -100,11 +127,24 @@ RDEPEND="${RDEPEND}
"
pkg_postinst() {
- has_version sys-auth/consolekit || return
- ewarn "An existing installation of sys-auth/consolekit was detected even though"
- ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
- ewarn "There can only be one session manager at runtime, otherwise random issues"
- ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
- ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
- ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+ if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
+ # Workaround for bug #923292 (KDE-bug 479679)
+ ewarn "plasmashell and other KDE Plasma components are known to misbehave"
+ ewarn "when built with sys-libs/libcxx, e.g. crashing when right-clicking"
+ ewarn "on a panel. See bug #923292."
+ ewarn ""
+ ewarn "A possible (no warranty!) workaround is building sys-libs/libcxx and"
+ ewarn "sys-libs/libcxxabi with the following in package.env:"
+ ewarn " MYCMAKEARGS=\"-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=2\""
+ ewarn "You may then need to rebuild dev-qt/* and kde-*/*."
+ fi
+
+ 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
}