[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/

[Andreas Sturmlechner]

commit:     ce5a69792792040a0f7261560ccf5bd9c37c155c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 20:45:43 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 20:57:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5a6979

gui-libs/display-manager-init: Improve instructions

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../display-manager-init/display-manager-init-1.0.ebuild  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
index 8b5a2670683..ec9d323f4c0 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
@@ -7,10 +7,10 @@ DESCRIPTION="RC init files for starting display and login managers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
-S="${FILESDIR}"
+S="${WORKDIR}"
 
 RDEPEND="
 	sys-apps/gentoo-functions
@@ -42,10 +42,13 @@ pkg_preinst() {
 		fi
 	done
 	if [[ "${using_xdm}" = "yes" ]]; then
-		ewarn "The 'xdm' service has been removed as it is"
-		ewarn "being replaced by the 'display-manager' service."
-		ewarn "Please migrate to using 'display-manager' and"
-		ewarn "remember to use dispatch-conf to update the"
+		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
+		ewarn "service, please switch now:"
+		ewarn
+		ewarn "  # rc-update del xdm default"
+		ewarn "  # rc-update add display-manager default"
+		ewarn
+		ewarn "Remember to run etc-update or dispatch-conf to update the"
 		ewarn "config protected service files."
 	fi
 }