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

[Piotr Karbowski]

commit:     460a8b933204f6b8788075f8faca640c15794c5e
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Feb 26 19:11:04 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 19:23:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460a8b93

gui-libs/display-manager-init: drop old versions

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19673
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 .../display-manager-init-1.0-r1.ebuild             | 54 ---------------------
 .../display-manager-init-1.0-r2.ebuild             | 55 ----------------------
 gui-libs/display-manager-init/files/startDM        | 29 ------------
 3 files changed, 138 deletions(-)

diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
deleted file mode 100644
index d5a588002df..00000000000
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-"
-
-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
-}

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
deleted file mode 100644
index 3c54378da25..00000000000
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-}

diff --git a/gui-libs/display-manager-init/files/startDM b/gui-libs/display-manager-init/files/startDM
deleted file mode 100644
index 976d1dd2d56..00000000000
--- a/gui-libs/display-manager-init/files/startDM
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# We need to source /etc/profile.env for stuff like $LANG to work
-# bug #10190.
-. /etc/profile.env
-
-# need eerror
-. /lib/gentoo/functions.sh
-
-# Bail out early if on a non-OpenRC system:
-if [ ! -d /run/openrc ]; then
-	eerror "$0 should only be used on OpenRC systems"
-fi
-
-. /lib/rc/sh/functions.sh
-
-export RC_SVCNAME=display-manager
-EXEC="$(get_options service)"
-NAME="$(get_options name)"
-PIDFILE="$(get_options pidfile)"
-START_STOP_ARGS="$(get_options start_stop_args)"
-
-start-stop-daemon --start --exec "${EXEC}" \
-"${NAME:+--name}" "${NAME}" "${PIDFILE:+--pidfile}" "${PIDFILE}" ${START_STOP_ARGS} || \
-eerror "ERROR: could not start the Display Manager"
-
-# vim:ts=4