diff options
Diffstat (limited to 'kde-plasma/plasma-meta')
-rw-r--r-- | kde-plasma/plasma-meta/Manifest | 4 | ||||
-rw-r--r-- | kde-plasma/plasma-meta/metadata.xml | 1 | ||||
-rw-r--r-- | kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-5.18.4.1.ebuild) | 47 |
3 files changed, 18 insertions, 34 deletions
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest index 03ed6a000b15..41a278b7ac86 100644 --- a/kde-plasma/plasma-meta/Manifest +++ b/kde-plasma/plasma-meta/Manifest @@ -1,3 +1,3 @@ EBUILD plasma-meta-5.17.5.ebuild 3963 BLAKE2B def2f279918fb1a11de64bac04d5736e462940bda0ec174a86b3b9d49e3edd8391dd3c7ea4e9ac300adf3589b534c1f791679bae2ecb8839fdc1ee67b6c156d9 SHA512 e2de63da15aabb94d081531f98ae76e90b11c589a8cf6ce0538372b471f3b74e54ce1ef83e90522517d1ea509dffe865b25f764edf9075bee7aaa3953c26c6e2 -EBUILD plasma-meta-5.18.4.1.ebuild 3966 BLAKE2B c1df8252e248e64db3224ab2ffbd5d0098601edc84ecfb3ed3a9d8b46c5541db9746c17dfdf8b945f45b91d821efa01620f723d6f3ce644901fa9cc1cffce33a SHA512 97077d771b7de61555b4e348a367aa7a9f485d7eff7315b88881f34c2d9f1dda66e4d1a7d8295ee7d83d4f688f4128f5ff04541cd8e1a2981709b1c9bff92a6b -MISC metadata.xml 2177 BLAKE2B 1d0ff2de7c1ab2df3ba81c26488c9304c9e36b660f7842e96e156772e5e54ea22b0c5c17c1fecf65ad6ab936b4c85d8686d8b902a828aa38b13b7e18fcdc8037 SHA512 44a71cd2ae64e007201eeb0bf9f4d6fe5d3b8eb623ba2413bee5ce1c6cbfe252de074fd86d6af213455f32f1e093a7d67cc612f49f09a4330033bc080c3b7c40 +EBUILD plasma-meta-5.18.5.ebuild 3593 BLAKE2B 01b0751515b222b6d0b846a1ebb763dc6f9823e42d4a730e37f2d03e7a72d29c41a1ffd3f82e25ab3bb62ec5b26ca8d79baf048eac336434699da3cc9dd7f341 SHA512 614fab51d1fd80955418bd602c64f42c31707e57b4fa77382699ae879ec9523f6274340118df8bdc60e117c33b092da542a41fac2c7f1b474728184bcc38a0dc +MISC metadata.xml 2287 BLAKE2B 737ca5566ffbe9108ba08ca23d13a8545188205a2c83444ee9287794dcbf73abe85c51e1eefd50d041ffacc9d2c492fb89f9a5d784959bbdbb10f2948993f071 SHA512 2c3bd20504b63e55496e2560d38b8067028e6f86746fbc96e4e0dc3a038777a2fcde71f08dbd9e173ac8e32d5e18edbd00cc170cbaded96cb39740a3036f5cc8 diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index 0e4113c5df40..946d4ed97a21 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -15,6 +15,7 @@ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> <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="pam">Enable support for kwallet auto-unlocking</flag> <flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag> diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.4.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild index 93d9b3a3b8d4..f76835939a3c 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.18.4.1.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild @@ -9,11 +9,11 @@ HOMEPAGE="https://kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover -+display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam -plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" +IUSE="bluetooth +browser-integration crypt +desktop-portal discover ++display-manager elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" -REQUIRED_USE="?? ( consolekit elogind systemd )" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" >=kde-plasma/breeze-${PV}:${SLOT} @@ -49,17 +49,13 @@ RDEPEND=" sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} ) browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} ) - consolekit? ( - >=sys-auth/consolekit-1.0.1 - pm-utils? ( sys-power/pm-utils ) - ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-${PV}:${SLOT} - x11-misc/sddm[consolekit?,elogind?,systemd?] + x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) @@ -69,16 +65,13 @@ RDEPEND=" >=kde-plasma/kde-gtk-config-${PV}:${SLOT} ) 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[consolekit?,elogind?,systemd?] + net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) - pam? ( - >=kde-plasma/kwallet-pam-${PV}:${SLOT} - sys-auth/pambase[consolekit?,elogind?,systemd?] - ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} >=kde-plasma/plymouth-kcm-${PV}:${SLOT} @@ -90,22 +83,12 @@ RDEPEND=" " pkg_postinst() { - local i selected use_pkg_map=( - consolekit:sys-auth/consolekit - elogind:sys-auth/elogind - systemd:sys-apps/systemd - ) - for i in ${use_pkg_map[@]}; do - use ${i%:*} && selected="${i%:*}" - done - for i in ${use_pkg_map[@]}; do - if ! use ${i%:*} && has_version ${i#*:}; then - ewarn "An existing installation of ${i#*:} was detected even though" - ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}." - ewarn "There can only be one session manager at runtime, otherwise random issues" - ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf" - ewarn "or package.use and remove ${i#*:} before raising bugs." - ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE" - fi - done + has_version sys-auth/consolekit || return + use elogind || use systemd && 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" } |