From 325837835fc86686829aaa6acace3d3c06c74cea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 8 Oct 2024 04:26:34 +0100 Subject: gentoo auto-resync : 08:10:2024 - 04:26:34 --- sys-process/Manifest.gz | Bin 10129 -> 10127 bytes sys-process/runit/Manifest | 2 +- sys-process/runit/runit-2.1.2-r5.ebuild | 149 ------------------------------- sys-process/runit/runit-2.1.2-r6.ebuild | 152 ++++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 150 deletions(-) delete mode 100644 sys-process/runit/runit-2.1.2-r5.ebuild create mode 100644 sys-process/runit/runit-2.1.2-r6.ebuild (limited to 'sys-process') diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz index e6031502dd5a..a4c5c35572a2 100644 Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest index d82983ccd516..7205ee81704c 100644 --- a/sys-process/runit/Manifest +++ b/sys-process/runit/Manifest @@ -6,5 +6,5 @@ AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b6 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea DIST runit-2.1.2-patches-20240905.tar.xz 20104 BLAKE2B ebdc123ea722f223eec3ad5d63a4c3e7c4ef771592796f2d5624f4308c1d08eede7d4fa0c2a9fdd23dbf74be6135c69bae495d89cf582678b9308b1d146ef883 SHA512 15c5acd865ecc7f6c3b9b1fc94dc00bc44ceefd1c0ca6b53963d94338712cd716ad961826cccd065029ee67464dc288428952004ffcec3a1a97a058696f4f233 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf -EBUILD runit-2.1.2-r5.ebuild 3826 BLAKE2B 425c32d6506d51848527a27eabf12f13a57263ed5c05d02c4c7192b14e610be098696a1626b3f3b5a7f4f0228d7a1ccb8e2a54045f5ecff9014b6dfca3ded5a0 SHA512 0bbdffa0d0d8888a78e15677d5e78ee9ee30be9b4eefb17f1a418b480af034bc23288d72bd7203c1ddfb25d94c34a2f694bf5ec74fe51648b51c71cfa9f5af12 +EBUILD runit-2.1.2-r6.ebuild 3915 BLAKE2B e676aea8d5653584a32d2ffac6282bda95eccd92d722d5484919ff4810d5b97e71aa88362f49c2d496c27daa719490b3592ac300b956638e20b5612e1c996220 SHA512 3e0b93fbb7d6a7041a6e17156a036fb2ef7ecb40115bed20186eb8e2216e190004074c1fc168df057fe599a853b5a796dcfc28d318f09d9cdac3cf5b65871da1 MISC metadata.xml 480 BLAKE2B 03c67b9377e4dae4a777b363e128fc758cbd92d0ed6060d1036a6209184d518d59d6a98bfc731e0fa95151c0925195a1c512c2cfe46ddba1c964b66510f3bbba SHA512 71d359e43329f0b0561f01b132067c359e70af27868cc586beb96d5b9a0a1661eb122e0afcf90c5fb4f713b1e25d5e8072e4618143702bc1be063f2e194b211a diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild b/sys-process/runit/runit-2.1.2-r5.ebuild deleted file mode 100644 index 7d747bcca298..000000000000 --- a/sys-process/runit/runit-2.1.2-r5.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="https://smarden.org/runit/" -PATCH_VER=20240905 -SRC_URI=" - https://smarden.org/runit/${P}.tar.gz - https://github.com/clan/runit/releases/download/${PV}-r5/${P}-patches-${PATCH_VER}.tar.xz -" -S=${WORKDIR}/admin/${P}/src - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="static" - -RDEPEND="sys-apps/openrc" - -src_unpack() { - unpack ${P}.tar.gz - unpack ${P}-patches-${PATCH_VER}.tar.xz -} - -src_prepare() { - default - - cd "${S}"/.. || die - eapply -p3 "${WORKDIR}"/patches - cd "${S}" || die - - # We either build everything or nothing static - sed -i -e 's:-static: :' Makefile || die - - # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008 - [[ ${COMPILER} == "diet" ]] && - use ppc && - filter-flags "-mpowerpc-gpopt" -} - -src_configure() { - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die -} - -src_install() { - into / - dobin $(<../package/commands) - dodir /sbin - mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" - dosym ../etc/runit/2 /sbin/runsvdir-start - - DOCS=( ../package/{CHANGES,README,THANKS,TODO} ) - HTML_DOCS=( ../doc/*.html ) - einstalldocs - doman ../man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/ctrlaltdel - newexe "${FILESDIR}"/1-${PV} 1 - newexe "${FILESDIR}"/2-${PV} 2 - newexe "${FILESDIR}"/3-${PV} 3 - - dodir /etc/sv - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/sv/getty-$tty/ - newexe "${FILESDIR}"/finish.getty finish - newexe "${FILESDIR}"/run.getty-${PV} run - for script in finish run; do - sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script - done - done - - # make sv command work - newenvd - 20runit <<- EOF - #/etc/env.d/20runit - SVDIR="/etc/service/" - EOF -} - -default_config() { - local sv="${EROOT}"/etc/sv - local service="${EROOT}"/etc/service - mkdir -p "${service}" || die - for x in tty1 tty2 tty3 tty4 tty5 tty6; do - ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die - done - einfo "The links to services runit will supervise are installed" - einfo "in $service." - einfo "If you need multiple runlevels, please see the documentation" - einfo "for how to set them up." - einfo -} - -migrate_from_211() { - # Create /etc/service and /var/service if requested - if [[ -e "${T}"/make_var_service ]]; then - ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/etc/service || die - ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/var/service || die - fi - if [[ -d "${T}"/runsvdir ]]; then - cp -a "${T}"/runsvdir "${EROOT}"/etc/runit || die - fi - return 0 -} - -pkg_preinst() { - if has_version ' conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die +} + +src_install() { + dobin $(<../package/commands) + dodir /sbin + mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" + if use split-usr ; then + dosym ../etc/runit/2 /sbin/runsvdir-start + else + dosym ../../etc/runit/2 /sbin/runsvdir-start + fi + + DOCS=( ../package/{CHANGES,README,THANKS,TODO} ) + HTML_DOCS=( ../doc/*.html ) + einstalldocs + doman ../man/*.[18] + + exeinto /etc/runit + doexe "${FILESDIR}"/ctrlaltdel + newexe "${FILESDIR}"/1-${PV} 1 + newexe "${FILESDIR}"/2-${PV} 2 + newexe "${FILESDIR}"/3-${PV} 3 + + dodir /etc/sv + for tty in tty1 tty2 tty3 tty4 tty5 tty6; do + exeinto /etc/sv/getty-$tty/ + newexe "${FILESDIR}"/finish.getty finish + newexe "${FILESDIR}"/run.getty-${PV} run + for script in finish run; do + sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script + done + done + + # make sv command work + newenvd - 20runit <<- EOF + #/etc/env.d/20runit + SVDIR="/etc/service/" + EOF +} + +default_config() { + local sv="${EROOT}"/etc/sv + local service="${EROOT}"/etc/service + mkdir -p "${service}" || die + for x in tty1 tty2 tty3 tty4 tty5 tty6; do + ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die + done + einfo "The links to services runit will supervise are installed" + einfo "in $service." + einfo "If you need multiple runlevels, please see the documentation" + einfo "for how to set them up." + einfo +} + +migrate_from_211() { + # Create /etc/service and /var/service if requested + if [[ -e "${T}"/make_var_service ]]; then + ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/etc/service || die + ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/var/service || die + fi + if [[ -d "${T}"/runsvdir ]]; then + cp -a "${T}"/runsvdir "${EROOT}"/etc/runit || die + fi + return 0 +} + +pkg_preinst() { + if has_version '