From 236302aac694377916670b7769f941e3f1dd0bbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 26 Jan 2023 19:56:43 +0000 Subject: gentoo auto-resync : 26:01:2023 - 19:56:42 --- gui-libs/display-manager-init/Manifest | 2 - .../display-manager-init-1.1.1.ebuild | 54 ------ .../files/display-manager.initd-r4 | 201 --------------------- 3 files changed, 257 deletions(-) delete mode 100644 gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild delete mode 100644 gui-libs/display-manager-init/files/display-manager.initd-r4 (limited to 'gui-libs/display-manager-init') diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest index e011bda00c70..f7f736fed719 100644 --- a/gui-libs/display-manager-init/Manifest +++ b/gui-libs/display-manager-init/Manifest @@ -1,9 +1,7 @@ AUX display-manager-setup.initd-r1 246 BLAKE2B 13b3a3fac6054e2b5b3d9106994b486d42de5bcfca6899f033855c7879915b3730be3c8fc650cb5e2f0970b26401f03fc861e9567dfd168cb945c72bc4cfcc8d SHA512 916011bfd139f8261a53b637d1b75ebcfdb101bfb9d1cfbca38de6a15a9e6573b6a906997b57b7d8ac483ab02b0074e04b2730db3cb1db0b8a879dfe11ee72cc AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef681607d2687b3ed51f1baab8752fe94ad1021b9fd81b3e8444a328d2c1de83718534ea722ef9dadcbdca164 SHA512 40fb28fb6ac06b59fed9fec86816a444f53ea499bb9a7e7a072a5a932b45a29f830b9da9de0954b1f5cb21903c08ff5c997db2e32ee0bb1a300cd6c070cc8aa6 -AUX display-manager.initd-r4 5196 BLAKE2B f8ea46550a6810e9c929052eec7a7313bc49fdd70550504db66901c766b40a7f008a297d2d961dd5a62ba2c6f23239586cc2e7eaa1e0e2cab537a914fa714118 SHA512 d9265bdfc10bd75491ccd1a15e8270276e902f26451af9c2c12431aac2b7d7ed5d7bcb2baf6663a4f0766fcf709edcec17c08e19cebce468790c1442f5c6473f AUX display-manager.initd-r5 5200 BLAKE2B 26b8aa90d439fbe719e294f3e1894d82936abcba5ef18095d9940c260b39118c62925c97e1df0d3ce8529cc8b280e623b62d5a716d6e6a896063d416790833f3 SHA512 0b969ed50e267366094268456773e16887c8fa8c31de9a9f58383f3136921a39f4ac72371a01297186e16eb58c69c7223cd61d08ad14f570e57b6837616e6afb AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c -EBUILD display-manager-init-1.1.1.ebuild 1681 BLAKE2B 5fafe8b7c94db5fd05740da4a3d895f15a7109ba9afed2f1f3b74d746b9cd16d7a5378f4dc6058233e3cfc0603fca80c82cc0c5bebbaad169c326ff5c4c5c690 SHA512 cdd6824551b5a4203e90fa32468e31c846b77e4a07e778320ba68479c07132b218c96893ab4c4bde871032f65b7fcfe32c011f6a1cfb868c8c1e4b99645adefe EBUILD display-manager-init-1.1.2.ebuild 1681 BLAKE2B 44868fe16c81ca3ce0816196deeeb3172f34534539160ff90ca828690080b7300e1f6a3e3facf6a4706991fac3b5aa3b38c2867dd0bf9b334023fac1aa8d3b1f SHA512 a245e608ef68025d0b91ad4c23bf16be4a9ed852199f073505569525c2903693ead2ffee7ba2db470e9b77c4c0724992d6b0dac149c982d0dff0a3e6fa61e9ec MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild deleted file mode 100644 index c388b7de1539..000000000000 --- a/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 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 ~loong ~m68k ~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-r1 display-manager-setup - newinitd "${FILESDIR}"/display-manager.initd-r4 display-manager - newinitd "${FILESDIR}"/xdm.initd xdm - newconfd "${FILESDIR}"/display-manager.confd display-manager - newbin "${FILESDIR}"/startDM-r1 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/display-manager.initd-r4 b/gui-libs/display-manager-init/files/display-manager.initd-r4 deleted file mode 100644 index 460c91e86944..000000000000 --- a/gui-libs/display-manager-init/files/display-manager.initd-r4 +++ /dev/null @@ -1,201 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 - -retry="TERM/5/TERM/5" - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) has the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/usr/bin/startDM -# -# and have /usr/bin/startDM start the DM in daemon mode if -# a lock is present (with the info of what DM should be started), -# else just fall through. -# -# How this basically works, is the "a" runlevel is a additional -# runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM will only be -# run when we specify it to run, thus eliminating respawning -# startDM when "display-manager" is not added to the default -# runlevel, as was done previously. -# -# This script then just calls "telinit a", and init will run -# /usr/bin/startDM after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - -depend() { - need localmount display-manager-setup - - # this should start as early as possible - # we can't do 'before *' as that breaks it - # (#139824) Start after ypbind and autofs for network authentication - # (#145219 #180163) Could use lirc mouse as input device - # (#70689 comment #92) Start after consolefont to avoid display corruption - # (#291269) Start after quota, since some dm need readable home - # (#390609) gdm-3 will fail when dbus is not running - # (#366753) starting keymaps after X causes problems - # (#768834) race condition with elogind - after bootmisc consolefont modules netmount - after readahead-list ypbind autofs openvpn gpm lircmd - after quota keymaps - after elogind - after sssd - before alsasound - - # Start before GUI - use dbus xfs -} - -setup_dm() { - local MY_XDM - - MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') - case "${MY_XDM}" in - kdm|kde) - command=/usr/bin/kdm - pidfile=/run/kdm.pid - ;; - entrance*) - command=/usr/sbin/entrance - pidfile=/run/entrance.pid - ;; - gdm|gnome) - # gdm-3 and above has different paths - if [ -f /usr/sbin/gdm ]; then - command=/usr/sbin/gdm - pidfile=/run/gdm/gdm.pid - start_stop_daemon_args="--background" - else - command=/usr/bin/gdm - pidfile=/run/gdm.pid - fi - [ "${RC_UNAME}" != "Linux" ] && name=gdm-binary - ;; - greetd) - command=/usr/bin/greetd - command_background=yes - pidfile=/run/greetd.pid - ;; - wdm) - command=/usr/bin/wdm - ;; - gpe) - command=/usr/bin/gpe-dm - pidfile=/run/gpe-dm.pid - ;; - lxdm) - command=/usr/sbin/lxdm-binary - pidfile=/run/lxdm.pid - start_stop_daemon_args="--background" - ;; - lightdm) - command=/usr/sbin/lightdm - pidfile=/run/lightdm.pid - start_stop_daemon_args="--background" - ;; - sddm) - command="/usr/bin/sddm" - command_background=yes - pidfile=/run/sddm.pid - ;; - *) - # first find out if there is such executable - command="$(command -v ${MY_XDM} 2>/dev/null)" - pidfile="/run/${MY_XDM}.pid" - - # warn user that they are doing sick things if the exe was not found - if [ -z "${EXE}" ]; then - eerror "ERROR: Your XDM value is invalid." - eerror " No ${MY_XDM} executable could be found on your system." - fi - ;; - esac - - if ! [ -x "${command}" ]; then - command=/usr/bin/xdm - pidfile=/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ]; then - eerror "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/display-manager," - eerror " or install the x11-apps/xdm package" - return 1 - fi - fi - return 0 -} - -# Check to see if something is defined on our VT -vtstatic() { - if [ -e /etc/inittab ] ; then - grep -Eq "^[^#]+.*\" /etc/inittab - elif [ -e /etc/ttys ] ; then - grep -q "^ttyv$(($1 - 1))" /etc/ttys - else - return 1 - fi - return -} - -start_pre() { - setup_dm || return - - if [ -f /run/.nogui ]; then - einfo "Skipping ${command##*/}, /run/.nogui found or 'nogui' bootparam passed." - rm /run/.nogui - return 1 - fi - - if vtstatic "${CHECKVT:-7}" ; then - if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then - ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" - telinit a >/dev/null 2>&1 - return 0 - else - eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" - return 1 - fi - fi - return 0 -} - -stop_pre() { - if [ -t 0 ]; then - if command -v fgconsole >/dev/null 2>&1; then - curvt=$(fgconsole 2>/dev/null) - else - curvt=$(tty) - case "${curvt}" in - /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; - *) curvt= ;; - esac - fi - fi - return -} - -stop_post() { - # switch back to original vt - if [ -n "${curvt}" ]; then - if command -v chvt >/dev/null 2>&1; then - chvt "${curvt}" - else - vidcontrol -s "$((curvt + 1))" - fi - fi - return -} - -# vim: set ts=4 : -- cgit v1.2.3