diff options
Diffstat (limited to 'sys-process/runit')
-rw-r--r-- | sys-process/runit/Manifest | 4 | ||||
-rw-r--r-- | sys-process/runit/metadata.xml | 8 | ||||
-rw-r--r-- | sys-process/runit/runit-2.1.2-r4.ebuild (renamed from sys-process/runit/runit-2.1.2-r1.ebuild) | 56 |
3 files changed, 30 insertions, 38 deletions
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest index 76b5f09a2fc8..21d4db3bc145 100644 --- a/sys-process/runit/Manifest +++ b/sys-process/runit/Manifest @@ -5,5 +5,5 @@ AUX ctrlaltdel 189 BLAKE2B 07b6936a7ae54a69227f794068cf41dfc2e54ba6ba032a7c1a58c AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b671e93dbf3e9cf233e92dd2c0a47fe4e0bec0fd13d994893f95914f19cb5f9dfa78b915857bc4 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf -EBUILD runit-2.1.2-r1.ebuild 3535 BLAKE2B 82105cb3ebdb2897e293c0c36450f31b804b980a2801ac22eeb97ae8ff902ecaf53e6804a3214bb754d41098407be07257f322d272380dbf9129d88c27386bbc SHA512 2d9808af0300e6bfe62cf47f19d5aaafb771054ce373948bcef9a7bbf7c114219ef7927e628148e847ccfde5671dad047a502632053ac1aafa1f74dfb33d07f8 -MISC metadata.xml 331 BLAKE2B bdd00a86fff3c8a1d5d1bbe0c02c3b8ff3744cbaa2418005f2874a8996993a9adb114827bbd2f508f7df43ce8746c4528366d12e02c429cd5515c3b27de07972 SHA512 31b1e624cd18692713a25780237cb492a9541b61f18fae9522c39c5e0e6f292acf4534ce63135c20ea4f8bf9f29e15533ff5692e012732c1ab9d839277677b94 +EBUILD runit-2.1.2-r4.ebuild 3567 BLAKE2B 5fcc63ee09bd6ca41a66e5bae28754e31c957d64ddb2b79c6bce6f29af472b8d653320032007f2e9d64fca60ef2f20169ee45b95edd8a7784f67b691a945f468 SHA512 93de0993bca8c8d0da6672bfe39f51e26ae8a3c618d239a0aefaed58541e107840e827e7f421fd6d421bfee5af114fe743da1d75e1e06dce2d4aa5573b952a1f +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml index 70953e9fd813..115e9d64a669 100644 --- a/sys-process/runit/metadata.xml +++ b/sys-process/runit/metadata.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>williamh@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r4.ebuild index 2250a85f21de..2254657370c9 100644 --- a/sys-process/runit/runit-2.1.2-r1.ebuild +++ b/sys-process/runit/runit-2.1.2-r4.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs flag-o-matic DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" +HOMEPAGE="https://smarden.org/runit/" +SRC_URI="https://smarden.org/runit/${P}.tar.gz" +S=${WORKDIR}/admin/${P}/src LICENSE="BSD" SLOT="0" @@ -16,13 +17,11 @@ IUSE="static" RDEPEND="sys-apps/openrc" -S=${WORKDIR}/admin/${P}/src - src_prepare() { default - # we either build everything or nothing static - sed -i -e 's:-static: :' Makefile + # 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" ]] && @@ -33,8 +32,8 @@ src_prepare() { src_configure() { use static && append-ldflags -static - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die } src_install() { @@ -49,7 +48,6 @@ src_install() { einstalldocs doman ../man/*.[18] - dodir /etc/runit exeinto /etc/runit doexe "${FILESDIR}"/ctrlaltdel newexe "${FILESDIR}"/1-${PV} 1 @@ -74,11 +72,11 @@ src_install() { } default_config() { - local sv="${EROOT}"etc/sv - local service="${EROOT}"etc/service + 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 + ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die done einfo "The links to services runit will supervise are installed" einfo "in $service." @@ -89,12 +87,12 @@ default_config() { 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 + 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 + if [[ -d "${T}"/runsvdir ]]; then + cp -a "${T}"/runsvdir "${EROOT}"/etc/runit || die fi return 0 } @@ -106,9 +104,9 @@ pkg_preinst() { } pkg_postinst() { - if [[ -z $REPLACING_VERSIONS ]]; then + if [[ -z ${REPLACING_VERSIONS} ]]; then default_config - elif [[ -n $pre_212 ]]; then + elif [[ -n ${pre_212} ]]; then migrate_from_211 fi @@ -118,20 +116,20 @@ pkg_postinst() { ewarn "source /etc/profile" ewarn - if [ -L "${EROOT}"var/service ]; then + if [[ -L "${EROOT}"/var/service ]]; then ewarn "Once this version of runit is active, please remove the" - ewarn "compatibility symbolic link at ${EROOT}var/service" - ewarn "The correct path now is ${EROOT}etc/service" + ewarn "compatibility symbolic link at ${EROOT}/var/service" + ewarn "The correct path now is ${EROOT}/etc/service" ewarn fi - if [ -L "${EROOT}"etc/runit/runsvdir/all ]; then - ewarn "${EROOT}etc/runit/runsvdir/all has moved to" - iewarn "${EROOT}etc/sv." - ewarn "Any symbolic links under ${EROOT}etc/runit/runsvdir" + if [[ -L "${EROOT}"/etc/runit/runsvdir/all ]]; then + ewarn "${EROOT}/etc/runit/runsvdir/all has moved to" + ewarn "${EROOT}/etc/sv." + ewarn "Any symbolic links under ${EROOT}/etc/runit/runsvdir" ewarn "which point to services through ../all should be updated to" - ewarn "point to them through ${EROOT}etc/sv." - ewarn "Once that is done, ${EROOT}etc/runit/runsvdir/all should be" + ewarn "point to them through ${EROOT}/etc/sv." + ewarn "Once that is done, ${EROOT}/etc/runit/runsvdir/all should be" ewarn "removed." ewarn fi |