[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-04-17 Thread Petr Vaněk
commit: 90d226de6d0cb6f0e9bc12b45ff6724c3845dd5a
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Apr 17 07:56:32 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Apr 17 07:59:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d226de

sys-apps/s6: add 2.12.0.4

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/Manifest   |  1 +
 sys-apps/s6/s6-2.12.0.4.ebuild | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index aeaf57560d97..1ad9b30254dc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.12.0.3.tar.gz 255368 BLAKE2B 
2d30b327d45f0cd803cfff1b649b8393d54ff32eb545b536f17d74abca9f5a5638fdea26a5c015756d45ad48201b4adc7479b6cfd7c3f8957693fc3018127c00
 SHA512 
ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a
+DIST s6-2.12.0.4.tar.gz 255314 BLAKE2B 
4a7da37affdc2d0651da905fdfbffe897709cc6f2a4a36453f0a87c88da66adb307805b9f8c850813186ce51c18ed07b8a95aa34a8a266a5a24b3b8646b19485
 SHA512 
dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
new file mode 100644
index ..721d293067ea
--- /dev/null
+++ b/sys-apps/s6/s6-2.12.0.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+   >=dev-libs/skalibs-2.14.1.0:=
+   execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   $(use_enable execline)
+   )
+
+   econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+   optfeature "man pages" app-doc/s6-man-pages
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-01-22 Thread Petr Vaněk
commit: f66edeee3691fe8f39097e64a74c525bb1cc1f04
Author: Petr Vaněk  gentoo  org>
AuthorDate: Mon Jan 22 08:06:14 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Mon Jan 22 08:18:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66edeee

sys-apps/s6: drop 2.12.0.2-r1

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/Manifest  |  1 -
 sys-apps/s6/s6-2.12.0.2-r1.ebuild | 58 ---
 2 files changed, 59 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 66a336cad729..aeaf57560d97 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1 @@
-DIST s6-2.12.0.2.tar.gz 255801 BLAKE2B 
5aa4ecf28cbde17ce9f80849508989607a0e7340bbb1fb0ae92cf021d887cc6870f53700b384dbcb42d757268ec9c372229f41facf04e812cd02cdb64dd48e37
 SHA512 
55f6590801df51bbbc3feb467c67df1587b9c1ade4fbfccb4852238e16713c7f2a163468fabe114e4632e812e7daa1020c0dda14d02a26e86b085b61552e4f73
 DIST s6-2.12.0.3.tar.gz 255368 BLAKE2B 
2d30b327d45f0cd803cfff1b649b8393d54ff32eb545b536f17d74abca9f5a5638fdea26a5c015756d45ad48201b4adc7479b6cfd7c3f8957693fc3018127c00
 SHA512 
ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a

diff --git a/sys-apps/s6/s6-2.12.0.2-r1.ebuild 
b/sys-apps/s6/s6-2.12.0.2-r1.ebuild
deleted file mode 100644
index 038b7a16fe9e..
--- a/sys-apps/s6/s6-2.12.0.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~mips ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
-   =dev-libs/skalibs-2.14.0*:=
-   execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/execline"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   $(use_enable execline)
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   optfeature "man pages" app-doc/s6-man-pages
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-01-20 Thread Sam James
commit: 3406f0c3f3f7a231f6e6dc7094e0674a0e54ba95
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 21 04:28:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 21 04:28:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3406f0c3

sys-apps/s6: Stabilize 2.12.0.3 x86, #922583

Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6/s6-2.12.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.12.0.3.ebuild b/sys-apps/s6/s6-2.12.0.3.ebuild
index c0d9c3faa196..4d48f7fe8db5 100644
--- a/sys-apps/s6/s6-2.12.0.3.ebuild
+++ b/sys-apps/s6/s6-2.12.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~mips ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-01-20 Thread Sam James
commit: 30d26f4bb0a0988b0276f366f28ed1fdc1922156
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 21 04:28:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 21 04:28:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d26f4b

sys-apps/s6: Stabilize 2.12.0.3 amd64, #922583

Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6/s6-2.12.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6/s6-2.12.0.3.ebuild b/sys-apps/s6/s6-2.12.0.3.ebuild
index ea810a0eb490..c0d9c3faa196 100644
--- a/sys-apps/s6/s6-2.12.0.3.ebuild
+++ b/sys-apps/s6/s6-2.12.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~riscv ~x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-01-20 Thread Sam James
commit: b3a8d28aeaa00f9215a2c7205a2171a3cf05bf2d
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 21 04:28:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 21 04:28:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a8d28a

sys-apps/s6: Stabilize 2.12.0.3 arm, #922583

Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6/s6-2.12.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.12.0.3.ebuild b/sys-apps/s6/s6-2.12.0.3.ebuild
index 4d48f7fe8db5..47b107317105 100644
--- a/sys-apps/s6/s6-2.12.0.3.ebuild
+++ b/sys-apps/s6/s6-2.12.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~mips ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~mips ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2024-01-17 Thread Petr Vaněk
commit: 0d8be132aece610d44411d5f82daa979f1adf8e0
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Jan 17 10:33:40 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Jan 17 10:38:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8be132

sys-apps/s6-rc: drop 0.5.4.1-r1

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-rc/Manifest|  1 -
 sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild | 65 --
 2 files changed, 66 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index a37e5cd863c7..b8157b68c6fa 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1 @@
-DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B 
d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14
 SHA512 
6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086
 DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B 
d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f
 SHA512 
f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
deleted file mode 100644
index bb035ef77314..
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-   dev-lang/execline:=
-   =sys-apps/s6-2.11.3.0:=[execline]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/execline"
-   --with-lib="/usr/$(get_libdir)/s6"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   for ver in ${REPLACING_VERSIONS}; do
-   if ver_test "${ver}" -lt "0.5.4.0"; then
-   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
-   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
-   elog "restart s6rc-oneshot-runner service because you 
are upgrading from older"
-   elog "version."
-   fi
-   done
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-01-17 Thread Petr Vaněk
commit: 446cc7ced923a0cb38e0f149fadbfb84673ffcca
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Jan 17 10:33:58 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Jan 17 10:38:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446cc7ce

sys-apps/s6: drop 2.11.3.2-r1

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/Manifest  |  1 -
 sys-apps/s6/s6-2.11.3.2-r1.ebuild | 54 ---
 2 files changed, 55 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 3d1c9464762d..66a336cad729 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,2 @@
-DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
 DIST s6-2.12.0.2.tar.gz 255801 BLAKE2B 
5aa4ecf28cbde17ce9f80849508989607a0e7340bbb1fb0ae92cf021d887cc6870f53700b384dbcb42d757268ec9c372229f41facf04e812cd02cdb64dd48e37
 SHA512 
55f6590801df51bbbc3feb467c67df1587b9c1ade4fbfccb4852238e16713c7f2a163468fabe114e4632e812e7daa1020c0dda14d02a26e86b085b61552e4f73
 DIST s6-2.12.0.3.tar.gz 255368 BLAKE2B 
2d30b327d45f0cd803cfff1b649b8393d54ff32eb545b536f17d74abca9f5a5638fdea26a5c015756d45ad48201b4adc7479b6cfd7c3f8957693fc3018127c00
 SHA512 
ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a

diff --git a/sys-apps/s6/s6-2.11.3.2-r1.ebuild 
b/sys-apps/s6/s6-2.11.3.2-r1.ebuild
deleted file mode 100644
index 3f47f07910ad..
--- a/sys-apps/s6/s6-2.11.3.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
-   dev-libs/skalibs:0/2.13
-   execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/execline"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   $(use_enable execline)
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2024-01-17 Thread Petr Vaněk
commit: 83afad1a500dd8b4eb1e87245a98a7c71f424c0d
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Jan 17 10:27:26 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Jan 17 10:38:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83afad1a

sys-apps/s6-linux-init: drop 1.1.1.1-r1

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 -
 .../s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild  | 75 --
 2 files changed, 76 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index defbde6a96e1..24a3f01450a8 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1 @@
-DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B 
a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566
 SHA512 
7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
 DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B 
e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e
 SHA512 
76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
deleted file mode 100644
index 90102a4af725..
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-IUSE="+sysv-utils"
-
-RDEPEND="
-   dev-lang/execline:=
-   dev-libs/skalibs:0/2.13
-   sys-apps/s6:=[execline]
-   sysv-utils? (
-   !sys-apps/openrc[sysv-utils(-)]
-   !sys-apps/systemd[sysv-utils]
-   !sys-apps/sysvinit
-   )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --skeldir=/etc/s6-linux-init/skel
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/s6"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   if use sysv-utils ; then
-   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
-   into /
-   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-   fi
-}
-
-pkg_postinst() {
-   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-   einfo "for usage instructions."
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2024-01-17 Thread Petr Vaněk
commit: 3b01df3e4db6820ada4ee36866d8f25c89bdf36f
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Jan 17 10:28:53 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Jan 17 10:38:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b01df3e

sys-apps/s6-portable-utils: drop 2.3.0.2-r1

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 -
 .../s6-portable-utils-2.3.0.2-r1.ebuild| 46 --
 2 files changed, 47 deletions(-)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index 5f7b0711ba06..5c74fce4b105 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,2 +1 @@
-DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B 
a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215
 SHA512 
f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72
 DIST s6-portable-utils-2.3.0.3.tar.gz 51186 BLAKE2B 
9a0b9f33a89cca730afc8190ab7be7fc25ed286970b430d33d8eb91d5b6e5ac4261e659674ec44c5e5a88b32a324cb62ee63837923f0a7481675c8eaa3e8804c
 SHA512 
f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
deleted file mode 100644
index 038ce3ba71c2..
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="dev-libs/skalibs:0/2.13"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2024-01-17 Thread Petr Vaněk
commit: 3a1432221776a8be7c3f6535576b327ac23a7e84
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Jan 17 10:29:30 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Jan 17 10:38:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a143222

sys-apps/s6-linux-utils: drop 2.6.1.2

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 -
 .../s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild   | 46 --
 2 files changed, 47 deletions(-)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 996d642777e9..635553dbf957 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,2 +1 @@
-DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 
8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159
 SHA512 
7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7
 DIST s6-linux-utils-2.6.2.0.tar.gz 43287 BLAKE2B 
2dcad4eac6250f7dfb31946baa8b21068297d6723bfd03abb01389183ca7b586db82e12be37acd9d2016923c0c693865153129fc265dd9e00852c1ba0c39c488
 SHA512 
b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
deleted file mode 100644
index 9fd0c86a78b0..
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2024-01-16 Thread Ionen Wolkens
commit: 56b18d9b88a268617f201847cd0dcc3410700c83
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 20:30:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 02:44:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b18d9b

sys-apps/s6-portable-utils: Stabilize 2.3.0.3 arm, #920377

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
index 2884a181ff9a..f212f9178741 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2024-01-16 Thread Ionen Wolkens
commit: ad2d1aa1ff44ee13f7a812f325669f505133422d
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 20:30:47 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 02:44:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2d1aa1

sys-apps/s6: Stabilize 2.12.0.2-r1 arm, #920377

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 sys-apps/s6/s6-2.12.0.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6/s6-2.12.0.2-r1.ebuild 
b/sys-apps/s6/s6-2.12.0.2-r1.ebuild
index 7bf1c6e02395..038b7a16fe9e 100644
--- a/sys-apps/s6/s6-2.12.0.2-r1.ebuild
+++ b/sys-apps/s6/s6-2.12.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~mips ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~mips ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2024-01-16 Thread Ionen Wolkens
commit: 249d1fa3b1c966d16357309c57b2d04af39d4d5e
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 20:30:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 02:44:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249d1fa3

sys-apps/s6-linux-utils: Stabilize 2.6.2.0 arm, #920377

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
index ba5d70f74e27..1a6996910b2b 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2024-01-16 Thread Ionen Wolkens
commit: 9d56f25ddff2521c15f3113f4042c255b0978ad0
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 20:30:47 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 02:44:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d56f25d

sys-apps/s6-linux-init: Stabilize 1.1.2.0 arm, #920377

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
index c695a5a74380..6de4c9c6cd00 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~mips x86"
+KEYWORDS="~alpha amd64 arm ~mips x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2024-01-16 Thread Ionen Wolkens
commit: aa63662aa116c3b2cda54ca757e51445f3eb888c
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 20:30:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 02:44:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa63662a

sys-apps/s6-rc: Stabilize 0.5.4.2 arm, #920377

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
index d7cbfcfa7c2c..c1c9f919cb9e 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-12-21 Thread Petr Vaněk
commit: b9e5628e7c56c8a40d560133cb14df8fd853f52c
Author: Petr Vaněk  gentoo  org>
AuthorDate: Thu Dec 21 13:13:52 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Thu Dec 21 14:22:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e5628e

sys-apps/s6: add 2.12.0.3

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/Manifest   |  1 +
 sys-apps/s6/s6-2.12.0.3.ebuild | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 057529aafb25..3d1c9464762d 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1,3 @@
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
 DIST s6-2.12.0.2.tar.gz 255801 BLAKE2B 
5aa4ecf28cbde17ce9f80849508989607a0e7340bbb1fb0ae92cf021d887cc6870f53700b384dbcb42d757268ec9c372229f41facf04e812cd02cdb64dd48e37
 SHA512 
55f6590801df51bbbc3feb467c67df1587b9c1ade4fbfccb4852238e16713c7f2a163468fabe114e4632e812e7daa1020c0dda14d02a26e86b085b61552e4f73
+DIST s6-2.12.0.3.tar.gz 255368 BLAKE2B 
2d30b327d45f0cd803cfff1b649b8393d54ff32eb545b536f17d74abca9f5a5638fdea26a5c015756d45ad48201b4adc7479b6cfd7c3f8957693fc3018127c00
 SHA512 
ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a

diff --git a/sys-apps/s6/s6-2.12.0.3.ebuild b/sys-apps/s6/s6-2.12.0.3.ebuild
new file mode 100644
index ..ea810a0eb490
--- /dev/null
+++ b/sys-apps/s6/s6-2.12.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+   >=dev-libs/skalibs-2.14.1.0:=
+   execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   $(use_enable execline)
+   )
+
+   econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+   optfeature "man pages" app-doc/s6-man-pages
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-12-21 Thread Petr Vaněk
commit: 12a9744883eff1d0d5305042c9a4efdf8329dac5
Author: Petr Vaněk  gentoo  org>
AuthorDate: Thu Dec 21 13:18:18 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Thu Dec 21 14:22:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a97448

sys-apps/s6: restrict to =dev-libs/skalibs-2.14.0*

This version is incompatible with new skalibs release due to an api
change.

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/{s6-2.12.0.2.ebuild => s6-2.12.0.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.12.0.2.ebuild b/sys-apps/s6/s6-2.12.0.2-r1.ebuild
similarity index 97%
rename from sys-apps/s6/s6-2.12.0.2.ebuild
rename to sys-apps/s6/s6-2.12.0.2-r1.ebuild
index 08defb0d5f01..7bf1c6e02395 100644
--- a/sys-apps/s6/s6-2.12.0.2.ebuild
+++ b/sys-apps/s6/s6-2.12.0.2-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm ~mips ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="
-   >=dev-libs/skalibs-2.14.0.0:=
+   =dev-libs/skalibs-2.14.0*:=
execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-12-21 Thread Petr Vaněk
commit: 7710cc2f9000f6adda0357e5541cd6ff795516bc
Author: Petr Vaněk  gentoo  org>
AuthorDate: Thu Dec 21 13:16:53 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Thu Dec 21 14:22:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7710cc2f

sys-apps/s6: drop 2.12.0.0

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/Manifest   |  1 -
 sys-apps/s6/s6-2.12.0.0.ebuild | 54 --
 2 files changed, 55 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 0688d5ab4106..057529aafb25 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,2 @@
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
-DIST s6-2.12.0.0.tar.gz 255678 BLAKE2B 
cee3bccbdfb8dee8e38ad2757ed650dea5e940835df463fac447cb71404eedd331444f7f59de4aded98804e0f9b0dde7df19ceec081ee122d38fbf0747318fba
 SHA512 
203de171fa6272c56d322b2ec1cd5b8690841bc4e047eb5118846415541905789a44abd37621f67ae97313f4b0fdfb42fe2c88dd83a0d60f0fe2956990881c96
 DIST s6-2.12.0.2.tar.gz 255801 BLAKE2B 
5aa4ecf28cbde17ce9f80849508989607a0e7340bbb1fb0ae92cf021d887cc6870f53700b384dbcb42d757268ec9c372229f41facf04e812cd02cdb64dd48e37
 SHA512 
55f6590801df51bbbc3feb467c67df1587b9c1ade4fbfccb4852238e16713c7f2a163468fabe114e4632e812e7daa1020c0dda14d02a26e86b085b61552e4f73

diff --git a/sys-apps/s6/s6-2.12.0.0.ebuild b/sys-apps/s6/s6-2.12.0.0.ebuild
deleted file mode 100644
index 8ac261aaceea..
--- a/sys-apps/s6/s6-2.12.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~riscv ~x86"
-IUSE="+execline"
-
-RDEPEND="
-   >=dev-libs/skalibs-2.14.0.0:=
-   execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/execline"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   $(use_enable execline)
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-12-20 Thread Joonas Niilola
commit: 3d86da8c665563a571eaf8cbcebab9b77c501098
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:12:01 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:12:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d86da8c

sys-apps/s6-linux-init: Stabilize 1.1.2.0 x86, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
index e56e4fdad20a..c695a5a74380 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~mips ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-12-20 Thread Joonas Niilola
commit: 47ea44e8629c6ee6ba1769087b28e983f83bad5e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:11:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:11:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ea44e8

sys-apps/s6: Stabilize 2.12.0.2 amd64, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/s6-2.12.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.12.0.2.ebuild b/sys-apps/s6/s6-2.12.0.2.ebuild
index 29e18c6f7ddd..2f3047b36641 100644
--- a/sys-apps/s6/s6-2.12.0.2.ebuild
+++ b/sys-apps/s6/s6-2.12.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~riscv ~x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-12-20 Thread Joonas Niilola
commit: a502ff90e133fe9f8e9dc039d87c502b2cf04e04
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:12:02 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:12:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a502ff90

sys-apps/s6-portable-utils: Stabilize 2.3.0.3 x86, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
index 8797d0c276f6..2884a181ff9a 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-12-20 Thread Joonas Niilola
commit: d0292808c24634c4b2a87ff2155b7496bcca7da2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:12:02 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:12:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0292808

sys-apps/s6-rc: Stabilize 0.5.4.2 x86, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
index e6b3a34738e5..d7cbfcfa7c2c 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-12-20 Thread Joonas Niilola
commit: b8583f68979a1dc3a43fc89263643ff9fd9be90b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:12:02 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:12:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8583f68

sys-apps/s6-linux-utils: Stabilize 2.6.2.0 x86, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
index 1769e60ef6d6..ba5d70f74e27 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-12-20 Thread Joonas Niilola
commit: afbd9f5c026e436fd9a5eec41b371f7f7050a3b3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:12:01 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:12:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afbd9f5c

sys-apps/s6: Stabilize 2.12.0.2 x86, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/s6-2.12.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.12.0.2.ebuild b/sys-apps/s6/s6-2.12.0.2.ebuild
index 2f3047b36641..08defb0d5f01 100644
--- a/sys-apps/s6/s6-2.12.0.2.ebuild
+++ b/sys-apps/s6/s6-2.12.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~mips ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-12-20 Thread Joonas Niilola
commit: 5fb7b6fd4d15e006c396de1365e0c6d9606df0fa
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:11:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:11:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb7b6fd

sys-apps/s6-portable-utils: Stabilize 2.3.0.3 amd64, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
index a5a3fc10c8b3..8797d0c276f6 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-12-20 Thread Joonas Niilola
commit: 022e4cd6c4724f8d9614d133ae0ac98bcf58387b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:11:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:11:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022e4cd6

sys-apps/s6-linux-utils: Stabilize 2.6.2.0 amd64, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
index 43ea27b14a6a..1769e60ef6d6 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-12-20 Thread Joonas Niilola
commit: 9c63aa08526a73d99f8292ffebca90b3f6c95a81
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:11:45 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:11:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c63aa08

sys-apps/s6-rc: Stabilize 0.5.4.2 amd64, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
index 7424fbbd67e7..e6b3a34738e5 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-12-20 Thread Joonas Niilola
commit: f4a61f1e552202912e58ef91c893537ffdca00fb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 21 06:11:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 21 06:11:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a61f1e

sys-apps/s6-linux-init: Stabilize 1.1.2.0 amd64, #920377

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
index 28e104385ba4..e56e4fdad20a 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-12-20 Thread Petr Vaněk
commit: b3e7a9089bec5881583335dcb0884ebcf05baa84
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Dec 20 12:42:35 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Wed Dec 20 12:42:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e7a908

sys-apps/s6-linux-init: drop 1.1.0.0-r1

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 -
 .../s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild  | 75 --
 2 files changed, 76 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index f3e9c6021cad..defbde6a96e1 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,2 @@
-DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B 
a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566
 SHA512 
7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
 DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B 
e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e
 SHA512 
76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
deleted file mode 100644
index 90102a4af725..
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-IUSE="+sysv-utils"
-
-RDEPEND="
-   dev-lang/execline:=
-   dev-libs/skalibs:0/2.13
-   sys-apps/s6:=[execline]
-   sysv-utils? (
-   !sys-apps/openrc[sysv-utils(-)]
-   !sys-apps/systemd[sysv-utils]
-   !sys-apps/sysvinit
-   )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --skeldir=/etc/s6-linux-init/skel
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/s6"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   if use sysv-utils ; then
-   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
-   into /
-   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-   fi
-}
-
-pkg_postinst() {
-   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-   einfo "for usage instructions."
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-12-05 Thread Petr Vaněk
commit: f36723b831bdacef52dd5cd169a3a8fbb128ab91
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Dec  5 13:59:40 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Dec  5 15:01:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36723b8

sys-apps/s6-linux-init: add optfeature for man pages

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
index 984e24dfe6b7..6a1b57e7c1ee 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Generates an init binary for s6-based init systems"
 HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
@@ -72,4 +72,6 @@ src_install() {
 pkg_postinst() {
einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
einfo "for usage instructions."
+
+   optfeature "man pages" app-doc/s6-linux-init-man-pages
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-12-05 Thread Petr Vaněk
commit: 3e3b2907973f5f000d9f8b29bf9865a5511382b1
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Dec  5 13:49:18 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Dec  5 15:01:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3b2907

sys-apps/s6-portable-utils: add optfeature for man pages

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
index e476efbe496e..a5a3fc10c8b3 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Set of tiny portable unix utilities"
 HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
@@ -44,3 +44,7 @@ src_configure() {
 
econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+   optfeature "man pages" app-doc/s6-portable-utils-man-pages
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-12-05 Thread Petr Vaněk
commit: 5b1b7f4ebe82258496155253ffdf56ae9b4b8bf9
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Dec  5 14:00:17 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Dec  5 15:01:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1b7f4e

sys-apps/s6-linux-init: print quickstart instructions info only on first install

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
index 6a1b57e7c1ee..2b8244fbaef4 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -70,8 +70,10 @@ src_install() {
 }
 
 pkg_postinst() {
-   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-   einfo "for usage instructions."
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   elog "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+   elog "for usage instructions."
+   fi
 
optfeature "man pages" app-doc/s6-linux-init-man-pages
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-12-05 Thread Petr Vaněk
commit: 53ac17d6a2d71b47b1fe75b1b44e2439a63465cb
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Dec  5 13:47:36 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Dec  5 15:01:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ac17d6

sys-apps/s6-rc: add optfeature for man pages

Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
index 7d597db9002f..7424fbbd67e7 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Service manager for the s6 supervision suite"
 HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
@@ -62,4 +62,6 @@ pkg_postinst() {
elog "version."
fi
done
+
+   optfeature "man pages" app-doc/s6-rc-man-pages
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-12-05 Thread Petr Vaněk
commit: 275a352e4a5b7a55a2a783cb2568759ed67dcc68
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Dec  5 13:44:43 2023 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Dec  5 15:01:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275a352e

sys-apps/s6: add optfeature for man pages

Bug: https://bugs.gentoo.org/824022
Signed-off-by: Petr Vaněk  gentoo.org>

 sys-apps/s6/s6-2.12.0.2.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.12.0.2.ebuild b/sys-apps/s6/s6-2.12.0.2.ebuild
index 8ac261aaceea..2512f211e17b 100644
--- a/sys-apps/s6/s6-2.12.0.2.ebuild
+++ b/sys-apps/s6/s6-2.12.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="skarnet.org's small and secure supervision software suite"
 HOMEPAGE="https://www.skarnet.org/software/s6/;
@@ -52,3 +52,7 @@ src_configure() {
 
econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+   optfeature "man pages" app-doc/s6-man-pages
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-11-22 Thread Sam James
commit: 0b9089564d7dfe9f78d176efe66d1e62620d88c1
Author: Petr Vaněk  atlas  cz>
AuthorDate: Mon Nov 20 08:17:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 22 11:32:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b908956

sys-apps/s6: add 2.12.0.2

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6/Manifest   |  1 +
 sys-apps/s6/s6-2.12.0.2.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 89a8c3fad5dd..0688d5ab4106 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1,3 @@
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
 DIST s6-2.12.0.0.tar.gz 255678 BLAKE2B 
cee3bccbdfb8dee8e38ad2757ed650dea5e940835df463fac447cb71404eedd331444f7f59de4aded98804e0f9b0dde7df19ceec081ee122d38fbf0747318fba
 SHA512 
203de171fa6272c56d322b2ec1cd5b8690841bc4e047eb5118846415541905789a44abd37621f67ae97313f4b0fdfb42fe2c88dd83a0d60f0fe2956990881c96
+DIST s6-2.12.0.2.tar.gz 255801 BLAKE2B 
5aa4ecf28cbde17ce9f80849508989607a0e7340bbb1fb0ae92cf021d887cc6870f53700b384dbcb42d757268ec9c372229f41facf04e812cd02cdb64dd48e37
 SHA512 
55f6590801df51bbbc3feb467c67df1587b9c1ade4fbfccb4852238e16713c7f2a163468fabe114e4632e812e7daa1020c0dda14d02a26e86b085b61552e4f73

diff --git a/sys-apps/s6/s6-2.12.0.2.ebuild b/sys-apps/s6/s6-2.12.0.2.ebuild
new file mode 100644
index ..8ac261aaceea
--- /dev/null
+++ b/sys-apps/s6/s6-2.12.0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+   >=dev-libs/skalibs-2.14.0.0:=
+   execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   $(use_enable execline)
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-11-17 Thread Sam James
commit: 14b5a742a07ead4bd410cf413d455834c7a31c02
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 14:00:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b5a742

sys-apps/s6-linux-init: add 1.1.2.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 +
 .../s6-linux-init/s6-linux-init-1.1.2.0.ebuild | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 9f9edf825d2f..f3e9c6021cad 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1,3 @@
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B 
a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566
 SHA512 
7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
+DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B 
e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e
 SHA512 
76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
new file mode 100644
index ..291223de4330
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="
+   dev-lang/execline:=
+   >=dev-libs/skalibs-2.14.0.0:=
+   sys-apps/s6:=[execline]
+   sysv-utils? (
+   !sys-apps/openrc[sysv-utils(-)]
+   !sys-apps/systemd[sysv-utils]
+   !sys-apps/sysvinit
+   )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --skeldir=/etc/s6-linux-init/skel
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   if use sysv-utils ; then
+   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
+   into /
+   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+   fi
+}
+
+pkg_postinst() {
+   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+   einfo "for usage instructions."
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-11-17 Thread Sam James
commit: 8a4dc427eeef89e9d5c7796fb1bbffa8c501ff6d
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 11:03:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4dc427

sys-apps/s6-rc: restrict to  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-rc/{s6-rc-0.5.4.1.ebuild => s6-rc-0.5.4.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
similarity index 98%
rename from sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
rename to sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
index a67dc93f39d8..bb035ef77314 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm x86"
 
 RDEPEND="
dev-lang/execline:=
-   dev-libs/skalibs:=
+   =sys-apps/s6-2.11.3.0:=[execline]
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-11-17 Thread Sam James
commit: 973a0cf6dab2e3d89a216ae30fb12dcccb286b9d
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 12:58:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973a0cf6

sys-apps/s6-portable-utils: add 2.3.0.3

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 +
 .../s6-portable-utils-2.3.0.3.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index 0b8a2ec84c2a..5f7b0711ba06 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1 +1,2 @@
 DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B 
a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215
 SHA512 
f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72
+DIST s6-portable-utils-2.3.0.3.tar.gz 51186 BLAKE2B 
9a0b9f33a89cca730afc8190ab7be7fc25ed286970b430d33d8eb91d5b6e5ac4261e659674ec44c5e5a88b32a324cb62ee63837923f0a7481675c8eaa3e8804c
 SHA512 
f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
new file mode 100644
index ..e476efbe496e
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-11-17 Thread Sam James
commit: 5d52e756ae04a116425ebc4fe80eefb5241d0650
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 12:07:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d52e756

sys-apps/s6-rc: add 0.5.4.2

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild | 65 +
 2 files changed, 66 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 2dfed362bf6c..a37e5cd863c7 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1 +1,2 @@
 DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B 
d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14
 SHA512 
6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086
+DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B 
d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f
 SHA512 
f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
new file mode 100644
index ..7d597db9002f
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+   dev-lang/execline:=
+   >=dev-libs/skalibs-2.14.0.0:=
+   >=sys-apps/s6-2.11.3.0:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+   for ver in ${REPLACING_VERSIONS}; do
+   if ver_test "${ver}" -lt "0.5.4.0"; then
+   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
+   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
+   elog "restart s6rc-oneshot-runner service because you 
are upgrading from older"
+   elog "version."
+   fi
+   done
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-11-17 Thread Sam James
commit: 0e310c44590f4435b6374d131c82bf1dea3412ea
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 10:30:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e310c44

sys-apps/s6: add 2.12.0.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6/Manifest   |  1 +
 sys-apps/s6/s6-2.12.0.0.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 40cfc50ba332..89a8c3fad5dd 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
+DIST s6-2.12.0.0.tar.gz 255678 BLAKE2B 
cee3bccbdfb8dee8e38ad2757ed650dea5e940835df463fac447cb71404eedd331444f7f59de4aded98804e0f9b0dde7df19ceec081ee122d38fbf0747318fba
 SHA512 
203de171fa6272c56d322b2ec1cd5b8690841bc4e047eb5118846415541905789a44abd37621f67ae97313f4b0fdfb42fe2c88dd83a0d60f0fe2956990881c96

diff --git a/sys-apps/s6/s6-2.12.0.0.ebuild b/sys-apps/s6/s6-2.12.0.0.ebuild
new file mode 100644
index ..165537535fbf
--- /dev/null
+++ b/sys-apps/s6/s6-2.12.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+   >=dev-libs/skalibs-2.14.0.0:=
+   execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   $(use_enable execline)
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-11-17 Thread Sam James
commit: f46b6f2fd8147f2fdf3c8a54c7a8b4f31de159b4
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 14:48:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46b6f2f

sys-apps/s6-linux-utils: add 2.6.2.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 +
 .../s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 14392c259e26..996d642777e9 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 
8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159
 SHA512 
7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7
+DIST s6-linux-utils-2.6.2.0.tar.gz 43287 BLAKE2B 
2dcad4eac6250f7dfb31946baa8b21068297d6723bfd03abb01389183ca7b586db82e12be37acd9d2016923c0c693865153129fc265dd9e00852c1ba0c39c488
 SHA512 
b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
new file mode 100644
index ..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-11-17 Thread Sam James
commit: be20713a5630cfeea01e5ff016e78557d92b5f38
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 13:54:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be20713a

sys-apps/s6-linux-init: restrict to dev-libs/skalibs:0/2.13

Both versions fail to build with new dev-libs/skalibs-2.14.0.0.

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 .../{s6-linux-init-1.1.0.0.ebuild => s6-linux-init-1.1.0.0-r1.ebuild}   | 2 +-
 .../{s6-linux-init-1.1.1.1.ebuild => s6-linux-init-1.1.1.1-r1.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
similarity index 98%
rename from sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
rename to sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
index efee132d5033..90102a4af725 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+sysv-utils"
 
 RDEPEND="
dev-lang/execline:=
-   >=dev-libs/skalibs-2.13.0.0:=
+   dev-libs/skalibs:0/2.13
sys-apps/s6:=[execline]
sysv-utils? (
!sys-apps/openrc[sysv-utils(-)]

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
similarity index 98%
rename from sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
rename to sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
index 73485c0fdbd4..a4a7b6b594f0 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+sysv-utils"
 
 RDEPEND="
dev-lang/execline:=
-   >=dev-libs/skalibs-2.13.0.0:=
+   dev-libs/skalibs:0/2.13
sys-apps/s6:=[execline]
sysv-utils? (
!sys-apps/openrc[sysv-utils(-)]



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-11-17 Thread Sam James
commit: 38358b1840c2cc1cb206170b412144f22c61656e
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Nov  8 12:50:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 11:08:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38358b18

sys-apps/s6-portable-utils: restrict to dev-libs/skalibs:0/2.13

This version fails to build with new dev-libs/skalibs-2.14.0.0.

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 ...ortable-utils-2.3.0.2.ebuild => s6-portable-utils-2.3.0.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
similarity index 95%
rename from sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
rename to sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
index 820e3f643603..038ce3ba71c2 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+RDEPEND="dev-libs/skalibs:0/2.13"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-07-15 Thread Joonas Niilola
commit: 1861b352e5e3bb4b017800bf43fb78497bc8526a
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Jul 15 07:44:58 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 15 08:01:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1861b352

sys-apps/s6-linux-init: drop 1.1.1.0

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/31894
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 -
 .../s6-linux-init/s6-linux-init-1.1.1.0.ebuild | 75 --
 2 files changed, 76 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 3b0a5e137dea..9f9edf825d2f 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,2 @@
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
-DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B 
b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28
 SHA512 
7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B 
a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566
 SHA512 
7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
deleted file mode 100644
index 73485c0fdbd4..
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+sysv-utils"
-
-RDEPEND="
-   dev-lang/execline:=
-   >=dev-libs/skalibs-2.13.0.0:=
-   sys-apps/s6:=[execline]
-   sysv-utils? (
-   !sys-apps/openrc[sysv-utils(-)]
-   !sys-apps/systemd[sysv-utils]
-   !sys-apps/sysvinit
-   )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --skeldir=/etc/s6-linux-init/skel
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/s6"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   if use sysv-utils ; then
-   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
-   into /
-   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-   fi
-}
-
-pkg_postinst() {
-   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-   einfo "for usage instructions."
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-07-15 Thread Joonas Niilola
commit: 111c1742ebaf65efdf1cc0c9ad38b236da3cf3f0
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Jul 15 07:44:08 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 15 08:01:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111c1742

sys-apps/s6-portable-utils: drop 2.3.0.1

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 -
 .../s6-portable-utils-2.3.0.1.ebuild   | 46 --
 2 files changed, 47 deletions(-)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index b9576fcee4e0..0b8a2ec84c2a 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,2 +1 @@
-DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 
50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc
 SHA512 
46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
 DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B 
a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215
 SHA512 
f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
deleted file mode 100644
index 820e3f643603..
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-07-15 Thread Joonas Niilola
commit: c538127f3511e809b058ab56544431a2aa6871cf
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Jul 15 07:41:15 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 15 08:01:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c538127f

sys-apps/s6: drop 2.11.3.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/Manifest   |  1 -
 sys-apps/s6/s6-2.11.3.0.ebuild | 54 --
 2 files changed, 55 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 61f75d10c151..40cfc50ba332 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1 @@
-DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B 
a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19
 SHA512 
764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a

diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
deleted file mode 100644
index d38aa94a0fd2..
--- a/sys-apps/s6/s6-2.11.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
-   >=dev-libs/skalibs-2.13.1.0:=
-   execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --libexecdir=/lib/s6
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/execline"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   $(use_enable execline)
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-07-15 Thread Joonas Niilola
commit: e7e471268b2472eb940c5eedb976cd2d8e66f157
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Jul 15 07:42:27 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 15 08:01:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e47126

sys-apps/s6-linux-utils: drop 2.6.1.1

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 -
 .../s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild   | 46 --
 2 files changed, 47 deletions(-)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 3d5edc45eecf..14392c259e26 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,2 +1 @@
-DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 
7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955
 SHA512 
da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
 DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 
8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159
 SHA512 
7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
deleted file mode 100644
index 9fd0c86a78b0..
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir="/$(get_libdir)"
-   --libdir="/usr/$(get_libdir)/${PN}"
-   --with-dynlib="/$(get_libdir)"
-   --with-lib="/usr/$(get_libdir)/skalibs"
-   --with-sysdeps="/usr/$(get_libdir)/skalibs"
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-06-18 Thread Joonas Niilola
commit: b4c0ffa53ae524b8d50569b8240be7261f6f1689
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jun 19 05:53:44 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun 19 05:53:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c0ffa5

sys-apps/s6-linux-init: Stabilize 1.1.1.1 x86, #908755

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
index 795a17748e77..8850f190d294 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-06-18 Thread Joonas Niilola
commit: b05e3c2eb2a66b7ca6ae873cd316fb5c92c9c7ce
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jun 19 05:54:46 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun 19 05:54:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b05e3c2e

sys-apps/s6-linux-init: Stabilize 1.1.1.1 amd64, #908755

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
index 8850f190d294..73485c0fdbd4 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-05-20 Thread Joonas Niilola
commit: ce603bfe6a31abdc7ea30574ab7c996ce10d99c1
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat May  6 14:54:59 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 20 12:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce603bfe

sys-apps/s6-portable-utils: drop 2.2.5.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 -
 .../s6-portable-utils-2.2.5.0.ebuild   | 45 --
 2 files changed, 46 deletions(-)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index 0b23ecfc83f3..b9576fcee4e0 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,2 @@
-DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B 
e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a
 SHA512 
2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
 DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 
50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc
 SHA512 
46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
 DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B 
a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215
 SHA512 
f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
deleted file mode 100644
index de29b804e4d1..
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --disable-allstatic
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-05-20 Thread Joonas Niilola
commit: 9cb94fda3c106bb4aad55da9af0bb5c07b65d66e
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat May  6 14:52:56 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 20 12:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb94fda

sys-apps/s6: drop 2.11.1.2-r1

Closes: https://bugs.gentoo.org/890875
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/Manifest  |  1 -
 sys-apps/s6/s6-2.11.1.2-r1.ebuild | 51 ---
 2 files changed, 52 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 799273ffeeb5..61f75d10c151 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,2 @@
-DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 
672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258
 SHA512 
31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
 DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B 
a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19
 SHA512 
764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a

diff --git a/sys-apps/s6/s6-2.11.1.2-r1.ebuild 
b/sys-apps/s6/s6-2.11.1.2-r1.ebuild
deleted file mode 100644
index a9240e9e4205..
--- a/sys-apps/s6/s6-2.11.1.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-IUSE="+execline"
-
-RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-05-20 Thread Joonas Niilola
commit: 231850ee4b13db47a3577cf385b2fb58be14d269
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat May  6 14:54:22 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 20 12:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231850ee

sys-apps/s6-linux-utils: drop 2.6.0.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 -
 .../s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild   | 45 --
 2 files changed, 46 deletions(-)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index c2af0301b92f..3d5edc45eecf 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,2 @@
-DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 
146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836
 SHA512 
cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
 DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 
7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955
 SHA512 
da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
 DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 
8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159
 SHA512 
7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
deleted file mode 100644
index 5ae365e60d10..
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-
-RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --disable-allstatic
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-05-20 Thread Joonas Niilola
commit: efb4ae2f39a42ff0f8e978db06cb85d81f580173
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat May  6 14:53:30 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 20 12:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb4ae2f

sys-apps/s6-linux-init: drop 1.0.8.0-r1

Closes: https://bugs.gentoo.org/890877
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 -
 .../s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild  | 72 --
 2 files changed, 73 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index e11cb31d5ab4..3b0a5e137dea 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,4 +1,3 @@
-DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 
15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e
 SHA512 
b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B 
b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28
 SHA512 
7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B 
a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566
 SHA512 
7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild
deleted file mode 100644
index 72efe07127e7..
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-IUSE="+sysv-utils"
-
-RDEPEND="dev-lang/execline:=
-   dev-libs/skalibs:=
-   sys-apps/s6:=[execline]
-   sysv-utils? (
-   !sys-apps/openrc[sysv-utils(-)]
-   !sys-apps/systemd[sysv-utils]
-   !sys-apps/sysvinit
-   )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --skeldir=/etc/s6-linux-init/skel
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/s6
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   --disable-allstatic
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   if use sysv-utils ; then
-   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
-   into /
-   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-   fi
-}
-
-pkg_postinst() {
-   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-   einfo "for usage instructions."
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-05-20 Thread Joonas Niilola
commit: 85bf86244e199094b3f3f2a1ae47ea8c24c35749
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat May  6 14:56:46 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 20 12:10:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bf8624

sys-apps/s6-rc: drop 0.5.3.2

Closes: https://bugs.gentoo.org/890879
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/Manifest |  1 -
 sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild | 62 -
 2 files changed, 63 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 971a8e7a1c22..2dfed362bf6c 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1 @@
-DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
 DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B 
d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14
 SHA512 
6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
deleted file mode 100644
index 47fe23696e6f..
--- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="dev-lang/execline:=
-   dev-libs/skalibs:=
-   sys-apps/s6:=[execline]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/execline
-   --with-lib=/usr/$(get_libdir)/s6
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   --disable-allstatic
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   for ver in ${REPLACING_VERSIONS}; do
-   if ver_test "${ver}" -ge "0.5.4.0"; then
-   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
-   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
-   elog "restart s6rc-oneshot-runner service because you 
are downgrading from newer"
-   elog "version."
-   fi
-   done
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-05-18 Thread Joonas Niilola
commit: 5285a2c5e63021da881311add968f29c752a10fa
Author: Petr Vaněk  atlas  cz>
AuthorDate: Tue May 16 11:36:03 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu May 18 07:27:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5285a2c5

sys-apps/s6-linux-init: add 1.1.1.1

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/31058
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 +
 .../s6-linux-init/s6-linux-init-1.1.1.1.ebuild | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 6fed126889ed..e11cb31d5ab4 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,4 @@
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 
15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e
 SHA512 
b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B 
b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28
 SHA512 
7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb
+DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B 
a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566
 SHA512 
7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
new file mode 100644
index ..795a17748e77
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="
+   dev-lang/execline:=
+   >=dev-libs/skalibs-2.13.0.0:=
+   sys-apps/s6:=[execline]
+   sysv-utils? (
+   !sys-apps/openrc[sysv-utils(-)]
+   !sys-apps/systemd[sysv-utils]
+   !sys-apps/sysvinit
+   )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --skeldir=/etc/s6-linux-init/skel
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   if use sysv-utils ; then
+   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
+   into /
+   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+   fi
+}
+
+pkg_postinst() {
+   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+   einfo "for usage instructions."
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-05-15 Thread Joonas Niilola
commit: 785628e6fb7f551db408fab9d3e9b37405494bfb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:29 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785628e6

sys-apps/s6-portable-utils: Stabilize 2.3.0.2 x86, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
index 57f0347710bb..36d808ebf75e 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-05-15 Thread Joonas Niilola
commit: 2d34d516c983116b8777829ed4ba782cd31459dd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:29 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d34d516

sys-apps/s6-linux-init: Stabilize 1.1.1.0 x86, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
index 73cdf7c7e691..73485c0fdbd4 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-05-15 Thread Joonas Niilola
commit: a5667e689e0257ebac7a49b51b8f46066f4b961c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:10 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5667e68

sys-apps/s6-linux-utils: Stabilize 2.6.1.2 amd64, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
index 43ea27b14a6a..1769e60ef6d6 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-05-15 Thread Joonas Niilola
commit: 13094fbae3e018f3ed7789f5bb52298f6f271172
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:29 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13094fba

sys-apps/s6-linux-utils: Stabilize 2.6.1.2 x86, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
index 1769e60ef6d6..ba5d70f74e27 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-05-15 Thread Joonas Niilola
commit: 6a5011c586bc32f4355af06a22088a1caca0bc10
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:28 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5011c5

sys-apps/s6: Stabilize 2.11.3.2 x86, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/s6-2.11.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2.ebuild
index 5c3b8935c879..7edd95a7f70b 100644
--- a/sys-apps/s6/s6-2.11.3.2.ebuild
+++ b/sys-apps/s6/s6-2.11.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-05-15 Thread Joonas Niilola
commit: cbbc5b1dba5fed44523fdae84e270cca089c5ca4
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:10 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbc5b1d

sys-apps/s6-linux-init: Stabilize 1.1.1.0 amd64, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
index 795a17748e77..73cdf7c7e691 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-05-15 Thread Joonas Niilola
commit: 35c8067d18a015feda941a10d93f29ef98ab0492
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:10 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c8067d

sys-apps/s6: Stabilize 2.11.3.2 amd64, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/s6-2.11.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2.ebuild
index 589e48f8ebb4..5c3b8935c879 100644
--- a/sys-apps/s6/s6-2.11.3.2.ebuild
+++ b/sys-apps/s6/s6-2.11.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-05-15 Thread Joonas Niilola
commit: 580a7d401dfe1cbe241533db0131e73daf724ea7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue May 16 05:56:10 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 16 05:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580a7d40

sys-apps/s6-portable-utils: Stabilize 2.3.0.2 amd64, #906462

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
index 84d119227fea..57f0347710bb 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-05-06 Thread Arthur Zamarin
commit: 52bfa0ca3515485337c4f84efbdad55b4682c348
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:48:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:49:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52bfa0ca

sys-apps/s6: Stabilize 2.11.3.0 arm, #903281

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6/s6-2.11.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
index 7edd95a7f70b..d38aa94a0fd2 100644
--- a/sys-apps/s6/s6-2.11.3.0.ebuild
+++ b/sys-apps/s6/s6-2.11.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-05-06 Thread Arthur Zamarin
commit: 9df09efed0824f15483ce21e3b4040f08698e10d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:48:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:49:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df09efe

sys-apps/s6-portable-utils: Stabilize 2.3.0.1 arm, #903281

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
index 36d808ebf75e..820e3f643603 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-05-06 Thread Arthur Zamarin
commit: 45cb77635c5c7217c49979f6831f83269a1d010d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:48:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:49:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cb7763

sys-apps/s6-linux-init: Stabilize 1.1.0.0 arm, #903281

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
index 73485c0fdbd4..efee132d5033 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-05-06 Thread Arthur Zamarin
commit: a41b79df4afdc90d086c2ee62e627c3b9aa8064a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:48:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:49:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41b79df

sys-apps/s6-linux-utils: Stabilize 2.6.1.1 arm, #903281

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
index ba5d70f74e27..9fd0c86a78b0 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-05-06 Thread Arthur Zamarin
commit: e3535c4c21f1e4e8423b4ec209a534567ff90ba1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:48:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:49:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3535c4c

sys-apps/s6-rc: Stabilize 0.5.4.1 arm, #903281

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
index 3601046b7950..a67dc93f39d8 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-04-15 Thread Joonas Niilola
commit: 3cba90b5061bc0c72da130712b5e28c686804427
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 22:00:55 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cba90b5

sys-apps/s6-linux-utils: drop 2.6.0.1, 2.6.1.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  2 -
 .../s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild   | 46 --
 .../s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild   | 46 --
 3 files changed, 94 deletions(-)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 52331eada46f..c2af0301b92f 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,5 +1,3 @@
 DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 
146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836
 SHA512 
cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
-DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 
41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39
 SHA512 
52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
-DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B 
b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b
 SHA512 
a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
 DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 
7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955
 SHA512 
da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
 DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 
8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159
 SHA512 
7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild
deleted file mode 100644
index d93443a16c11..
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
deleted file mode 100644
index 95ed5191e052..
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-04-15 Thread Joonas Niilola
commit: 46bf1af778977e7c57fd6b7046c325f9e77463fa
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 22:02:22 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bf1af7

sys-apps/s6-rc: drop 0.5.3.3, 0.5.4.0

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/30450
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/Manifest |  2 --
 sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild | 63 ---
 sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild | 65 -
 3 files changed, 130 deletions(-)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index b9ccdc89bb41..971a8e7a1c22 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,4 +1,2 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
-DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B 
b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e
 SHA512 
9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b
-DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B 
b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4
 SHA512 
04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70
 DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B 
d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14
 SHA512 
6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
deleted file mode 100644
index a64dada495c4..
--- a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="dev-lang/execline:=
-   dev-libs/skalibs:=
-   >=sys-apps/s6-2.11.2.0:=[execline]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/execline
-   --with-lib=/usr/$(get_libdir)/s6
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   for ver in ${REPLACING_VERSIONS}; do
-   if ver_test "${ver}" -ge "0.5.4.0"; then
-   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
-   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
-   elog "restart s6rc-oneshot-runner service because you 
are downgrading from newer"
-   elog "version."
-   fi
-   done
-}

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
deleted file mode 100644
index 9e9118dc6ea2..
--- a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
-
-RDEPEND="
-   dev-lang/execline:=
-   dev-libs/skalibs:=
-   >=sys-apps/s6-2.11.3.0:=[execline]
-"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-04-15 Thread Joonas Niilola
commit: be720e7ece0edaae28f53afb97ca1f4002d02c26
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 21:56:42 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be720e7e

sys-apps/s6-linux-init: drop 1.0.8.1

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 -
 .../s6-linux-init/s6-linux-init-1.0.8.1.ebuild | 73 --
 2 files changed, 74 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 96ecfe5568f7..6fed126889ed 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,4 +1,3 @@
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 
15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e
 SHA512 
b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
-DIST s6-linux-init-1.0.8.1.tar.gz 59188 BLAKE2B 
e0f417fb349b3f47dcaa9f36c6f40d8c58066d62ad953b8f797ce6cce14e8c337acd15d34498b49fc0f9455cf4551c948fd7f16b0947f7cdc376e762594afc3a
 SHA512 
df3b5699f9c04ffc89d219dbc9536a64ad3d2fb1d5c5844b2fb9804ac9e223e8b16fe1084baee9b60d3ab61f228de1b57605c3c0f72227758afb16aea1c68340
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B 
b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28
 SHA512 
7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild
deleted file mode 100644
index 62c217701a87..
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+sysv-utils"
-
-RDEPEND="dev-lang/execline:=
-   >=dev-libs/skalibs-2.13.0.0:=
-   sys-apps/s6:=[execline]
-   sysv-utils? (
-   !sys-apps/openrc[sysv-utils(-)]
-   !sys-apps/systemd[sysv-utils]
-   !sys-apps/sysvinit
-   )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --skeldir=/etc/s6-linux-init/skel
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/s6
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   if use sysv-utils ; then
-   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
-   into /
-   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-   fi
-}
-
-pkg_postinst() {
-   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-   einfo "for usage instructions."
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-04-15 Thread Joonas Niilola
commit: 44e39c8e938280fb529f019c3f998de3ba7b83c4
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 21:53:58 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e39c8e

sys-apps/s6: drop 2.11.2.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/Manifest   |  1 -
 sys-apps/s6/s6-2.11.2.0.ebuild | 52 --
 2 files changed, 53 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index d610daf64ac6..799273ffeeb5 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,4 +1,3 @@
 DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 
672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258
 SHA512 
31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
-DIST s6-2.11.2.0.tar.gz 246294 BLAKE2B 
c11fc25b9a209195a12cb12cb03560673c196c97cf5a0a66c850ed251dd387cdc1c6a002c9867ff9ad99faf1d8da42b4bb867074410d043c7cd2a8e8f1a2d44a
 SHA512 
283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
 DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B 
a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19
 SHA512 
764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a

diff --git a/sys-apps/s6/s6-2.11.2.0.ebuild b/sys-apps/s6/s6-2.11.2.0.ebuild
deleted file mode 100644
index 3c7489367164..
--- a/sys-apps/s6/s6-2.11.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+execline"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:=
-   execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/execline
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --enable-shared
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   $(use_enable execline)
-   )
-
-   econf "${myconf[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-04-15 Thread Joonas Niilola
commit: 9e0faa5c48086b1daea802d27ac3d70d42c87067
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 21:41:48 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0faa5c

sys-apps/s6-linux-init: add 1.1.1.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 +
 .../s6-linux-init/s6-linux-init-1.1.1.0.ebuild | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 27295762840a..96ecfe5568f7 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,4 @@
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 
15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e
 SHA512 
b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
 DIST s6-linux-init-1.0.8.1.tar.gz 59188 BLAKE2B 
e0f417fb349b3f47dcaa9f36c6f40d8c58066d62ad953b8f797ce6cce14e8c337acd15d34498b49fc0f9455cf4551c948fd7f16b0947f7cdc376e762594afc3a
 SHA512 
df3b5699f9c04ffc89d219dbc9536a64ad3d2fb1d5c5844b2fb9804ac9e223e8b16fe1084baee9b60d3ab61f228de1b57605c3c0f72227758afb16aea1c68340
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
+DIST s6-linux-init-1.1.1.0.tar.gz 59928 BLAKE2B 
b5498aafa44cc10a66a1ab591d0db8b0321f0371b51fb199224aa26257b3809ea693c18d6fd945a283f545af72b3910073560f6356a8d9b0c30a691c0cbeea28
 SHA512 
7c403bbf06658a754d255cb4ab24aaae408bad0bc2d022881e98fafe7f78689216a634c6689b6d2a84d43c73bc9f45ad19ad01dad03cc780ecddfa950aa6a8eb

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
new file mode 100644
index ..795a17748e77
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="
+   dev-lang/execline:=
+   >=dev-libs/skalibs-2.13.0.0:=
+   sys-apps/s6:=[execline]
+   sysv-utils? (
+   !sys-apps/openrc[sysv-utils(-)]
+   !sys-apps/systemd[sysv-utils]
+   !sys-apps/sysvinit
+   )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --skeldir=/etc/s6-linux-init/skel
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   if use sysv-utils ; then
+   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
+   into /
+   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+   fi
+}
+
+pkg_postinst() {
+   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+   einfo "for usage instructions."
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-04-15 Thread Joonas Niilola
commit: 4549a9e13423e83a438d18cff0e2de7bb0038116
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 21:49:34 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4549a9e1

sys-apps/s6-portable-utils: add 2.3.0.2

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 +
 .../s6-portable-utils-2.3.0.2.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index f3178397269d..1afe6aa6772d 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -2,3 +2,4 @@ DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B 
e79d803544e8df6b791ecd22bd61
 DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B 
ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87
 SHA512 
814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
 DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B 
a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390
 SHA512 
1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c
 DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 
50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc
 SHA512 
46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
+DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B 
a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215
 SHA512 
f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
new file mode 100644
index ..84d119227fea
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-04-15 Thread Joonas Niilola
commit: a6ca64925c3f21f44da29e1403d79487b54be601
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 21:31:59 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ca6492

sys-apps/s6: add 2.11.3.2

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/Manifest   |  1 +
 sys-apps/s6/s6-2.11.3.2.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 1aff200dddf0..d610daf64ac6 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,4 @@
 DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 
672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258
 SHA512 
31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
 DIST s6-2.11.2.0.tar.gz 246294 BLAKE2B 
c11fc25b9a209195a12cb12cb03560673c196c97cf5a0a66c850ed251dd387cdc1c6a002c9867ff9ad99faf1d8da42b4bb867074410d043c7cd2a8e8f1a2d44a
 SHA512 
283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
 DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B 
a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19
 SHA512 
764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
+DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 
67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22
 SHA512 
fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a

diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2.ebuild
new file mode 100644
index ..589e48f8ebb4
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+   >=dev-libs/skalibs-2.13.1.0:=
+   execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   $(use_enable execline)
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-04-15 Thread Joonas Niilola
commit: f855328379879c04a7d3ef3f58847472a5dce1db
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Apr  2 21:55:05 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 15 12:15:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8553283

sys-apps/s6-portable-utils: drop 2.2.5.1, 2.3.0.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  2 -
 .../s6-portable-utils-2.2.5.1.ebuild   | 46 --
 .../s6-portable-utils-2.3.0.0.ebuild   | 46 --
 3 files changed, 94 deletions(-)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index 1afe6aa6772d..0b23ecfc83f3 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,5 +1,3 @@
 DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B 
e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a
 SHA512 
2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
-DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B 
ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87
 SHA512 
814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
-DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B 
a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390
 SHA512 
1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c
 DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 
50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc
 SHA512 
46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
 DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B 
a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215
 SHA512 
f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.1.ebuild
deleted file mode 100644
index caffbee14be2..
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-   tc-export AR CC RANLIB
-
-   local myconf=(
-   --bindir=/bin
-   --dynlibdir=/usr/$(get_libdir)
-   --libdir=/usr/$(get_libdir)/${PN}
-   --with-dynlib=/usr/$(get_libdir)
-   --with-lib=/usr/$(get_libdir)/skalibs
-   --with-sysdeps=/usr/$(get_libdir)/skalibs
-   --disable-allstatic
-   --disable-static
-   --disable-static-libc
-   )
-
-   econf "${myconf[@]}"
-}

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
deleted file mode 100644
index a80dcbdabfef..
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
-
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-   default
-
-   # Avoid QA warning for LDFLAGS addition
-   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-03-29 Thread Joonas Niilola
commit: 4b900b2c416bc1a38e70f7fa6e02b336e17dcbb4
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 30 05:22:09 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 30 05:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b900b2c

sys-apps/s6-linux-init: Stabilize 1.1.0.0 amd64, #903281

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
index 8850f190d294..73485c0fdbd4 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-03-29 Thread Joonas Niilola
commit: 19eed79a29ae30ea9333c9ad18fe6b4589aa0393
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 30 05:22:09 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 30 05:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19eed79a

sys-apps/s6-linux-utils: Stabilize 2.6.1.1 amd64, #903281

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
index 95ed5191e052..ba5d70f74e27 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-03-29 Thread Joonas Niilola
commit: 4d25779ed0bc9f34ed7f8be66e0a79878a555033
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 30 05:22:09 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 30 05:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d25779e

sys-apps/s6: Stabilize 2.11.3.0 amd64, #903281

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6/s6-2.11.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
index 9f39c5be2859..7edd95a7f70b 100644
--- a/sys-apps/s6/s6-2.11.3.0.ebuild
+++ b/sys-apps/s6/s6-2.11.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-03-29 Thread Joonas Niilola
commit: 95021695dcdd491cdc8a025e715c7fa54ea49b16
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 30 05:22:09 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 30 05:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95021695

sys-apps/s6-rc: Stabilize 0.5.4.1 amd64, #903281

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
index 9e9118dc6ea2..3601046b7950 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-03-29 Thread Joonas Niilola
commit: 7fce64b8d4a3f52748108b78a38a8a19e59bc59b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 30 05:22:09 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 30 05:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fce64b8

sys-apps/s6-portable-utils: Stabilize 2.3.0.1 amd64, #903281

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
index a80dcbdabfef..36d808ebf75e 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-03-28 Thread Sam James
commit: a6d53d94ad2f16588a92020eaf407c01ab838c49
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 28 14:57:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 28 14:58:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d53d94

sys-apps/s6-linux-utils: Stabilize 2.6.1.1 x86, #903281

Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
index 43ea27b14a6a..95ed5191e052 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-03-28 Thread Sam James
commit: 0476d0bc6b88f25ad42e81c57ee912fdaabcbdd6
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 28 14:57:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 28 14:58:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0476d0bc

sys-apps/s6-rc: Stabilize 0.5.4.1 x86, #903281

Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
index 30a021e291ff..9e9118dc6ea2 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-03-28 Thread Sam James
commit: fc1c3ba92806d62aee1d4c4e0fe21a09bafb47fb
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 28 14:57:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 28 14:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1c3ba9

sys-apps/s6-portable-utils: Stabilize 2.3.0.1 x86, #903281

Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
index 84d119227fea..a80dcbdabfef 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-03-24 Thread Arthur Zamarin
commit: 4b012194c528c90ab3997376bce4daae0ed4e29e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 25 05:13:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 25 05:13:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b012194

sys-apps/s6-portable-utils: Stabilize 2.3.0.0 x86, #902803

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
index 84d119227fea..a80dcbdabfef 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-03-24 Thread Arthur Zamarin
commit: 9b29c03b1441fac2667d6f09efddffe0ba1682aa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 25 05:13:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 25 05:13:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b29c03b

sys-apps/s6-rc: Stabilize 0.5.4.0 x86, #902803

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
index 30a021e291ff..9e9118dc6ea2 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND="
dev-lang/execline:=



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-03-24 Thread Arthur Zamarin
commit: 250b65b1a0124c495e3c804c5f892dc728441415
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 25 05:13:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 25 05:13:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250b65b1

sys-apps/s6-linux-utils: Stabilize 2.6.1.0 x86, #902803

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
index 43ea27b14a6a..95ed5191e052 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-03-24 Thread Arthur Zamarin
commit: bc54d6e6a4ff50df8ee11d0cad51a5ea5079651e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 25 05:13:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 25 05:13:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc54d6e6

sys-apps/s6-linux-init: Stabilize 1.1.0.0 x86, #902803

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
index 795a17748e77..8850f190d294 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="+sysv-utils"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-03-24 Thread Arthur Zamarin
commit: 3e3c6c0e762bd05fcb8ba4275721976f003c482a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 25 05:13:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 25 05:13:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3c6c0e

sys-apps/s6: Stabilize 2.11.3.0 x86, #902803

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/s6/s6-2.11.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
index 589e48f8ebb4..9f39c5be2859 100644
--- a/sys-apps/s6/s6-2.11.3.0.ebuild
+++ b/sys-apps/s6/s6-2.11.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-03-06 Thread Joonas Niilola
commit: c71f2346f652400cf52bcf6b25aee17a08e94269
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Feb 26 08:53:05 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  7 07:43:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71f2346

sys-apps/s6-linux-utils: add 2.6.1.2

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29800
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 +
 .../s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index af22647b2112..52331eada46f 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -2,3 +2,4 @@ DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 
146b5ef47c00c4e96eb6ea697137cd1
 DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 
41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39
 SHA512 
52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
 DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B 
b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b
 SHA512 
a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
 DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 
7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955
 SHA512 
da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
+DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 
8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159
 SHA512 
7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
new file mode 100644
index ..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-02-24 Thread Joonas Niilola
commit: e898150c02d15694d3428ddf40a197ebf94d41ba
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Feb 23 14:20:15 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 24 15:08:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e898150c

sys-apps/s6-portable-utils: add 2.3.0.1

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29748
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 +
 .../s6-portable-utils-2.3.0.1.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index 85ae0c96d7d9..f3178397269d 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,4 @@
 DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B 
e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a
 SHA512 
2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
 DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B 
ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87
 SHA512 
814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
 DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B 
a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390
 SHA512 
1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c
+DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 
50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc
 SHA512 
46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
new file mode 100644
index ..84d119227fea
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-02-24 Thread Joonas Niilola
commit: 774dd441a8e6479f4338c7b555a57ef0374b2e0c
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Feb 23 14:19:37 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 24 15:08:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774dd441

sys-apps/s6-linux-utils: add 2.6.1.1

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 +
 .../s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 93d2bbcd066e..af22647b2112 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,4 @@
 DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 
146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836
 SHA512 
cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
 DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 
41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39
 SHA512 
52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
 DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B 
b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b
 SHA512 
a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
+DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 
7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955
 SHA512 
da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
new file mode 100644
index ..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-02-24 Thread Joonas Niilola
commit: b6953734917158200f12eea3b0a9eb5895c50c33
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Feb 23 14:18:07 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 24 15:08:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6953734

sys-apps/s6-rc: add 0.5.4.1

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild | 65 +
 2 files changed, 66 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 16ab60aa0ce9..b9ccdc89bb41 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,4 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
 DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B 
b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e
 SHA512 
9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b
 DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B 
b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4
 SHA512 
04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70
+DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B 
d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14
 SHA512 
6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
new file mode 100644
index ..30a021e291ff
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+   dev-lang/execline:=
+   dev-libs/skalibs:=
+   >=sys-apps/s6-2.11.3.0:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+   for ver in ${REPLACING_VERSIONS}; do
+   if ver_test "${ver}" -lt "0.5.4.0"; then
+   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
+   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
+   elog "restart s6rc-oneshot-runner service because you 
are upgrading from older"
+   elog "version."
+   fi
+   done
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-portable-utils/

2023-02-21 Thread Sam James
commit: 7a64b1d5acebc7d0c07270b95762fb250be8d8c0
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Feb 18 15:06:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 08:01:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a64b1d5

sys-apps/s6-portable-utils: add 2.3.0.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-portable-utils/Manifest|  1 +
 .../s6-portable-utils-2.3.0.0.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-portable-utils/Manifest 
b/sys-apps/s6-portable-utils/Manifest
index 17c5fd60db80..85ae0c96d7d9 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,2 +1,3 @@
 DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B 
e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a
 SHA512 
2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
 DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B 
ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87
 SHA512 
814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
+DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B 
a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390
 SHA512 
1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c

diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild 
b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
new file mode 100644
index ..84d119227fea
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-02-21 Thread Sam James
commit: 314aa3260d8ec2fe90b1e045cce6bc0fd97494bd
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Feb 19 10:43:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 08:01:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314aa326

sys-apps/s6-rc: add upgrade/downgrade post-install message

Recent change in s6-rc-0.5.4.0 ebuild is not backward compatible with
older versions present in the tree. Appended message will inform users
about necessary post-install they need to do.

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29649
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild | 13 -
 sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild | 11 +++
 sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild | 11 +++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
index 9950834606c2..47fe23696e6f 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,3 +49,14 @@ src_configure() {
 
econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+   for ver in ${REPLACING_VERSIONS}; do
+   if ver_test "${ver}" -ge "0.5.4.0"; then
+   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
+   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
+   elog "restart s6rc-oneshot-runner service because you 
are downgrading from newer"
+   elog "version."
+   fi
+   done
+}

diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
index 58f87ce13f36..a64dada495c4 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
@@ -50,3 +50,14 @@ src_configure() {
 
econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+   for ver in ${REPLACING_VERSIONS}; do
+   if ver_test "${ver}" -ge "0.5.4.0"; then
+   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
+   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
+   elog "restart s6rc-oneshot-runner service because you 
are downgrading from newer"
+   elog "version."
+   fi
+   done
+}

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
index 855a1d6e3baf..30a021e291ff 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
@@ -52,3 +52,14 @@ src_configure() {
 
econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+   for ver in ${REPLACING_VERSIONS}; do
+   if ver_test "${ver}" -lt "0.5.4.0"; then
+   elog "Location of helper utilities was changed from 
/usr/libexec to /lib/s6 in"
+   elog "version 0.5.4.0. It is necessary to recompile and 
update s6-rc database and"
+   elog "restart s6rc-oneshot-runner service because you 
are upgrading from older"
+   elog "version."
+   fi
+   done
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

2023-02-21 Thread Sam James
commit: 80123fa788e126d9f9bf23e824030e428afba39c
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Feb 18 15:41:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 08:01:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80123fa7

sys-apps/s6-linux-init: add 1.1.0.0

The package newly installs library to /lib* rather tahn /usr/lib*
because utilities are installed to /bin, therefore, they should link
shared libraries from /lib*.

The /lib/s6 destination is configured for helper utilities instead of
/usr/libexec. None are installed right now, but this is for consistency
with sys-apps/s6 ans sys-apps/s6-rc.

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-linux-init/Manifest|  1 +
 .../s6-linux-init/s6-linux-init-1.1.0.0.ebuild | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 8387575cf922..27295762840a 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1,3 @@
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 
15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e
 SHA512 
b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
 DIST s6-linux-init-1.0.8.1.tar.gz 59188 BLAKE2B 
e0f417fb349b3f47dcaa9f36c6f40d8c58066d62ad953b8f797ce6cce14e8c337acd15d34498b49fc0f9455cf4551c948fd7f16b0947f7cdc376e762594afc3a
 SHA512 
df3b5699f9c04ffc89d219dbc9536a64ad3d2fb1d5c5844b2fb9804ac9e223e8b16fe1084baee9b60d3ab61f228de1b57605c3c0f72227758afb16aea1c68340
+DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B 
c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16
 SHA512 
4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild 
b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
new file mode 100644
index ..795a17748e77
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="
+   dev-lang/execline:=
+   >=dev-libs/skalibs-2.13.0.0:=
+   sys-apps/s6:=[execline]
+   sysv-utils? (
+   !sys-apps/openrc[sysv-utils(-)]
+   !sys-apps/systemd[sysv-utils]
+   !sys-apps/sysvinit
+   )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --skeldir=/etc/s6-linux-init/skel
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   if use sysv-utils ; then
+   "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" 
"${T}/dir" || die
+   into /
+   dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+   fi
+}
+
+pkg_postinst() {
+   einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+   einfo "for usage instructions."
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/

2023-02-21 Thread Sam James
commit: fbb04ca99969920b94f6e9f0ec390c95da282c5b
Author: Petr Vaněk  atlas  cz>
AuthorDate: Fri Feb 17 21:25:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 08:01:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb04ca9

sys-apps/s6-rc: add 0.5.4.0

The package newly installs library to /lib* rather than /usr/lib*
because utilities are installed to /bin, therefore, they should link
shared libraries from /lib*.

The /lib/s6 destination is used helper utilities instead of
/usr/libexec.

See-also: https://github.com/gentoo/gentoo/pull/12120#discussion_r296437625
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-rc/Manifest |  1 +
 sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild | 54 +
 2 files changed, 55 insertions(+)

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index f2ab4d8a5da8..16ab60aa0ce9 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1,3 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 
5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b
 SHA512 
72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
 DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B 
b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e
 SHA512 
9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b
+DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B 
b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4
 SHA512 
04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70

diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild 
b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
new file mode 100644
index ..855a1d6e3baf
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+   dev-lang/execline:=
+   dev-libs/skalibs:=
+   >=sys-apps/s6-2.11.3.0:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/s6"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

2023-02-21 Thread Sam James
commit: 3c6ddf757e8c589b220a3660801fae79627b9e8d
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sat Feb 18 14:55:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 08:01:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6ddf75

sys-apps/s6-linux-utils: add 2.6.1.0

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6-linux-utils/Manifest   |  1 +
 .../s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 2e481e4e6896..93d2bbcd066e 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,2 +1,3 @@
 DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 
146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836
 SHA512 
cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
 DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 
41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39
 SHA512 
52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
+DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B 
b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b
 SHA512 
a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
new file mode 100644
index ..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-02-21 Thread Sam James
commit: ce487acde97451ff96619579ce49390e72c15fb7
Author: Petr Vaněk  atlas  cz>
AuthorDate: Fri Feb 17 21:25:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 08:00:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce487acd

sys-apps/s6: add 2.11.3.0

The package newly installs libraries to /lib* rather than /usr/lib*
because utilities are installed to /bin, therefore, they should link
shared libraries from /lib*.

The /lib/s6 destination is used helper utilities instead of
/usr/libexec.

See-also: https://github.com/gentoo/gentoo/pull/12120#discussion_r296437625
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/s6/Manifest   |  1 +
 sys-apps/s6/s6-2.11.3.0.ebuild | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 25935bf02a7e..1aff200dddf0 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1,3 @@
 DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 
672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258
 SHA512 
31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
 DIST s6-2.11.2.0.tar.gz 246294 BLAKE2B 
c11fc25b9a209195a12cb12cb03560673c196c97cf5a0a66c850ed251dd387cdc1c6a002c9867ff9ad99faf1d8da42b4bb867074410d043c7cd2a8e8f1a2d44a
 SHA512 
283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
+DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B 
a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19
 SHA512 
764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479

diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
new file mode 100644
index ..589e48f8ebb4
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/;
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+   >=dev-libs/skalibs-2.13.1.0:=
+   execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+   default
+
+   # Avoid QA warning for LDFLAGS addition
+   sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+   sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+   tc-export AR CC RANLIB
+
+   local myconf=(
+   --bindir=/bin
+   --dynlibdir="/$(get_libdir)"
+   --libdir="/usr/$(get_libdir)/${PN}"
+   --libexecdir=/lib/s6
+   --with-dynlib="/$(get_libdir)"
+   --with-lib="/usr/$(get_libdir)/execline"
+   --with-lib="/usr/$(get_libdir)/skalibs"
+   --with-sysdeps="/usr/$(get_libdir)/skalibs"
+   --enable-shared
+   --disable-allstatic
+   --disable-static
+   --disable-static-libc
+   $(use_enable execline)
+   )
+
+   econf "${myconf[@]}"
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/

2023-02-16 Thread Yixun Lan
commit: d393dbb76a596882a9bb2715481a437941a83135
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Feb 16 22:07:30 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Feb 16 22:07:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d393dbb7

sys-apps/s6: Keyword 2.11.2.0 riscv, #894780

Signed-off-by: Yixun Lan  gentoo.org>

 sys-apps/s6/s6-2.11.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/s6/s6-2.11.2.0.ebuild b/sys-apps/s6/s6-2.11.2.0.ebuild
index 446c90bc9cc4..3c7489367164 100644
--- a/sys-apps/s6/s6-2.11.2.0.ebuild
+++ b/sys-apps/s6/s6-2.11.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz;
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="+execline"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:=



  1   2   3   >