| 1 |
commit: 93ae7daba9c05a6ae74bd320b91c064285190821 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 1 09:40:06 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 1 13:59:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ae7dab |
| 7 |
|
| 8 |
kde-plasma/plasma-meta: Don't force session manager, add pkg_postinst |
| 9 |
|
| 10 |
1) We don't have to, profiles and deps will do that anyway. Makes QA happy. |
| 11 |
2) The informational pkg_postinst is more helpful as it will detect conflicting |
| 12 |
session managers after install if they contradict plasma-meta USE settings. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
.../plasma-meta/plasma-meta-5.14.3-r1.ebuild | 23 +++++++++++++++++++++- |
| 18 |
kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild | 23 +++++++++++++++++++++- |
| 19 |
2 files changed, 44 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
index a64a211a705..4d68b770cf6 100644 |
| 23 |
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild |
| 24 |
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild |
| 25 |
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86" |
| 26 |
IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook |
| 27 |
+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" |
| 28 |
|
| 29 |
-REQUIRED_USE="^^ ( consolekit elogind systemd )" |
| 30 |
+REQUIRED_USE="?? ( consolekit elogind systemd )" |
| 31 |
|
| 32 |
RDEPEND=" |
| 33 |
$(add_plasma_dep breeze) |
| 34 |
@@ -85,3 +85,24 @@ RDEPEND=" |
| 35 |
sdk? ( $(add_plasma_dep plasma-sdk) ) |
| 36 |
wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) |
| 37 |
" |
| 38 |
+ |
| 39 |
+pkg_postinst() { |
| 40 |
+ local i selected use_pkg_map=( |
| 41 |
+ consolekit:sys-auth/consolekit |
| 42 |
+ elogind:sys-auth/elogind |
| 43 |
+ systemd:sys-apps/systemd |
| 44 |
+ ) |
| 45 |
+ for i in ${use_pkg_map[@]}; do |
| 46 |
+ use ${i%:*} && selected="${i%:*}" |
| 47 |
+ done |
| 48 |
+ for i in ${use_pkg_map[@]}; do |
| 49 |
+ if ! use ${i%:*} && has_version ${i#*:}; then |
| 50 |
+ ewarn "An existing installation of ${i#*:} was detected even though" |
| 51 |
+ ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}." |
| 52 |
+ ewarn "There can only be one session manager at runtime, otherwise random issues" |
| 53 |
+ ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf" |
| 54 |
+ ewarn "or package.use and remove ${i#*:} before raising bugs." |
| 55 |
+ ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE" |
| 56 |
+ fi |
| 57 |
+ done |
| 58 |
+} |
| 59 |
|
| 60 |
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild |
| 61 |
index a64a211a705..4d68b770cf6 100644 |
| 62 |
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild |
| 63 |
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild |
| 64 |
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86" |
| 65 |
IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook |
| 66 |
+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" |
| 67 |
|
| 68 |
-REQUIRED_USE="^^ ( consolekit elogind systemd )" |
| 69 |
+REQUIRED_USE="?? ( consolekit elogind systemd )" |
| 70 |
|
| 71 |
RDEPEND=" |
| 72 |
$(add_plasma_dep breeze) |
| 73 |
@@ -85,3 +85,24 @@ RDEPEND=" |
| 74 |
sdk? ( $(add_plasma_dep plasma-sdk) ) |
| 75 |
wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) |
| 76 |
" |
| 77 |
+ |
| 78 |
+pkg_postinst() { |
| 79 |
+ local i selected use_pkg_map=( |
| 80 |
+ consolekit:sys-auth/consolekit |
| 81 |
+ elogind:sys-auth/elogind |
| 82 |
+ systemd:sys-apps/systemd |
| 83 |
+ ) |
| 84 |
+ for i in ${use_pkg_map[@]}; do |
| 85 |
+ use ${i%:*} && selected="${i%:*}" |
| 86 |
+ done |
| 87 |
+ for i in ${use_pkg_map[@]}; do |
| 88 |
+ if ! use ${i%:*} && has_version ${i#*:}; then |
| 89 |
+ ewarn "An existing installation of ${i#*:} was detected even though" |
| 90 |
+ ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}." |
| 91 |
+ ewarn "There can only be one session manager at runtime, otherwise random issues" |
| 92 |
+ ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf" |
| 93 |
+ ewarn "or package.use and remove ${i#*:} before raising bugs." |
| 94 |
+ ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE" |
| 95 |
+ fi |
| 96 |
+ done |
| 97 |
+} |
Archives