From d13006cca857323814c09f5123b87c1a005bba74 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Mar 2025 01:46:23 +0000 Subject: gentoo auto-resync : 04:03:2025 - 01:46:22 --- gui-libs/display-manager-init/Manifest | 4 +- .../display-manager-init-1.1.2-r1.ebuild | 54 ++++++++++++++++++++++ .../display-manager-init-1.1.2.ebuild | 54 ---------------------- gui-libs/display-manager-init/files/startDM-r1 | 11 ++++- 4 files changed, 66 insertions(+), 57 deletions(-) create mode 100644 gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild delete mode 100644 gui-libs/display-manager-init/display-manager-init-1.1.2.ebuild (limited to 'gui-libs/display-manager-init') diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest index 1055fa40c502..ca7a450dd9d1 100644 --- a/gui-libs/display-manager-init/Manifest +++ b/gui-libs/display-manager-init/Manifest @@ -1,7 +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-r5 5200 BLAKE2B 26b8aa90d439fbe719e294f3e1894d82936abcba5ef18095d9940c260b39118c62925c97e1df0d3ce8529cc8b280e623b62d5a716d6e6a896063d416790833f3 SHA512 0b969ed50e267366094268456773e16887c8fa8c31de9a9f58383f3136921a39f4ac72371a01297186e16eb58c69c7223cd61d08ad14f570e57b6837616e6afb -AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9 +AUX startDM-r1 1008 BLAKE2B 4d3642051fd4326381d456812b5cf4dd61471b18d297a1504086ebdc6254ae9984dd4fb34065201969c497a343ccd5f06af37078f398e9e31fe4ff3e9fb0c265 SHA512 7b383cf6378333d0f4e2e51c1a7d772771f21b63601138e44cb63a06b69a28273ad702ea9a7d6203715ecec51e46c654f3ceb7dd78b5e1c065dfb0b8825e673f AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c -EBUILD display-manager-init-1.1.2.ebuild 1675 BLAKE2B 548eacdb31789fbe345dd592897a61e50d015573b39ce6b62d8fa0c8fa04a3ada1f3f1ebe87c14775ab19062d37cc6bd16545cfb83b29488cf487c3069d84215 SHA512 da056a799c579a0bc6ac49f4afc02a4d835a98cc47b78f69345014cf64fda1e489ac17d8cc6836ee690b0932b1b53dc22d413c7c7202922825dfd5cf2c030aa2 +EBUILD display-manager-init-1.1.2-r1.ebuild 1675 BLAKE2B 6022eaf0750266564d680b2a51a31df5c6f67e6903e868298cdf7c5cbd5270ddc29c53323519505c25db42b8c281635646a084ebf32204463dbd871764138cbb SHA512 a4c373c595e809ec9f2fe565c4a8948fed9b9c4b954fd78010c519cd848024b09298471568591ec06b670ebcc493ee260f3b1d474db928fe17a9c3e418dd5cdc MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild new file mode 100644 index 000000000000..a8352e66cf49 --- /dev/null +++ b/gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2025 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 ~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-r5 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/display-manager-init-1.1.2.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.2.ebuild deleted file mode 100644 index 66a3bbc644a6..000000000000 --- a/gui-libs/display-manager-init/display-manager-init-1.1.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 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 ~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-r5 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/startDM-r1 b/gui-libs/display-manager-init/files/startDM-r1 index b23344bbdcc7..11309bb45f29 100644 --- a/gui-libs/display-manager-init/files/startDM-r1 +++ b/gui-libs/display-manager-init/files/startDM-r1 @@ -12,9 +12,18 @@ # Bail out early if on a non-OpenRC system: if [ ! -d /run/openrc ]; then eerror "$0 should only be used on OpenRC systems" + exit 1 fi -. /lib/rc/sh/functions.sh +# rc_libexec moved in >=openrc-0.56 +if [ -e /lib/rc/sh/functions.sh ]; then + . /lib/rc/sh/functions.sh +elif [ -e /usr/libexec/rc/sh/functions.sh ]; then + . /usr/libexec/rc/sh/functions.sh +else + eerror "Unable to find rc/sh/functions.sh" + exit 1 +fi export RC_SVCNAME=display-manager EXEC="$(get_options service)" -- cgit v1.2.3