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 E2850138334 for ; Sat, 1 Dec 2018 14:06:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76CBAE090F; Sat, 1 Dec 2018 14:06:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3BD06E090F for ; Sat, 1 Dec 2018 14:06:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 47EAF335C39 for ; Sat, 1 Dec 2018 14:06:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3DA5266 for ; Sat, 1 Dec 2018 14:06:27 +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: <1543672763.93ae7daba9c05a6ae74bd320b91c064285190821.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-meta/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild X-VCS-Directories: kde-plasma/plasma-meta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 93ae7daba9c05a6ae74bd320b91c064285190821 X-VCS-Branch: master Date: Sat, 1 Dec 2018 14:06:27 +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: b0f094fb-f1cc-4817-b84c-f14d045d63a9 X-Archives-Hash: 393ad33ee48ab1f13d6503125b5696a6 commit: 93ae7daba9c05a6ae74bd320b91c064285190821 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 1 09:40:06 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 1 13:59:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ae7dab kde-plasma/plasma-meta: Don't force session manager, add pkg_postinst 1) We don't have to, profiles and deps will do that anyway. Makes QA happy. 2) The informational pkg_postinst is more helpful as it will detect conflicting session managers after install if they contradict plasma-meta USE settings. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-meta/plasma-meta-5.14.3-r1.ebuild | 23 +++++++++++++++++++++- kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild | 23 +++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild index a64a211a705..4d68b770cf6 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" -REQUIRED_USE="^^ ( consolekit elogind systemd )" +REQUIRED_USE="?? ( consolekit elogind systemd )" RDEPEND=" $(add_plasma_dep breeze) @@ -85,3 +85,24 @@ RDEPEND=" sdk? ( $(add_plasma_dep plasma-sdk) ) wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) " + +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 +} diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild index a64a211a705..4d68b770cf6 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" -REQUIRED_USE="^^ ( consolekit elogind systemd )" +REQUIRED_USE="?? ( consolekit elogind systemd )" RDEPEND=" $(add_plasma_dep breeze) @@ -85,3 +85,24 @@ RDEPEND=" sdk? ( $(add_plasma_dep plasma-sdk) ) wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) " + +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 +}