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 154E01382C5 for ; Wed, 10 Feb 2021 20:31:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F3EBE0AD1; Wed, 10 Feb 2021 20:31:46 +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 2791CE0AD1 for ; Wed, 10 Feb 2021 20:31:46 +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 C3332340D77 for ; Wed, 10 Feb 2021 20:31:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 284B84C0 for ; Wed, 10 Feb 2021 20:31:43 +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: <1612989057.715cdb312dc49cf913e01e9bb1e2bd8292ab2b04.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild X-VCS-Directories: gui-libs/display-manager-init/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 715cdb312dc49cf913e01e9bb1e2bd8292ab2b04 X-VCS-Branch: master Date: Wed, 10 Feb 2021 20:31:43 +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: 965f2a89-2299-482f-95d0-c648dbc735d9 X-Archives-Hash: fd72535f1b4129c1af97a8e7fb0752ea commit: 715cdb312dc49cf913e01e9bb1e2bd8292ab2b04 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 10 20:30:57 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 10 20:30:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715cdb31 gui-libs/display-manager-init: Block x11-base/xorg-server-1.20.10-r2 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../display-manager-init-1.0-r2.ebuild | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild new file mode 100644 index 00000000000..3c54378da25 --- /dev/null +++ b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="RC init files for starting display and login managers" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" + +S="${WORKDIR}" + +RDEPEND=" + sys-apps/gentoo-functions + !<=sys-apps/sysvinit-2.98 + !<=x11-apps/xinit-1.4.1 + !<=x11-base/xorg-server-1.20.10 + !=x11-base/xorg-server-1.20.10-r2 +" + +src_install() { + newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup + newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager + newinitd "${FILESDIR}"/xdm.initd xdm + newconfd "${FILESDIR}"/display-manager.confd display-manager + exeinto /usr/bin + doexe "${FILESDIR}"/startDM + # backwards compatibility + dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh +} + +pkg_preinst() { + if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then + cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die + fi + local rlevel using_xdm + using_xdm=no + for rlevel in boot default sysinit; do + if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then + using_xdm=yes + fi + done + if [[ "${using_xdm}" = "yes" ]]; then + 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 +}