[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-13 21:15 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-13 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3a8ac972f47bfd819d8b7e67311a80144ccaba21
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:04:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:04:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8ac972

sys-process/runit: Stabilize 2.1.2-r1 x86, #790035

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index d2b70ddc8f0..2c1634eb2ae 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-10-07 15:33 Mike Gilbert
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Gilbert @ 2024-10-07 15:33 UTC (permalink / raw
  To: gentoo-commits

commit:     cb893880b4741d78a58b005a005985bbf7dc0dd8
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Mon Sep  9 08:55:05 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 15:31:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb893880

sys-process/runit: fix path issue

1. install binary to /usr (remove 'into /')
2. handle symlink of /sbin/runsvdir-start by USE split-usr

Closes: https://bugs.gentoo.org/904989
Closes: https://bugs.gentoo.org/935656
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38531
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../runit/{runit-2.1.2-r5.ebuild => runit-2.1.2-r6.ebuild}    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild b/sys-process/runit/runit-2.1.2-r6.ebuild
similarity index 94%
rename from sys-process/runit/runit-2.1.2-r5.ebuild
rename to sys-process/runit/runit-2.1.2-r6.ebuild
index 7d747bcca298..018348aa5796 100644
--- a/sys-process/runit/runit-2.1.2-r5.ebuild
+++ b/sys-process/runit/runit-2.1.2-r6.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/admin/${P}/src
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
+IUSE="split-usr static"
 
 RDEPEND="sys-apps/openrc"
 
@@ -50,11 +50,14 @@ src_configure() {
 }
 
 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
+	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 )


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-09-05 14:42 Mike Gilbert
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Gilbert @ 2024-09-05 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     b28b765a56f848bccd25057856a9f4420123b664
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 14:42:00 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 14:42:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28b765a

sys-process/runit: add || die and adjust whitespace

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r5.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild b/sys-process/runit/runit-2.1.2-r5.ebuild
index c64c0578d5e9..8d6056f4ffba 100644
--- a/sys-process/runit/runit-2.1.2-r5.ebuild
+++ b/sys-process/runit/runit-2.1.2-r5.ebuild
@@ -28,11 +28,10 @@ src_unpack() {
 
 src_prepare() {
 	default
-	cd "${S}"/..
-	eapply -p3 "${WORKDIR}"/patches
-
-	cd "${S}"
 
+	cd "${S}"/.. || die
+	eapply -p3 "${WORKDIR}"/patches
+	cd "${S}" || die
 
 	# We either build everything or nothing static
 	sed -i -e 's:-static: :' Makefile || die


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-09-05 14:42 Mike Gilbert
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Gilbert @ 2024-09-05 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f0506961c5d9a3edacdf0bfe041fc84753665e4f
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Fri Aug 23 16:35:50 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 14:40:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0506961

sys-process/runit: fix errors & warnings with clang 18/gcc 15

20 patches from https://github.com/clan/runit/tree/ftbfs.v4 , which are divided
into the following categories:

1. patch: 0001
   purpose: helpful for development & debug: make full command line & result
            available in build.log, otherwise extra directives are required
            when debug
2. patch: 0002, 0003, 0004, 0005, 0006
   purpose: required, build will failed if not apply
            0005 & 0006 are warnings only for gcc < 14, errors if gcc >= 14
3. patch: 0007
   purpose: patch from author w/ new feature provided, but don't change any
            "user-observable functionality"
4. patch: 0008
   purpose: documentation change: w/ tiny (unlikely to cause problem)
            modification of source code
5. patch: 0009 - 0019
   purpose: fix compilation warnings reported by gcc/clang, with -Wall,
            -Wextra
6. patch: 0020
   purpose: usleep is obsoleted in POSIX.1-2001, handled this in compile
            time by feature test macro, replace w/ nanosleep if available

Closes: https://bugs.gentoo.org/934410
Closes: https://bugs.gentoo.org/938262
Closes: https://bugs.gentoo.org/938282
Closes: https://github.com/clan/runit/issues/2
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Tested-by: Alex Efros <powerman-asdf <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/38425
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-process/runit/Manifest                               |  1 +
 sys-process/runit/metadata.xml                           | 12 +++++++++++-
 .../{runit-2.1.2-r4.ebuild => runit-2.1.2-r5.ebuild}     | 16 +++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 8331848d7bf9..86dd43dacbcb 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1 +1,2 @@
+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

diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 115e9d64a669..73e765e89483 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>zhixu.liu@gmail.com</email>
+    <name>Z. Liu</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">clan/runit</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sys-process/runit/runit-2.1.2-r4.ebuild b/sys-process/runit/runit-2.1.2-r5.ebuild
similarity index 92%
rename from sys-process/runit/runit-2.1.2-r4.ebuild
rename to sys-process/runit/runit-2.1.2-r5.ebuild
index 2254657370c9..c64c0578d5e9 100644
--- a/sys-process/runit/runit-2.1.2-r4.ebuild
+++ b/sys-process/runit/runit-2.1.2-r5.ebuild
@@ -7,7 +7,11 @@ inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A UNIX init scheme with service supervision"
 HOMEPAGE="https://smarden.org/runit/"
-SRC_URI="https://smarden.org/runit/${P}.tar.gz"
+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"
@@ -17,8 +21,18 @@ IUSE="static"
 
 RDEPEND="sys-apps/openrc"
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack ${P}-patches-${PATCH_VER}.tar.xz
+}
+
 src_prepare() {
 	default
+	cd "${S}"/..
+	eapply -p3 "${WORKDIR}"/patches
+
+	cd "${S}"
+
 
 	# We either build everything or nothing static
 	sed -i -e 's:-static: :' Makefile || die


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-08-23  7:33 Ulrich Müller
  0 siblings, 0 replies; 34+ messages in thread
From: Ulrich Müller @ 2024-08-23  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     42753a9465c3725354ec38f93f221a9a177a3046
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 07:33:01 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 07:33:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42753a94

sys-process/runit: update HOMEPAGE, SRC_URI

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r4.ebuild b/sys-process/runit/runit-2.1.2-r4.ebuild
index 9cf5b122ca2e..2254657370c9 100644
--- a/sys-process/runit/runit-2.1.2-r4.ebuild
+++ b/sys-process/runit/runit-2.1.2-r4.ebuild
@@ -6,8 +6,8 @@ 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"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-08-23  7:28 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2024-08-23  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     882bdce53c742f514ef027966c206a6c83a0e7a4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 07:26:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 07:27:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882bdce5

sys-process/runit: naive EAPI 8 port

... without fixing anything else other than ebuild QA issues, as we
want to allow the EAPI 6 banning to go ahead in a few days.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...runit-2.1.2-r1.ebuild => runit-2.1.2-r4.ebuild} | 52 +++++++++++-----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r4.ebuild
similarity index 67%
rename from sys-process/runit/runit-2.1.2-r1.ebuild
rename to sys-process/runit/runit-2.1.2-r4.ebuild
index 2250a85f21de..9cf5b122ca2e 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"
+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


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-08-23  7:28 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2024-08-23  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     9be26a09a959cb567fbc0d9281727a8876ccbbea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 07:23:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 07:27:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be26a09

sys-process/runit: drop 2.1.2-r3 (broken at runtime)

Bug: https://bugs.gentoo.org/938262
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/Manifest              |   1 -
 sys-process/runit/runit-2.1.2-r3.ebuild | 149 --------------------------------
 2 files changed, 150 deletions(-)

diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index d3ffa90ef4a7..8331848d7bf9 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,2 +1 @@
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
-DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2

diff --git a/sys-process/runit/runit-2.1.2-r3.ebuild b/sys-process/runit/runit-2.1.2-r3.ebuild
deleted file mode 100644
index 4da7236850c6..000000000000
--- a/sys-process/runit/runit-2.1.2-r3.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="http://smarden.org/runit/"
-UBUNTU_PR="59ubuntu1"
-UBUNTU_A="${PN}_${PV}-${UBUNTU_PR}.debian.tar.xz"
-SRC_URI="
-	http://smarden.org/runit/${P}.tar.gz
-	http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A}
-	"
-
-	RDEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )"
-
-S=${WORKDIR}/admin/${P}/src
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
-
-src_prepare() {
-	default
-	cd "${WORKDIR}/admin/"
-	eapply -p1 "${WORKDIR}/debian/patches"
-	cd "${S}"
-
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
-
-	# 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
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	sed -i \
-		-e "/echo.*ar.*cr/s,\<ar\>,$(tc-getAR)," \
-		-e "/echo.*ranlib/s,\<ranlib\>,$(tc-getRANLIB)," \
-		print-ar.sh || 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 '<sys-process/runit-2.1.2'; then
-		pre_212=yes
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		default_config
-	elif [[ -n $pre_212 ]]; then
-		migrate_from_211
-	fi
-
-	ewarn "To make sure sv works correctly in your currently open"
-	ewarn "shells, please run the following command:"
-	ewarn
-	ewarn "source /etc/profile"
-	ewarn
-
-	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
-	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"
-		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 "removed."
-		ewarn
-	fi
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-08-22 14:35 Mike Gilbert
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Gilbert @ 2024-08-22 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     9646b294a24fa9b7a6a89ba54e9ece4947635046
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 14:33:13 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 14:33:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9646b294

sys-process/runit: restore 2.1.2-r1

Allow users to downgrade to avoid reboot regression.

Bug: https://bugs.gentoo.org/938262
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 138 ++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..2250a85f21de
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+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
+
+	# 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
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+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]
+
+	dodir /etc/runit
+	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 '<sys-process/runit-2.1.2'; then
+		pre_212=yes
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z $REPLACING_VERSIONS ]]; then
+		default_config
+	elif [[ -n $pre_212 ]]; then
+		migrate_from_211
+	fi
+
+	ewarn "To make sure sv works correctly in your currently open"
+	ewarn "shells, please run the following command:"
+	ewarn
+	ewarn "source /etc/profile"
+	ewarn
+
+	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
+	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"
+		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 "removed."
+		ewarn
+	fi
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-08-22 14:06 Mike Gilbert
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Gilbert @ 2024-08-22 14:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c3e38688c65897ac005a120104e61a84979639b9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 14:06:04 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 14:06:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e38688

sys-process/runit: drop to maintainer-needed

Bug: https://bugs.gentoo.org/938282
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-process/runit/metadata.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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>


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-07-21  0:31 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2024-07-21  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     156e556611d11ac6cae72915df354222244fd346
Author:     Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev>
AuthorDate: Sun Jul 21 00:01:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 00:29:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156e5566

sys-process/runit: add sys-apps/openrc-navi dependency

Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/{runit-2.1.2-r2.ebuild => runit-2.1.2-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r3.ebuild
similarity index 98%
rename from sys-process/runit/runit-2.1.2-r2.ebuild
rename to sys-process/runit/runit-2.1.2-r3.ebuild
index 5f135925f8bc..4da7236850c6 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A}
 	"
 
-RDEPEND="sys-apps/openrc"
+	RDEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )"
 
 S=${WORKDIR}/admin/${P}/src
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:58 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     300740f2913f9e8147be40d177448925f89aa7fa
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:58:13 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:58:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300740f2

sys-process/runit: drop 2.1.2-r1

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 138 --------------------------------
 1 file changed, 138 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
deleted file mode 100644
index 2250a85f21de..000000000000
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-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
-
-	# 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
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-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]
-
-	dodir /etc/runit
-	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 '<sys-process/runit-2.1.2'; then
-		pre_212=yes
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		default_config
-	elif [[ -n $pre_212 ]]; then
-		migrate_from_211
-	fi
-
-	ewarn "To make sure sv works correctly in your currently open"
-	ewarn "shells, please run the following command:"
-	ewarn
-	ewarn "source /etc/profile"
-	ewarn
-
-	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
-	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"
-		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 "removed."
-		ewarn
-	fi
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:58 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8ae000ff35c0dad92d6c96fe0ba7abb694d37b15
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:57:43 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:57:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae000ff

sys-process/runit: Stabilize 2.1.2-r2 sparc, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index a61b0ba425cf..32957a762d66 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:58 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c17a1588a1a37c190f009b7a21d5fd17e76b79f4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:57:47 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:57:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17a1588

sys-process/runit: Stabilize 2.1.2-r2 amd64, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 32957a762d66..33f44493cb5a 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:58 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8b3f31166feda47f8d0b3007e69c01719cea906b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:57:51 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:57:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3f3116

sys-process/runit: Stabilize 2.1.2-r2 x86, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 33f44493cb5a..5f135925f8bc 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:27 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e1dbddd6796dedb57ba7e7cb5d987599c028bc9c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:27:01 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:27:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1dbddd6

sys-process/runit: Stabilize 2.1.2-r2 ppc64, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 190e23258ebc..3ae52d5ea8c1 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:27 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     7354ccc1ca4815700193644b43df1fc6e17c2ae8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:27:04 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:27:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7354ccc1

sys-process/runit: Stabilize 2.1.2-r2 arm, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 3ae52d5ea8c1..327eb516360c 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:27 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ed83807d75cdd596722e98ca95cd88c84943a915
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:26:58 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:26:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed83807d

sys-process/runit: Stabilize 2.1.2-r2 ppc, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 0d475b7e66d4..190e23258ebc 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-21 18:27 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-06-21 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     feacb6b8c5557788025e3f7e8701a6798f3a7839
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 18:27:10 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 18:27:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feacb6b8

sys-process/runit: Stabilize 2.1.2-r2 arm64, #934649

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 327eb516360c..a61b0ba425cf 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-06-16  6:07 Robin H. Johnson
  0 siblings, 0 replies; 34+ messages in thread
From: Robin H. Johnson @ 2024-06-16  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0e256f242d7ce36744c2165fd639bebe7f9b6589
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 06:02:59 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 06:07:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e256f24

sys-process/runit: EAPI=8 porting and other fixes

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=920357
Closes: https://bugs.gentoo.org/show_bug.cgi?id=875533
Closes: https://bugs.gentoo.org/show_bug.cgi?id=721880
Closes: https://bugs.gentoo.org/show_bug.cgi?id=590412

 sys-process/runit/Manifest              |   1 +
 sys-process/runit/runit-2.1.2-r2.ebuild | 149 ++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 8331848d7bf9..d3ffa90ef4a7 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1 +1,2 @@
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
+DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2

diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
new file mode 100644
index 000000000000..0d475b7e66d4
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -0,0 +1,149 @@
+# 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="http://smarden.org/runit/"
+UBUNTU_PR="59ubuntu1"
+UBUNTU_A="${PN}_${PV}-${UBUNTU_PR}.debian.tar.xz"
+SRC_URI="
+	http://smarden.org/runit/${P}.tar.gz
+	http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A}
+	"
+
+RDEPEND="sys-apps/openrc"
+
+S=${WORKDIR}/admin/${P}/src
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+src_prepare() {
+	default
+	cd "${WORKDIR}/admin/"
+	eapply -p1 "${WORKDIR}/debian/patches"
+	cd "${S}"
+
+	# we either build everything or nothing static
+	sed -i -e 's:-static: :' Makefile
+
+	# 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
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	sed -i \
+		-e "/echo.*ar.*cr/s,\<ar\>,$(tc-getAR)," \
+		-e "/echo.*ranlib/s,\<ranlib\>,$(tc-getRANLIB)," \
+		print-ar.sh || 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 '<sys-process/runit-2.1.2'; then
+		pre_212=yes
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z $REPLACING_VERSIONS ]]; then
+		default_config
+	elif [[ -n $pre_212 ]]; then
+		migrate_from_211
+	fi
+
+	ewarn "To make sure sv works correctly in your currently open"
+	ewarn "shells, please run the following command:"
+	ewarn
+	ewarn "source /etc/profile"
+	ewarn
+
+	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
+	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"
+		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 "removed."
+		ewarn
+	fi
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-01-12 16:41 Ionen Wolkens
  0 siblings, 0 replies; 34+ messages in thread
From: Ionen Wolkens @ 2024-01-12 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6ea6d6ba85b17a26911cd024aa8fde251b147d64
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 16:39:48 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 16:40:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea6d6ba

sys-process/runit: remove accidentally committed file

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 sys-process/runit/z | 124 ----------------------------------------------------
 1 file changed, 124 deletions(-)

diff --git a/sys-process/runit/z b/sys-process/runit/z
deleted file mode 100644
index 94ec0c233b7e..000000000000
--- a/sys-process/runit/z
+++ /dev/null
@@ -1,124 +0,0 @@
- * Info: Using [Gentoo] (https://bugs.gentoo.org/xmlrpc.cgi)
- * Info: Getting bug 862615 ..
-cf_runtime_testing_required: ---
-remaining_time: 0.0
-Blocks      : 610764
-Component   : Current packages
-OpSystem    : Linux
-AssignedTo  : williamh@gentoo.org
-Updated     : 20220911T22:19:38
-Hardware    : All
-actual_time : 0.0
-classification: Unclassified
-Priority    : Normal
-Version     : unspecified
-Title       : sys-process/runit: duplicate pkg_preinst definition
-Severity    : normal
-Reporter    : sam@gentoo.org
-estimated_time: 0.0
-TargetMilestone: ---
-Status      : CONFIRMED
-CC          : base-system@gentoo.org
-Reported    : 20220801T02:32:59
-Product     : Gentoo Linux
-Attachments : 0
-
-Comments    : 3
-
-[Comment #0] sam@gentoo.org : 20220801T02:32:59
--------------------------------------------------------------------------------
-runit-2.1.2-r1.ebuild has two definitions of pkg_preinst:
-
-1) This one comes first (so is NOT used):
-```
-pkg_preinst() {
-        if has_version 'sys-process/runit' &&
-                has_version '<sys-process/runit-2.1.2' &&
-                [ -d "${EROOT}"etc/runit/runsvdir/all ]; then
-                if [ -e "${EROOT}"etc/sv ]; then
-                        mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
-                        ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
-                fi
-                mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
-                ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
-                cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
-                touch "${T}"/make_var_service || die
-        fi
-}
-```
-
-2) This one comes last (so is the one used):
-```
-pkg_postinst() {
-        if [[ -z $REPLACING_VERSIONS ]]; then
-                default_config
-        elif [[ -n $pre_212 ]]; then
-                migrate_from_211
-        fi
-
-        ewarn "To make sure sv works correctly in your currently open"
-        ewarn "shells, please run the following command:"
-        ewarn
-        ewarn "source /etc/profile"
-        ewarn
-
-        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
-        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"
-                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 "removed."
-                ewarn
-        fi
-}
-```
-
-Which one is supposed to be used?
-
-[Comment #1] sam@gentoo.org : 20220801T02:35:24
--------------------------------------------------------------------------------
-(Recommenting as first comment had wrong paste of second definition.)
-
-runit-2.1.2-r1.ebuild has two definitions of pkg_preinst:
-
-1) This one comes first (so is NOT used):
-```
-pkg_preinst() {
-        if has_version 'sys-process/runit' &&
-                has_version '<sys-process/runit-2.1.2' &&
-                [ -d "${EROOT}"etc/runit/runsvdir/all ]; then
-                if [ -e "${EROOT}"etc/sv ]; then
-                        mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
-                        ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
-                fi
-                mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
-                ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
-                cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
-                touch "${T}"/make_var_service || die
-        fi
-}
-```
-
-2) This one comes last (so is the one used):
-```
-pkg_preinst() {
-        if  has_version '<sys-process/runit-2.1.2'; then
-                pre_212=yes
-        fi
-}
-```
-
-[Comment #2] sam@gentoo.org : 20220911T22:19:38
--------------------------------------------------------------------------------
-ping


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2024-01-12 16:31 William Hubbs
  0 siblings, 0 replies; 34+ messages in thread
From: William Hubbs @ 2024-01-12 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2551d80560ef06307944b0c04ae9677db9ff1d32
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 16:31:09 2024 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 16:31:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2551d805

sys-process/runit: remove duplicate pkg_preinst definition

Closes: https://bugs.gentoo.org/862615
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild |  17 +----
 sys-process/runit/z                     | 124 ++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 16 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 3dcf174b65dc..2250a85f21de 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,21 +73,6 @@ src_install() {
 	EOF
 }
 
-pkg_preinst() {
-	if has_version 'sys-process/runit' &&
-		has_version '<sys-process/runit-2.1.2' &&
-		[ -d "${EROOT}"etc/runit/runsvdir/all ]; then
-		if [ -e "${EROOT}"etc/sv ]; then
-			mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
-			ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
-		fi
-		mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
-		ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
-		cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
-		touch "${T}"/make_var_service || die
-	fi
-}
-
 default_config() {
 	local sv="${EROOT}"etc/sv
 	local service="${EROOT}"etc/service

diff --git a/sys-process/runit/z b/sys-process/runit/z
new file mode 100644
index 000000000000..94ec0c233b7e
--- /dev/null
+++ b/sys-process/runit/z
@@ -0,0 +1,124 @@
+ * Info: Using [Gentoo] (https://bugs.gentoo.org/xmlrpc.cgi)
+ * Info: Getting bug 862615 ..
+cf_runtime_testing_required: ---
+remaining_time: 0.0
+Blocks      : 610764
+Component   : Current packages
+OpSystem    : Linux
+AssignedTo  : williamh@gentoo.org
+Updated     : 20220911T22:19:38
+Hardware    : All
+actual_time : 0.0
+classification: Unclassified
+Priority    : Normal
+Version     : unspecified
+Title       : sys-process/runit: duplicate pkg_preinst definition
+Severity    : normal
+Reporter    : sam@gentoo.org
+estimated_time: 0.0
+TargetMilestone: ---
+Status      : CONFIRMED
+CC          : base-system@gentoo.org
+Reported    : 20220801T02:32:59
+Product     : Gentoo Linux
+Attachments : 0
+
+Comments    : 3
+
+[Comment #0] sam@gentoo.org : 20220801T02:32:59
+-------------------------------------------------------------------------------
+runit-2.1.2-r1.ebuild has two definitions of pkg_preinst:
+
+1) This one comes first (so is NOT used):
+```
+pkg_preinst() {
+        if has_version 'sys-process/runit' &&
+                has_version '<sys-process/runit-2.1.2' &&
+                [ -d "${EROOT}"etc/runit/runsvdir/all ]; then
+                if [ -e "${EROOT}"etc/sv ]; then
+                        mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
+                        ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
+                fi
+                mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
+                ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
+                cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
+                touch "${T}"/make_var_service || die
+        fi
+}
+```
+
+2) This one comes last (so is the one used):
+```
+pkg_postinst() {
+        if [[ -z $REPLACING_VERSIONS ]]; then
+                default_config
+        elif [[ -n $pre_212 ]]; then
+                migrate_from_211
+        fi
+
+        ewarn "To make sure sv works correctly in your currently open"
+        ewarn "shells, please run the following command:"
+        ewarn
+        ewarn "source /etc/profile"
+        ewarn
+
+        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
+        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"
+                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 "removed."
+                ewarn
+        fi
+}
+```
+
+Which one is supposed to be used?
+
+[Comment #1] sam@gentoo.org : 20220801T02:35:24
+-------------------------------------------------------------------------------
+(Recommenting as first comment had wrong paste of second definition.)
+
+runit-2.1.2-r1.ebuild has two definitions of pkg_preinst:
+
+1) This one comes first (so is NOT used):
+```
+pkg_preinst() {
+        if has_version 'sys-process/runit' &&
+                has_version '<sys-process/runit-2.1.2' &&
+                [ -d "${EROOT}"etc/runit/runsvdir/all ]; then
+                if [ -e "${EROOT}"etc/sv ]; then
+                        mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
+                        ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
+                fi
+                mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
+                ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
+                cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
+                touch "${T}"/make_var_service || die
+        fi
+}
+```
+
+2) This one comes last (so is the one used):
+```
+pkg_preinst() {
+        if  has_version '<sys-process/runit-2.1.2'; then
+                pre_212=yes
+        fi
+}
+```
+
+[Comment #2] sam@gentoo.org : 20220911T22:19:38
+-------------------------------------------------------------------------------
+ping


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2022-08-01  2:33 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-08-01  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     38cc48f9b88073efb43bbe9bc9e2a00d79051464
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 02:31:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 02:31:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cc48f9

sys-process/runit: fix indentation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 607ed990d6e5..3dcf174b65dc 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -49,7 +49,7 @@ src_install() {
 	einstalldocs
 	doman ../man/*.[18]
 
-dodir /etc/runit
+	dodir /etc/runit
 	exeinto /etc/runit
 	doexe "${FILESDIR}"/ctrlaltdel
 	newexe "${FILESDIR}"/1-${PV} 1


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2022-02-13 21:08 Conrad Kostecki
  0 siblings, 0 replies; 34+ messages in thread
From: Conrad Kostecki @ 2022-02-13 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     7b8d802623b9d4960499caedbb7c28b186b26ce4
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 00:22:54 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 21:07:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8d8026

sys-process/runit: fix DeprecatedInsinto

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index a920443a3f97..607ed990d6e5 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,12 +67,10 @@ dodir /etc/runit
 	done
 
 	# make sv command work
-	cat <<-EOF > "${T}"/env.d
+	newenvd - 20runit <<- EOF
 		#/etc/env.d/20runit
 		SVDIR="/etc/service/"
 	EOF
-	insinto /etc/env.d
-	newins "${T}"/env.d 20runit
 }
 
 pkg_preinst() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-14  9:35 Agostino Sarubbo
  0 siblings, 0 replies; 34+ messages in thread
From: Agostino Sarubbo @ 2021-05-14  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     585577c6e7e81b82d08c1abc2f1938557e3a1bc7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 09:34:18 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 14 09:34:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585577c6

sys-process/runit: sparc stable wrt bug #790035

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 716f5f96891..a920443a3f9 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-13 21:17 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-13 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ce5295a0b656b8524a40953f5a8caeb3b6ebf146
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:16:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:16:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5295a0

sys-process/runit: Stabilize 2.1.2-r1 ppc64, #790035

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 73d124a8b6f..53ddaca332a 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-13 21:17 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-13 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     dd6eecfc6b168f6612986ec34633c6e3ef523cc0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:17:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:17:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6eecfc

sys-process/runit: Stabilize 2.1.2-r1 ppc, #790035

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 53ddaca332a..716f5f96891 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-13 21:16 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-13 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8fb5fae5a29261cf3d1447bf1d0c5a69de5c4016
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:16:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:16:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb5fae5

sys-process/runit: Stabilize 2.1.2-r1 amd64, #790035

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 2c1634eb2ae..73d124a8b6f 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-13 21:15 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-13 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     5c57c0ec7c31a19881f0307cbdc6c368cc4c48d1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:04:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:04:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c57c0ec

sys-process/runit: Stabilize 2.1.2-r1 arm, #790035

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index fef17582a3c..d2b70ddc8f0 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2021-05-13 21:15 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-13 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     4808ea61f8ddf4ea01fca1b39dab98fe1fc2d11d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:03:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:03:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4808ea61

sys-process/runit: Stabilize 2.1.2-r1 arm64, #790035

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 9647df0a33f..fef17582a3c 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2018-05-20  0:20 William Hubbs
  0 siblings, 0 replies; 34+ messages in thread
From: William Hubbs @ 2018-05-20  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4cc8e6626371ca52829b8fce74ad9b4f13639ab6
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 00:20:19 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May 20 00:20:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc8e662

sys-process/runit: remove 2.1.1-r1 for eapi3 removal

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-process/runit/runit-2.1.1-r1.ebuild | 72 ---------------------------------
 1 file changed, 72 deletions(-)

diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild
deleted file mode 100644
index 806a4a39161..00000000000
--- a/sys-process/runit/runit-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static"
-
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_install() {
-	dodir /var
-	keepdir /etc/runit{,/runsvdir{,/default,/all}}
-	dosym default /etc/runit/runsvdir/current
-	dosym ../etc/runit/runsvdir/current /var/service
-	dosym ../etc/runit/2 /sbin/runsvdir-start
-
-	dobin $(<../package/commands) || die "dobin"
-	dodir /sbin
-	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-
-	cd "${S}"/..
-	dodoc package/{CHANGES,README,THANKS,TODO}
-	dohtml doc/*.html
-	doman man/*.[18]
-
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel} || die
-	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
-		exeinto /etc/runit/runsvdir/all/getty-$tty/
-		for script in run finish; do
-			newexe "${FILESDIR}"/$script.getty $script
-			dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script
-		done
-		dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
-	done
-
-	# make sv command work
-	cd "${S}"
-	insinto /etc/env.d
-	cat <<-EOF > env.d
-		#/etc/env.d/20runit
-		SVDIR="/var/service/"
-	EOF
-	newins env.d 20runit
-}
-
-pkg_postinst() {
-	ewarn "/etc/profile was updated. Please run:"
-	ewarn "source /etc/profile"
-	ewarn "to make 'sv' work correctly on your currently open shells"
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2018-05-20  0:18 William Hubbs
  0 siblings, 0 replies; 34+ messages in thread
From: William Hubbs @ 2018-05-20  0:18 UTC (permalink / raw
  To: gentoo-commits

commit:     2f26d2dc5406a99c9e63874270ad8d227aabd10d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 00:15:50 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May 20 00:17:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f26d2dc

sys-process/runit: 2.1.1-r2 revbump to remove eapi 3 ebuild

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force

 sys-process/runit/runit-2.1.1-r2.ebuild | 72 +++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/sys-process/runit/runit-2.1.1-r2.ebuild b/sys-process/runit/runit-2.1.1-r2.ebuild
new file mode 100644
index 00000000000..48bdcfc31e7
--- /dev/null
+++ b/sys-process/runit/runit-2.1.1-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="static"
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+	default
+	# we either build everything or nothing static
+	sed -i -e 's:-static: :' Makefile || die "sed of Makefile failed"
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die "setting cflags"
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die "setting ldflags failed"
+}
+
+src_install() {
+	keepdir /etc/runit{,/runsvdir{,/default,/all}}
+	dosym default /etc/runit/runsvdir/current
+	dosym ../etc/runit/runsvdir/current /var/service
+	dosym ../etc/runit/2 /sbin/runsvdir-start
+
+	dobin $(<../package/commands)
+	dodir /sbin
+	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
+
+	cd "${S}"/..
+	dodoc package/{CHANGES,README,THANKS,TODO}
+	dohtml doc/*.html
+	doman man/*.[18]
+
+	exeinto /etc/runit
+	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel}
+	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
+		exeinto /etc/runit/runsvdir/all/getty-$tty/
+		for script in run finish; do
+			newexe "${FILESDIR}"/$script.getty $script
+			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/runit/runsvdir/all/getty-$tty/$script
+		done
+		dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
+	done
+
+	# make sv command work
+	cd "${S}"
+	insinto /etc/env.d
+	cat <<-EOF > env.d
+		#/etc/env.d/20runit
+		SVDIR="/var/service/"
+	EOF
+	newins env.d 20runit
+}
+
+pkg_postinst() {
+	ewarn "/etc/profile was updated. Please run:"
+	ewarn "source /etc/profile"
+	ewarn "to make 'sv' work correctly on your currently open shells"
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2016-11-15  3:47 Mike Frysinger
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Frysinger @ 2016-11-15  3:47 UTC (permalink / raw
  To: gentoo-commits

commit:     facdabba5a56772de06bd78a31e5e158ba92ec34
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 03:38:22 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 03:47:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=facdabba

sys-process/runit: mark 2.1.1-r1 s390/sh stable

 sys-process/runit/runit-2.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild
index 3504ca1..d49fb23 100644
--- a/sys-process/runit/runit-2.1.1-r1.ebuild
+++ b/sys-process/runit/runit-2.1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 
 S=${WORKDIR}/admin/${P}/src


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2016-11-14 14:50 Mike Frysinger
  0 siblings, 0 replies; 34+ messages in thread
From: Mike Frysinger @ 2016-11-14 14:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f512dea57e771856b98d9d50eebf426938776f45
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 14:46:38 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 14:49:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f512dea5

sys-process/runit: add arm64/m68k love

 sys-process/runit/runit-2.1.1-r1.ebuild | 2 +-
 sys-process/runit/runit-2.1.2-r1.ebuild | 2 +-
 sys-process/runit/runit-2.1.2.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild
index 6e556c4..3504ca1 100644
--- a/sys-process/runit/runit-2.1.1-r1.ebuild
+++ b/sys-process/runit/runit-2.1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static"
 
 S=${WORKDIR}/admin/${P}/src

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index f230ae3..9c72540 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static"
 
 RDEPEND="sys-apps/openrc"

diff --git a/sys-process/runit/runit-2.1.2.ebuild b/sys-process/runit/runit-2.1.2.ebuild
index 6e28dc4..8dce5f2 100644
--- a/sys-process/runit/runit-2.1.2.ebuild
+++ b/sys-process/runit/runit-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static"
 
 S=${WORKDIR}/admin/${P}/src


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
@ 2016-11-11 18:52 William Hubbs
  0 siblings, 0 replies; 34+ messages in thread
From: William Hubbs @ 2016-11-11 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     281c357a6aa006e2a206c073cf9e7c62c831b01c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 18:51:08 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 18:51:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281c357a

sys-process/runit: Complete migrating 2.1.2-r1 to EAPI 6

Package-Manager: portage-2.3.0

 sys-process/runit/runit-2.1.2-r1.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index c874b77..f230ae3 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -44,12 +44,11 @@ src_install() {
 	dodir /sbin
 	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
 	dosym ../etc/runit/2 /sbin/runsvdir-start
-	into /usr
 
-	cd ..
-	dodoc package/{CHANGES,README,THANKS,TODO}
-	dohtml doc/*.html
-	doman man/*.[18]
+	DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
+	HTML_DOCS=( ../doc/*.html )
+	einstalldocs
+	doman ../man/*.[18]
 
 dodir /etc/runit
 	exeinto /etc/runit


^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2024-10-07 15:33 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-13 21:15 [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-10-07 15:33 Mike Gilbert
2024-09-05 14:42 Mike Gilbert
2024-09-05 14:42 Mike Gilbert
2024-08-23  7:33 Ulrich Müller
2024-08-23  7:28 Sam James
2024-08-23  7:28 Sam James
2024-08-22 14:35 Mike Gilbert
2024-08-22 14:06 Mike Gilbert
2024-07-21  0:31 Sam James
2024-06-21 18:58 Arthur Zamarin
2024-06-21 18:58 Arthur Zamarin
2024-06-21 18:58 Arthur Zamarin
2024-06-21 18:58 Arthur Zamarin
2024-06-21 18:27 Arthur Zamarin
2024-06-21 18:27 Arthur Zamarin
2024-06-21 18:27 Arthur Zamarin
2024-06-21 18:27 Arthur Zamarin
2024-06-16  6:07 Robin H. Johnson
2024-01-12 16:41 Ionen Wolkens
2024-01-12 16:31 William Hubbs
2022-08-01  2:33 Sam James
2022-02-13 21:08 Conrad Kostecki
2021-05-14  9:35 Agostino Sarubbo
2021-05-13 21:17 Sam James
2021-05-13 21:17 Sam James
2021-05-13 21:16 Sam James
2021-05-13 21:15 Sam James
2021-05-13 21:15 Sam James
2018-05-20  0:20 William Hubbs
2018-05-20  0:18 William Hubbs
2016-11-15  3:47 Mike Frysinger
2016-11-14 14:50 Mike Frysinger
2016-11-11 18:52 William Hubbs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox