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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B739A138350 for ; Sun, 26 Apr 2020 01:37:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C83EAE0835; Sun, 26 Apr 2020 01:37:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A446BE0835 for ; Sun, 26 Apr 2020 01:37:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0004F34F18B for ; Sun, 26 Apr 2020 01:37:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CADA61EB for ; Sun, 26 Apr 2020 01:37:15 +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: <1587862062.622bef71b555568ba295acdf6247efb1cdde643e.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-5.18.4.1-r1.ebuild kde-plasma/plasma-meta/plasma-meta-5.18.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: 622bef71b555568ba295acdf6247efb1cdde643e X-VCS-Branch: master Date: Sun, 26 Apr 2020 01:37:15 +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: c9091990-2c25-4781-a82d-4706a756ba4c X-Archives-Hash: f5d7821e84ca74be539f423adb0f30a8 commit: 622bef71b555568ba295acdf6247efb1cdde643e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 26 00:47:42 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 26 00:47:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=622bef71 kde-plasma/plasma-meta: Drop USE consolekit USE consolekit is gone from desktop profile make.defaults and neither can we recommend it any longer. Its use is not prohibited from plasma-meta, but all checks for USE-dep alignment in dependencies are gone and users are on their own to set it (globally) correctly. Greatly simplifies pkg_postinst. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-meta/metadata.xml | 1 - .../plasma-meta/plasma-meta-5.18.4.1-r1.ebuild | 37 ++++++++-------------- .../plasma-meta/plasma-meta-5.18.49.9999.ebuild | 37 ++++++++-------------- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 37 ++++++++-------------- 4 files changed, 39 insertions(+), 73 deletions(-) diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index e3ad14b3e9..8f7c40562a 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -7,7 +7,6 @@ Enable integration with Chrome/Firefox with browser extensions - Enable sys-auth/consolekit support instead of logind session tracking Pull in kde-plasma/plasma-vault for encrypted vaults integration Enable sys-apps/xdg-desktop-portal backend implementation for Plasma Pull in resources management GUI; a centralised GHNS alternative and optional sys-apps/fwupd frontend diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.ebuild index 440bc316ff..24fe51c28f 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.ebuild @@ -9,11 +9,11 @@ HOMEPAGE="https://kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="~amd64" -IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover +IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager elogind grub gtk +handbook kwinft +legacy-systray networkmanager pam plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" -REQUIRED_USE="?? ( consolekit elogind systemd )" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" >=kde-plasma/breeze-${PV}:${SLOT} @@ -50,14 +50,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 ) 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 ) ) @@ -70,12 +69,12 @@ RDEPEND=" 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?] + sys-auth/pambase[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} @@ -88,22 +87,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" } diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild index 5cb896a062..a62ab60c5b 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild @@ -9,11 +9,11 @@ HOMEPAGE="https://kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="" -IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover +IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager elogind grub gtk +handbook kwinft +legacy-systray networkmanager pam plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" -REQUIRED_USE="?? ( consolekit elogind systemd )" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" >=kde-plasma/breeze-${PV}:${SLOT} @@ -50,14 +50,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 ) 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 ) ) @@ -70,12 +69,12 @@ RDEPEND=" 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?] + sys-auth/pambase[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} @@ -88,22 +87,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" } diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index 5cb896a062..a62ab60c5b 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -9,11 +9,11 @@ HOMEPAGE="https://kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="" -IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover +IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager elogind grub gtk +handbook kwinft +legacy-systray networkmanager pam plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" -REQUIRED_USE="?? ( consolekit elogind systemd )" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" >=kde-plasma/breeze-${PV}:${SLOT} @@ -50,14 +50,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 ) 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 ) ) @@ -70,12 +69,12 @@ RDEPEND=" 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?] + sys-auth/pambase[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} @@ -88,22 +87,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" }