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

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

[William Hubbs]

commit:     7f3a710b40db211b931e3e130e137cf8cf63740b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 16:47:06 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 17:48:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3a710b

sys-apps/s6: 2.9.2.0 bump

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/metadata.xml      |  3 +++
 sys-apps/s6/s6-2.9.2.0.ebuild | 46 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 0ccf5f1cc64..c183811299c 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -5,3 +5,4 @@ DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec
 DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
 DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
 DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff
+DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee

diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 1b7eef43c73..1718e243ff8 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -13,4 +13,7 @@
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.
 	</longdescription>
+	<use>
+		<flag name="execline">enable support for <pkg>dev-lang/execline</pkg></flag>
+	</use>
 </pkgmetadata>

diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
new file mode 100644
index 00000000000..258de953b55
--- /dev/null
+++ b/sys-apps/s6/s6-2.9.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND="execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] )
+	>=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--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 \
+		$(usex execline '' '--disable-execline' )
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[Petr Vaněk]

commit:     f7d07340c2675d2cb5e779c9641899b7a98f6309
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 07:27:57 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 09:38:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d07340

sys-apps/s6: add 2.13.1.0

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index c48efd2109a7..d8e86863758d 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.13.0.0.tar.gz 256126 BLAKE2B 08c20a6e2268bcecea39f7066f8fcbb61723c4c0ae3772af5362b68f53ed65494b824827779d44d64d204688f03634bdd079f08def5b41a5170d88888e2fbc8a SHA512 b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d
+DIST s6-2.13.1.0.tar.gz 256614 BLAKE2B 806a79e293d50180695beed5c397d60b23e9434dfc48d4bdd835e35e073ef8be2c2105cb421e3329a93ec9855fe86275bf745cffb973a02898d99a58e21b674c SHA512 89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b

diff --git a/sys-apps/s6/s6-2.13.1.0.ebuild b/sys-apps/s6/s6-2.13.1.0.ebuild
new file mode 100644
index 000000000000..2dc850cad795
--- /dev/null
+++ b/sys-apps/s6/s6-2.13.1.0.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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+	>=dev-libs/skalibs-2.14.3.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/

[Petr Vaněk]

commit:     4653c445ba72d11e8311f0288ee65ae3256794aa
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 10:11:23 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 10:18:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4653c445

sys-apps/s6: drop 2.12.0.4

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index d9fa4f53f2a4..c48efd2109a7 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1 @@
-DIST s6-2.12.0.4.tar.gz 255314 BLAKE2B 4a7da37affdc2d0651da905fdfbffe897709cc6f2a4a36453f0a87c88da66adb307805b9f8c850813186ce51c18ed07b8a95aa34a8a266a5a24b3b8646b19485 SHA512 dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56
 DIST s6-2.13.0.0.tar.gz 256126 BLAKE2B 08c20a6e2268bcecea39f7066f8fcbb61723c4c0ae3772af5362b68f53ed65494b824827779d44d64d204688f03634bdd079f08def5b41a5170d88888e2fbc8a SHA512 b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
deleted file mode 100644
index 53c17e66ea22..000000000000
--- a/sys-apps/s6/s6-2.12.0.4.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 ~ppc ~ppc64 ~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/

[Sam James]

commit:     c0797f82fc779823ae20cfa22fcd2292a7b553a5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 11:50:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 11:50:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0797f82

sys-apps/s6: Stabilize 2.13.0.0 arm, #936090

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

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

diff --git a/sys-apps/s6/s6-2.13.0.0.ebuild b/sys-apps/s6/s6-2.13.0.0.ebuild
index 68872032d9f0..60b138593c4d 100644
--- a/sys-apps/s6/s6-2.13.0.0.ebuild
+++ b/sys-apps/s6/s6-2.13.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="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="

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

[Sam James]

commit:     28560a34fec2ebe459d9758810f5ee07645c841c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 11:48:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 11:48:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28560a34

sys-apps/s6: Stabilize 2.13.0.0 amd64, #936090

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

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

diff --git a/sys-apps/s6/s6-2.13.0.0.ebuild b/sys-apps/s6/s6-2.13.0.0.ebuild
index 5afec8c9ea5d..68872032d9f0 100644
--- a/sys-apps/s6/s6-2.13.0.0.ebuild
+++ b/sys-apps/s6/s6-2.13.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="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="

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

[Sam James]

commit:     0416c882c078a933d05b415514660004922f5f3c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 11:48:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 11:48:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0416c882

sys-apps/s6: Stabilize 2.13.0.0 x86, #936090

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

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

diff --git a/sys-apps/s6/s6-2.13.0.0.ebuild b/sys-apps/s6/s6-2.13.0.0.ebuild
index 75a6f7ec08d5..5afec8c9ea5d 100644
--- a/sys-apps/s6/s6-2.13.0.0.ebuild
+++ b/sys-apps/s6/s6-2.13.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="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="

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

[Petr Vaněk]

commit:     c9c6cb2bb52addc4ba7b0794732ffd656dfdf86f
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 12:55:27 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 13:29:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c6cb2b

sys-apps/s6: add 2.13.0.0

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 58852aeb5ae7..d9fa4f53f2a4 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.12.0.4.tar.gz 255314 BLAKE2B 4a7da37affdc2d0651da905fdfbffe897709cc6f2a4a36453f0a87c88da66adb307805b9f8c850813186ce51c18ed07b8a95aa34a8a266a5a24b3b8646b19485 SHA512 dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56
+DIST s6-2.13.0.0.tar.gz 256126 BLAKE2B 08c20a6e2268bcecea39f7066f8fcbb61723c4c0ae3772af5362b68f53ed65494b824827779d44d64d204688f03634bdd079f08def5b41a5170d88888e2fbc8a SHA512 b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d

diff --git a/sys-apps/s6/s6-2.13.0.0.ebuild b/sys-apps/s6/s6-2.13.0.0.ebuild
new file mode 100644
index 000000000000..75a6f7ec08d5
--- /dev/null
+++ b/sys-apps/s6/s6-2.13.0.0.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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+	>=dev-libs/skalibs-2.14.2.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/

[Sam James]

commit:     a8c356bf373c1c1b560a0c2650fd514af7b8b59d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 21:11:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 21:11:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c356bf

sys-apps/s6: Keyword 2.12.0.4 ppc64, #933981

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

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

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
index 47b107317105..e2927dd29281 100644
--- a/sys-apps/s6/s6-2.12.0.4.ebuild
+++ b/sys-apps/s6/s6-2.12.0.4.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 ~ppc64 ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="

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

[Sam James]

commit:     a50e661f55c6935c1a3b37c0865f68cec49479f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 21:11:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 21:11:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50e661f

sys-apps/s6: Keyword 2.12.0.4 ppc, #933981

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

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

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
index e2927dd29281..53c17e66ea22 100644
--- a/sys-apps/s6/s6-2.12.0.4.ebuild
+++ b/sys-apps/s6/s6-2.12.0.4.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 ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="

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

[Petr Vaněk]

commit:     4b2201c5749dfffe4386a472fbcf63f07c20ab6c
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 20:25:34 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sun May 26 20:25:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2201c5

sys-apps/s6: drop 2.12.0.3

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 1ad9b30254dc..58852aeb5ae7 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1 @@
-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.3.ebuild b/sys-apps/s6/s6-2.12.0.3.ebuild
deleted file mode 100644
index 47b107317105..000000000000
--- a/sys-apps/s6/s6-2.12.0.3.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.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/

[Sam James]

commit:     2f0f3b5955fd4796bf4d450702209d2ead13f5a2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 14:51:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 19 14:51:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0f3b59

sys-apps/s6: Stabilize 2.12.0.4 arm, #932184

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

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

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
index 4d48f7fe8db5..47b107317105 100644
--- a/sys-apps/s6/s6-2.12.0.4.ebuild
+++ b/sys-apps/s6/s6-2.12.0.4.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/

[Sam James]

commit:     30b22b403e64e3609eaafe9961ad40b9f076b2f4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 13:57:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 19 13:57:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b22b40

sys-apps/s6: Stabilize 2.12.0.4 x86, #932184

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

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

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
index c0d9c3faa196..4d48f7fe8db5 100644
--- a/sys-apps/s6/s6-2.12.0.4.ebuild
+++ b/sys-apps/s6/s6-2.12.0.4.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/

[Sam James]

commit:     ff02799b6e2814564f6b48df44d9191c1ad39c45
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 13:57:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 19 13:57:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff02799b

sys-apps/s6: Stabilize 2.12.0.4 amd64, #932184

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

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

diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
index 721d293067ea..c0d9c3faa196 100644
--- a/sys-apps/s6/s6-2.12.0.4.ebuild
+++ b/sys-apps/s6/s6-2.12.0.4.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/

[Petr Vaněk]

commit:     90d226de6d0cb6f0e9bc12b45ff6724c3845dd5a
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 07:56:32 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 07:59:27 2024 +0000
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 <arkamar <AT> 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 000000000000..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/

[Petr Vaněk]

commit:     f66edeee3691fe8f39097e64a74c525bb1cc1f04
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 08:06:14 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 08:18:01 2024 +0000
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 <arkamar <AT> 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..000000000000
--- 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/

[Sam James]

commit:     30d26f4bb0a0988b0276f366f28ed1fdc1922156
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 04:28:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 04:28:44 2024 +0000
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 <sam <AT> 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/

[Sam James]

commit:     3406f0c3f3f7a231f6e6dc7094e0674a0e54ba95
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 04:28:45 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 04:28:45 2024 +0000
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 <sam <AT> 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/

[Sam James]

commit:     b3a8d28aeaa00f9215a2c7205a2171a3cf05bf2d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 04:28:46 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 04:28:46 2024 +0000
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 <sam <AT> 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/

[Petr Vaněk]

commit:     446cc7ced923a0cb38e0f149fadbfb84673ffcca
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 10:33:58 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 10:38:39 2024 +0000
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 <arkamar <AT> 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..000000000000
--- 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/

[Ionen Wolkens]

commit:     ad2d1aa1ff44ee13f7a812f325669f505133422d
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Jan 16 20:30:47 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 02:44:56 2024 +0000
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_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> 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/

[Petr Vaněk]

commit:     b9e5628e7c56c8a40d560133cb14df8fd853f52c
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 13:13:52 2023 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:22:49 2023 +0000
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 <arkamar <AT> 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 000000000000..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/

[Petr Vaněk]

commit:     12a9744883eff1d0d5305042c9a4efdf8329dac5
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 13:18:18 2023 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:22:45 2023 +0000
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 <arkamar <AT> 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/

[Petr Vaněk]

commit:     7710cc2f9000f6adda0357e5541cd6ff795516bc
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 13:16:53 2023 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:22:44 2023 +0000
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 <arkamar <AT> 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..000000000000
--- 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/

[Joonas Niilola]

commit:     47ea44e8629c6ee6ba1769087b28e983f83bad5e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 06:11:44 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 06:11:44 2023 +0000
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 <juippis <AT> 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/

[Joonas Niilola]

commit:     afbd9f5c026e436fd9a5eec41b371f7f7050a3b3
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 06:12:01 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 06:12:01 2023 +0000
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 <juippis <AT> 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/

[Petr Vaněk]

commit:     275a352e4a5b7a55a2a783cb2568759ed67dcc68
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 13:44:43 2023 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 15:01:49 2023 +0000
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 <arkamar <AT> 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/

[Sam James]

commit:     0b9089564d7dfe9f78d176efe66d1e62620d88c1
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Nov 20 08:17:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:32:57 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> 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 000000000000..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/

[Sam James]

commit:     8ecb240c837931d67a9157ca36df897e81bdabe6
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Nov 18 18:46:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 10:03:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ecb240c

sys-apps/s6: Keyword 2.12.0.0 alpha, #917057

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.12.0.0.ebuild b/sys-apps/s6/s6-2.12.0.0.ebuild
index 165537535fbf..8ac261aaceea 100644
--- a/sys-apps/s6/s6-2.12.0.0.ebuild
+++ b/sys-apps/s6/s6-2.12.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 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~riscv ~x86"
 IUSE="+execline"
 
 RDEPEND="

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

[Sam James]

commit:     0e310c44590f4435b6374d131c82bf1dea3412ea
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Nov  8 10:30:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 11:08:04 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> 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 000000000000..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/

[Joonas Niilola]

commit:     c538127f3511e809b058ab56544431a2aa6871cf
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sat Jul 15 07:41:15 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 08:01:37 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> 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 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 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..000000000000
--- 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/

[Joonas Niilola]

commit:     9cb94fda3c106bb4aad55da9af0bb5c07b65d66e
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sat May  6 14:52:56 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 20 12:10:16 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> 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 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 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..000000000000
--- 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="<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-libc
-		$(use_enable execline)
-	)
-
-	econf "${myconf[@]}"
-}

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

[Joonas Niilola]

commit:     35c8067d18a015feda941a10d93f29ef98ab0492
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 05:56:10 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue May 16 05:58:03 2023 +0000
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 <juippis <AT> 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/

[Joonas Niilola]

commit:     6a5011c586bc32f4355af06a22088a1caca0bc10
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 05:56:28 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue May 16 05:58:04 2023 +0000
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 <juippis <AT> 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/

[Arthur Zamarin]

commit:     52bfa0ca3515485337c4f84efbdad55b4682c348
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 09:48:43 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 09:49:16 2023 +0000
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 <arthurzam <AT> 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/

[Joonas Niilola]

commit:     a6ca64925c3f21f44da29e1403d79487b54be601
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Apr  2 21:31:59 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 12:15:00 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> 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 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
 DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19 SHA512 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
+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 000000000000..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/

[Joonas Niilola]

commit:     44e39c8e938280fb529f019c3f998de3ba7b83c4
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Apr  2 21:53:58 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 12:15:00 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> 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 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
 DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19 SHA512 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 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..000000000000
--- 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/

[Joonas Niilola]

commit:     4d25779ed0bc9f34ed7f8be66e0a79878a555033
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 05:22:09 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 05:22:09 2023 +0000
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 <juippis <AT> 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/

[Arthur Zamarin]

commit:     3e3c6c0e762bd05fcb8ba4275721976f003c482a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 05:13:34 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 05:13:34 2023 +0000
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 <arthurzam <AT> 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/

[Sam James]

commit:     ce487acde97451ff96619579ce49390e72c15fb7
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri Feb 17 21:25:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 08:00:59 2023 +0000
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 <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> 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 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
+DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19 SHA512 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479

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 000000000000..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/

[Yixun Lan]

commit:     d393dbb76a596882a9bb2715481a437941a83135
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 22:07:30 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 22:07:30 2023 +0000
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 <dlan <AT> 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:=

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

[Sam James]

commit:     1bb7ba451530419133a69e5beb7f3999c94e37ad
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jan 16 20:09:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 01:52:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb7ba45

sys-apps/s6: move myself as the first maintainer

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

 sys-apps/s6/metadata.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 405713375b37..1c3da2e84df9 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
@@ -9,10 +13,6 @@
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>

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

[Sam James]

commit:     d7a29255bb33238703157018623c0e7eb40e9ae0
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jan 16 10:59:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 01:52:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a29255

sys-apps/s6: limit dependency due to an API change

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

 sys-apps/s6/{s6-2.11.1.2.ebuild => s6-2.11.1.2-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2-r1.ebuild
similarity index 93%
rename from sys-apps/s6/s6-2.11.1.2.ebuild
rename to sys-apps/s6/s6-2.11.1.2-r1.ebuild
index 3dae363c48c3..a9240e9e4205 100644
--- a/sys-apps/s6/s6-2.11.1.2.ebuild
+++ b/sys-apps/s6/s6-2.11.1.2-r1.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
@@ -14,7 +14,7 @@ SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="amd64 arm x86"
 IUSE="+execline"
 
-RDEPEND="dev-libs/skalibs:=
+RDEPEND="<dev-libs/skalibs-2.13.0.0:=
 	execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"

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

[Sam James]

commit:     01e67a01bd9d9e44f3351feca76f262bc9fa2685
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jan 16 11:16:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 01:52:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e67a01

sys-apps/s6: add 2.11.2.0

The --disable-static needs to be explicitly specified in configuration
phase otherwise static libraries are created.

Fixes: 01de0621eb30 ("sys-apps/s6: drop IUSE="static static-libs"")
Bug: https://bugs.gentoo.org/890875
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 3877a13ec004..25935bf02a7e 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 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 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5

diff --git a/sys-apps/s6/s6-2.11.2.0.ebuild b/sys-apps/s6/s6-2.11.2.0.ebuild
new file mode 100644
index 000000000000..446c90bc9cc4
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.2.0.ebuild
@@ -0,0 +1,52 @@
+# 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=">=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/

[Joonas Niilola]

commit:     1e32e5cf1c1cf8cf0346a1c7134866dfc949a829
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Aug 16 10:21:07 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 15:26:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e32e5cf

sys-apps/s6: drop 2.11.1.0-r1, 2.11.1.1

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

 sys-apps/s6/Manifest              |  2 --
 sys-apps/s6/s6-2.11.1.0-r1.ebuild | 54 ---------------------------------------
 sys-apps/s6/s6-2.11.1.1.ebuild    | 51 ------------------------------------
 3 files changed, 107 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 7a5041c837b1..3877a13ec004 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1 @@
-DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
 DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258 SHA512 31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d

diff --git a/sys-apps/s6/s6-2.11.1.0-r1.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
deleted file mode 100644
index 65697c3d13b7..000000000000
--- a/sys-apps/s6/s6-2.11.1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 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 static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] )
-	>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
-"
-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
-		$(usex execline '' '--disable-execline' )
-		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}

diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
deleted file mode 100644
index dcdeeef35af5..000000000000
--- a/sys-apps/s6/s6-2.11.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 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="dev-libs/skalibs:=
-	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-libc
-		$(use_enable execline)
-	)
-
-	econf "${myconf[@]}"
-}

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

[Joonas Niilola]

commit:     549d100b22e0544196dd74499f4655686e9d0804
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 05:38:34 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 05:38:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549d100b

sys-apps/s6: Stabilize 2.11.1.2 amd64, #862636

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2.ebuild
index dcdeeef35af5..b4997e3253f8 100644
--- a/sys-apps/s6/s6-2.11.1.2.ebuild
+++ b/sys-apps/s6/s6-2.11.1.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"
 IUSE="+execline"
 
 RDEPEND="dev-libs/skalibs:=

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

[Joonas Niilola]

commit:     8661dee25368a37e0d68d028eab8d3df8f906a85
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 05:39:28 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 05:39:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8661dee2

sys-apps/s6: Stabilize 2.11.1.2 x86, #862636

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2.ebuild
index b4997e3253f8..271cb78aeb44 100644
--- a/sys-apps/s6/s6-2.11.1.2.ebuild
+++ b/sys-apps/s6/s6-2.11.1.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"
 IUSE="+execline"
 
 RDEPEND="dev-libs/skalibs:=

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

[Sam James]

commit:     1c2778287f63f75b3ae19374de2d3a6b11e8f42c
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jun 30 19:32:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:37:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c277828

sys-apps/s6: add 2.11.1.2

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/26172
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 6eaa14d7d718..7a5041c837b1 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1,3 @@
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
 DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
+DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258 SHA512 31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d

diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2.ebuild
new file mode 100644
index 000000000000..dcdeeef35af5
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 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="dev-libs/skalibs:=
+	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-libc
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}

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

[Sam James]

commit:     53c83c8af6130f233d4af428644bc98c6ff3cdb2
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Jun 14 21:09:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 05:35:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c83c8a

sys-apps/s6: add 2.11.1.1

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index a9f6ac81ca9e..6eaa14d7d718 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
+DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752

diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
new file mode 100644
index 000000000000..ba06fd3ede5b
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 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 static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND="dev-libs/skalibs:=[static-libs?]
+	execline? ( dev-lang/execline:=[static-libs?] )
+"
+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
+		$(use_enable static allstatic)
+		$(use_enable static static-libc)
+		$(use_enable static-libs static)
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}

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

[Joonas Niilola]

commit:     b58118da4a381b96879f47f831eaa37cab4e9bd3
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jun 12 20:00:46 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 14:55:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58118da

sys-apps/s6: drop 2.11.0.1

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 4a44552750d8..a9f6ac81ca9e 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1 @@
-DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738

diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
deleted file mode 100644
index 2f9f63992ca5..000000000000
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 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 static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( >=dev-lang/execline-2.8.2.0:=[static-libs?] )
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-"
-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
-		$(usex execline '' '--disable-execline' )
-		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}

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

[Joonas Niilola]

commit:     9eee0ef977f2559dbd032c01a0cf6a40de2093e7
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri May 20 15:26:08 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue May 24 06:57:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eee0ef9

sys-apps/s6: drop 2.9.2.0

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 5b79e7e1b39e..4a44552750d8 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,2 @@
 DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee

diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
deleted file mode 100644
index 473967d84b7d..000000000000
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( <dev-lang/execline-2.7.0.0:=[static-libs?] )
-	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	econf \
-		--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 \
-		$(usex execline '' '--disable-execline' ) \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

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

[Joonas Niilola]

commit:     5c5d3282ea97e7ea6e767f415b806a0016e37dd0
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 05:56:53 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 22 06:06:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5d3282

sys-apps/s6: Stabilize 2.11.1.0 amd64, #846683

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild
index bf45c253220e..fd8446dfda7d 100644
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ b/sys-apps/s6/s6-2.11.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="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

[Joonas Niilola]

commit:     b4f7c13356916659aa3bed8ad9aa27956ece28df
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 06:05:30 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 22 06:06:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f7c133

sys-apps/s6: Stabilize 2.11.1.0 x86, #846683

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild
index fd8446dfda7d..ab9cc3bb0e38 100644
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ b/sys-apps/s6/s6-2.11.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="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

[Joonas Niilola]

commit:     7189b38d2b76723f9c253a0ed41e1e75c2f99477
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 09:49:09 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 09:49:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7189b38d

sys-apps/s6: Stabilize 2.11.0.1 amd64, #834437

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
index e4566808cd8a..2f9f63992ca5 100644
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ b/sys-apps/s6/s6-2.11.0.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="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

[Joonas Niilola]

commit:     53e72ab7f94503aed9495efb11f7451f9ed36b66
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Mar  8 14:44:03 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 08:31:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e72ab7

sys-apps/s6: add 2.11.1.0

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

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 99c190f6d9a3..5b79e7e1b39e 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1,3 @@
 DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
+DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
 DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee

diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild
new file mode 100644
index 000000000000..bf45c253220e
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 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 static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] )
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+"
+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
+		$(usex execline '' '--disable-execline' )
+		--enable-shared
+		$(use_enable static allstatic)
+		$(use_enable static static-libc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}

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

[Jakov Smolić]

commit:     d6e78c35a648ba29854449fd0b0a197585c6e349
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 09:47:59 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 09:47:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e78c35

sys-apps/s6: Stabilize 2.11.0.1 x86, #834437

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
index 3827e604be40..e4566808cd8a 100644
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ b/sys-apps/s6/s6-2.11.0.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="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

[Jakov Smolić]

commit:     0f82392adbc3c138928be2b028ef6b27f3ce5ba5
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 17:19:13 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 17:19:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f82392a

sys-apps/s6: drop versions

Bug: https://bugs.gentoo.org/819246
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sys-apps/s6/Manifest          |  7 -----
 sys-apps/s6/s6-2.1.3.0.ebuild | 62 -------------------------------------------
 sys-apps/s6/s6-2.6.1.1.ebuild | 60 -----------------------------------------
 sys-apps/s6/s6-2.7.0.0.ebuild | 60 -----------------------------------------
 sys-apps/s6/s6-2.7.1.1.ebuild | 60 -----------------------------------------
 sys-apps/s6/s6-2.7.2.1.ebuild | 50 ----------------------------------
 sys-apps/s6/s6-2.8.0.1.ebuild | 45 -------------------------------
 sys-apps/s6/s6-2.9.0.1.ebuild | 45 -------------------------------
 8 files changed, 389 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index c183811299c1..8357e682c2e5 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,8 +1 @@
-DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca
-DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
-DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
-DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
-DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
-DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
-DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff
 DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee

diff --git a/sys-apps/s6/s6-2.1.3.0.ebuild b/sys-apps/s6/s6-2.1.3.0.ebuild
deleted file mode 100644
index 125f5749978d..000000000000
--- a/sys-apps/s6/s6-2.1.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-4.0
-	static? (
-		>=dev-lang/execline-2.1.1.0[static-libs]
-		>=dev-libs/skalibs-2.3.2.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.1.0
-		>=dev-libs/skalibs-2.3.2.0
-	)
-"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.1.0
-		>=dev-libs/skalibs-2.3.2.0
-	)
-"
-
-src_prepare() {
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}
-
-src_compile() {
-	emake DESTDIR="${D}"
-}
-
-src_install() {
-	default
-	dodoc -r examples
-	dohtml -r doc/*
-}

diff --git a/sys-apps/s6/s6-2.6.1.1.ebuild b/sys-apps/s6/s6-2.6.1.1.ebuild
deleted file mode 100644
index c638efeca0aa..000000000000
--- a/sys-apps/s6/s6-2.6.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.3[static-libs]
-		>=dev-libs/skalibs-2.6.0.1[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.3[static=]
-		>=dev-libs/skalibs-2.6.0.1
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.3:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.0.1:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.7.0.0.ebuild b/sys-apps/s6/s6-2.7.0.0.ebuild
deleted file mode 100644
index f413b96bcaca..000000000000
--- a/sys-apps/s6/s6-2.7.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.4[static-libs]
-		>=dev-libs/skalibs-2.6.3.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.4[static=]
-		>=dev-libs/skalibs-2.6.3.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.4:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.3.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.7.1.1.ebuild b/sys-apps/s6/s6-2.7.1.1.ebuild
deleted file mode 100644
index df566e620d64..000000000000
--- a/sys-apps/s6/s6-2.7.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.4[static-libs]
-		>=dev-libs/skalibs-2.6.4.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.4[static=]
-		>=dev-libs/skalibs-2.6.4.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.4:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.4.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.7.2.1.ebuild b/sys-apps/s6/s6-2.7.2.1.ebuild
deleted file mode 100644
index d91e04cfffd3..000000000000
--- a/sys-apps/s6/s6-2.7.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
-	>=dev-libs/skalibs-2.7.0.0[static-libs?]
-"
-RDEPEND=">=dev-lang/execline-2.5.0.1:=
-	!static? ( >=dev-libs/skalibs-2.7.0.0:= )
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.8.0.1.ebuild b/sys-apps/s6/s6-2.8.0.1.ebuild
deleted file mode 100644
index 844ca391029d..000000000000
--- a/sys-apps/s6/s6-2.8.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.8.1.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--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 \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.9.0.1.ebuild b/sys-apps/s6/s6-2.9.0.1.ebuild
deleted file mode 100644
index 154f800e40b6..000000000000
--- a/sys-apps/s6/s6-2.9.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
-	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--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 \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

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

[Jakov Smolić]

commit:     9fd2a778632acdd9d2b4957ddf5acc66dec9ad92
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 17:12:45 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 17:12:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd2a778

sys-apps/s6: Stabilize 2.9.2.0 x86, #819246

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
index 0c346b687ba5..c7ca3e11252d 100644
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ b/sys-apps/s6/s6-2.9.2.0.ebuild
@@ -9,7 +9,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="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

[Jakov Smolić]

commit:     2372de34762216631cbe764ad9bb61505569d00e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 16:38:29 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 16:38:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2372de34

sys-apps/s6: Stabilize 2.9.2.0 amd64, #819246

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
index f3a95ba0a93b..0c346b687ba5 100644
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ b/sys-apps/s6/s6-2.9.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"

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

[William Hubbs]

commit:     9739435169e29b61e63853c13ee22e03451084d3
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 21:43:10 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 21:43:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97394351

sys-apps/s6: typo fix for 2.9.2.0

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

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

diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
index 258de953b55..f3a95ba0a93 100644
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ b/sys-apps/s6/s6-2.9.2.0.ebuild
@@ -38,7 +38,7 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/execline \
 		--with-lib=/usr/$(get_libdir)/skalibs \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(usex execline '' '--disable-execline' )
+		$(usex execline '' '--disable-execline' ) \
 		--enable-shared \
 		$(use_enable static allstatic) \
 		$(use_enable static static-libc) \

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

[Joonas Niilola]

commit:     9b215956d9b9863be3135bf8bb87bb147848184d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 07:02:32 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 16 07:02:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b215956

sys-apps/s6: remove p-m

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-apps/s6/metadata.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 311d57d392d..48d60bf54d5 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -5,14 +5,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>samuel@sholland.org</email>
-		<name>Samuel Holland</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.

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

[William Hubbs]

commit:     7df329490e0c8c67cd224d8b46996f3e8870cf8c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 21:38:15 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 21:53:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df32949

sys-apps/s6: 2.9.0.1 bump

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

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.9.0.1.ebuild | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 7c7e4c740c6..0ccf5f1cc64 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -4,3 +4,4 @@ DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4
 DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
 DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
 DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
+DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff

diff --git a/sys-apps/s6/s6-2.9.0.1.ebuild b/sys-apps/s6/s6-2.9.0.1.ebuild
new file mode 100644
index 00000000000..154f800e40b
--- /dev/null
+++ b/sys-apps/s6/s6-2.9.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--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 \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[Michał Górny]

commit:     b6ef594f7417c72ffd0b6c3a014d9b8f4c66c3e9
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Sun May 19 23:29:31 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 07:32:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ef594f

sys-apps/s6: Version bump to 2.8.0.1

Signed-off-by: Samuel Holland <samuel <AT> sholland.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.8.0.1.ebuild | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index a44a6564b12..7c7e4c740c6 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -3,3 +3,4 @@ DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f70
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
 DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
 DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
+DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f

diff --git a/sys-apps/s6/s6-2.8.0.1.ebuild b/sys-apps/s6/s6-2.8.0.1.ebuild
new file mode 100644
index 00000000000..844ca391029
--- /dev/null
+++ b/sys-apps/s6/s6-2.8.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
+	>=dev-libs/skalibs-2.8.1.0:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--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 \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[Georgy Yakovlev]

commit:     b6579a4044b271eb121d2447f13dff67dc83a105
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Wed Aug 22 21:37:21 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 00:10:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6579a40

sys-apps/s6: Bump to 2.7.2.1

Bump EAPI to 7, always compile shared libs, fix bug with USE="static
-static-libs", simplify dependency syntax.

Closes: https://github.com/gentoo/gentoo/pull/9675
Signed-off-by: Luis Ressel <aranea <AT> aixah.de>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.7.2.1.ebuild | 50 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index fc86d3003e9..a44a6564b12 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -2,3 +2,4 @@ DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
 DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
+DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790

diff --git a/sys-apps/s6/s6-2.7.2.1.ebuild b/sys-apps/s6/s6-2.7.2.1.ebuild
new file mode 100644
index 00000000000..d91e04cfffd
--- /dev/null
+++ b/sys-apps/s6/s6-2.7.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
+	>=dev-libs/skalibs-2.7.0.0[static-libs?]
+"
+RDEPEND=">=dev-lang/execline-2.5.0.1:=
+	!static? ( >=dev-libs/skalibs-2.7.0.0:= )
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[Michał Górny]

commit:     b3770c089e6b8cd05945cf62dad70b0130e9c74e
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Tue Oct  2 21:34:35 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 22:08:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3770c08

sys-apps/s6: Add proxy-maint, Samuel, myself as maintainers

Acked-by: Samuel Holland <samuel <AT> sholland.org>
Signed-off-by: Luis Ressel <aranea <AT> aixah.de>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/9676

 sys-apps/s6/metadata.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 48d60bf54d5..b8be92c8b77 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -5,6 +5,18 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.

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

[William Hubbs]

commit:     ca19989e22b273e8a19e52a5355fa85c5adacf9f
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Fri Mar 30 03:24:34 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 31 22:48:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca19989e

sys-apps/s6: 2.7.1.1 version bump

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.7.1.1.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index b055cb4df68..fc86d3003e9 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,4 @@
 DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
+DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79

diff --git a/sys-apps/s6/s6-2.7.1.1.ebuild b/sys-apps/s6/s6-2.7.1.1.ebuild
new file mode 100644
index 00000000000..df566e620d6
--- /dev/null
+++ b/sys-apps/s6/s6-2.7.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.4[static-libs]
+		>=dev-libs/skalibs-2.6.4.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.4[static=]
+		>=dev-libs/skalibs-2.6.4.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[William Hubbs]

commit:     053d060b8786681abeb7022a8d8423aaa960eb21
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Thu Nov 16 01:08:20 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 13:24:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053d060b

sys-apps/s6: Clean up old versions

 sys-apps/s6/Manifest          |  6 -----
 sys-apps/s6/s6-2.2.4.3.ebuild | 57 ----------------------------------------
 sys-apps/s6/s6-2.3.0.0.ebuild | 57 ----------------------------------------
 sys-apps/s6/s6-2.4.0.0.ebuild | 57 ----------------------------------------
 sys-apps/s6/s6-2.5.0.0.ebuild | 57 ----------------------------------------
 sys-apps/s6/s6-2.5.1.0.ebuild | 60 -------------------------------------------
 sys-apps/s6/s6-2.6.1.0.ebuild | 60 -------------------------------------------
 7 files changed, 354 deletions(-)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index a02291e47c9..b055cb4df68 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,9 +1,3 @@
 DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca
-DIST s6-2.2.4.3.tar.gz 192153 BLAKE2B 385a99c24679f8b096a71cc63b2d2274ab48437cd0135e7ad72b374115ccf71c30376a3ec2e6074dd0f511625861415d23db87ad12f27e7aeccec554d7daa4ef SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb
-DIST s6-2.3.0.0.tar.gz 192887 BLAKE2B 88783014bd1187b56afc28b0b7e46fbe5879bae0eb4a20d4ccf16b12303a4d8f41cf96be74b49722484688b2c10212eb364f577837aaaa4a6b72965d07024358 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c
-DIST s6-2.4.0.0.tar.gz 193534 BLAKE2B 022d75ef30a48c6d87858f39d40ba7ae9678d35908fe1bfa8f0c08b66a9669be7fee8babc8eaff05203e9096f0825f4a3749b8ed093fa9492adf14c8ca3976a8 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2
-DIST s6-2.5.0.0.tar.gz 190980 BLAKE2B b4568dd3b12ece596aee01bfd4617dbb994afa364f5b17e5ab7c55dadd58fcd49b02e62ae869bd20af082a0b23cf10fc56062ec13c274f7f8ab071c77445bedb SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94
-DIST s6-2.5.1.0.tar.gz 191814 BLAKE2B af98e095512bd6ec2d991d576c14c7cf310b20c1c66265b0c40699d297ec96198817dc5d03b082cc51822562056b61a53af36a39680429db62491c49583d7c72 SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0
-DIST s6-2.6.1.0.tar.gz 195903 BLAKE2B c963793f1fc903d6de4959b762b3882a8789c98a2516d424486c79f5b1b2b3fa6d0d65b67d1bcbeb5e521b600fc0e832d65f5069a50c940c29e0aa08b8ffbdde SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53

diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
deleted file mode 100644
index b2a3a2ca229..00000000000
--- a/sys-apps/s6/s6-2.2.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-4.0
-	static? (
-		>=dev-lang/execline-2.1.4.5[static-libs]
-		>=dev-libs/skalibs-2.3.9.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.4.5
-		>=dev-libs/skalibs-2.3.9.0
-	)
-	"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.4.5
-		>=dev-libs/skalibs-2.3.9.0
-	)
-	"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static-libs static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}

diff --git a/sys-apps/s6/s6-2.3.0.0.ebuild b/sys-apps/s6/s6-2.3.0.0.ebuild
deleted file mode 100644
index 36eee93e2ae..00000000000
--- a/sys-apps/s6/s6-2.3.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-4.0
-	static? (
-		>=dev-lang/execline-2.1.5.0[static-libs]
-		>=dev-libs/skalibs-2.3.10.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.1.5.0
-		>=dev-libs/skalibs-2.3.10.0
-	)
-	"
-RDEPEND="
-	!static? (
-		>=dev-lang/execline-2.1.5.0
-		>=dev-libs/skalibs-2.3.10.0
-	)
-	"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare()
-{
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-
-	eapply_user
-}
-
-src_configure()
-{
-	econf \
-		$(use_enable !static shared) \
-		$(use_enable static-libs static) \
-		$(use_enable static allstatic) \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-}

diff --git a/sys-apps/s6/s6-2.4.0.0.ebuild b/sys-apps/s6/s6-2.4.0.0.ebuild
deleted file mode 100644
index ab8f1fe5a45..00000000000
--- a/sys-apps/s6/s6-2.4.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.2.0.0[static-libs]
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.2.0.0[static=]
-		>=dev-libs/skalibs-2.4.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.2.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.5.0.0.ebuild b/sys-apps/s6/s6-2.5.0.0.ebuild
deleted file mode 100644
index 5eddf9e93b0..00000000000
--- a/sys-apps/s6/s6-2.5.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.0[static-libs]
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.0[static=]
-		>=dev-libs/skalibs-2.5.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.5.1.0.ebuild b/sys-apps/s6/s6-2.5.1.0.ebuild
deleted file mode 100644
index 622bd4a4312..00000000000
--- a/sys-apps/s6/s6-2.5.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.1[static-libs]
-		>=dev-libs/skalibs-2.5.1.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.1[static=]
-		>=dev-libs/skalibs-2.5.1.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.1:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.5.1.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

diff --git a/sys-apps/s6/s6-2.6.1.0.ebuild b/sys-apps/s6/s6-2.6.1.0.ebuild
deleted file mode 100644
index 44dec59c63f..00000000000
--- a/sys-apps/s6/s6-2.6.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-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/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.2[static-libs]
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.2[static=]
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="AUTHORS examples README*"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/execline \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}

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

[William Hubbs]

commit:     d18a87af368d014e60e087b895a90bfd4b1a7b51
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Wed Jan 10 08:04:34 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 21:34:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18a87af

sys-apps/s6: 2.7.0.0 version bump

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.7.0.0.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 2bd812b49d8..a02291e47c9 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -6,3 +6,4 @@ DIST s6-2.5.0.0.tar.gz 190980 BLAKE2B b4568dd3b12ece596aee01bfd4617dbb994afa364f
 DIST s6-2.5.1.0.tar.gz 191814 BLAKE2B af98e095512bd6ec2d991d576c14c7cf310b20c1c66265b0c40699d297ec96198817dc5d03b082cc51822562056b61a53af36a39680429db62491c49583d7c72 SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0
 DIST s6-2.6.1.0.tar.gz 195903 BLAKE2B c963793f1fc903d6de4959b762b3882a8789c98a2516d424486c79f5b1b2b3fa6d0d65b67d1bcbeb5e521b600fc0e832d65f5069a50c940c29e0aa08b8ffbdde SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
+DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53

diff --git a/sys-apps/s6/s6-2.7.0.0.ebuild b/sys-apps/s6/s6-2.7.0.0.ebuild
new file mode 100644
index 00000000000..f413b96bcac
--- /dev/null
+++ b/sys-apps/s6/s6-2.7.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.4[static-libs]
+		>=dev-libs/skalibs-2.6.3.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.4[static=]
+		>=dev-libs/skalibs-2.6.3.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.3.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[William Hubbs]

commit:     2fce14a9b581ec5442840c07d8de952fe1c05beb
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Wed Nov 15 20:04:35 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 20:07:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fce14a9

sys-apps/s6: Bump to 2.6.1.1

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.6.1.1.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 9020de4572a..1507c1c4965 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -5,3 +5,4 @@ DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c
 DIST s6-2.5.0.0.tar.gz 190980 SHA256 11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94 WHIRLPOOL 66a98dc92d0b83b3c67c6857d2d4ed2ba9e7abe0af77065430689a276b51088d6287b95fb381a77ee115288fe9ce48a4756aefd5221ccdce3b884fae0a6f4726
 DIST s6-2.5.1.0.tar.gz 191814 SHA256 73cd4c1975905db92122a7c7eebd0c480d046624426800b3bcc5a432e6af27cd SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 WHIRLPOOL ad9e35e7c6097e07386846daf6a546cf16f0ea83c9ab646d6445fdec52f253aa4bdc64dc20a181125ecdbd28d33011cc0ea3376534852bc5968a3017a9cfb9b5
 DIST s6-2.6.1.0.tar.gz 195903 SHA256 f0de303791134302f2630b9fe76a936b064e1e3aa772c8ae1b891155a6ea2c79 SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6 WHIRLPOOL cf5d29fe60c9c857e8896ece9523c0401e236846bf27b4e6b35f107b5eb3058a2c95dd65673e18c631d1b74d5bf572af4996103ae23a5ac6ee3235d7c6861cd8
+DIST s6-2.6.1.1.tar.gz 196083 SHA256 0172b7293d4d5607ca3ca77382fee9b87c10bd58680720b29625cf35afc75c5c SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d WHIRLPOOL f6be53e83dd9d2448ce0291088814b81df4bdf892d661c16f658921c57e4e3d9940dfcddc42b4dea2d23ac4b69b4b8c3e9f360e5e5f057562ebe41be3a61f607

diff --git a/sys-apps/s6/s6-2.6.1.1.ebuild b/sys-apps/s6/s6-2.6.1.1.ebuild
new file mode 100644
index 00000000000..c638efeca0a
--- /dev/null
+++ b/sys-apps/s6/s6-2.6.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.3[static-libs]
+		>=dev-libs/skalibs-2.6.0.1[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.3[static=]
+		>=dev-libs/skalibs-2.6.0.1
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.3:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.0.1:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[William Hubbs]

commit:     8f4c407356bbd9d7f960f746b639522a30d9bdc9
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Tue Oct  3 18:32:23 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 18:43:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4c4073

sys-apps/s6: 2.6.1.0 version bump

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.6.1.0.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 0d5d10698d1..9020de4572a 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -4,3 +4,4 @@ DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda
 DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2 WHIRLPOOL 6c6fe574cfdd8d6d97279dac48d4a284941f1e2cce981fecac3fa5083fc3ddc9e960fa38676edf94881e48f7e85ce7875415c12a7f867ca847d2e639716e62d7
 DIST s6-2.5.0.0.tar.gz 190980 SHA256 11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94 WHIRLPOOL 66a98dc92d0b83b3c67c6857d2d4ed2ba9e7abe0af77065430689a276b51088d6287b95fb381a77ee115288fe9ce48a4756aefd5221ccdce3b884fae0a6f4726
 DIST s6-2.5.1.0.tar.gz 191814 SHA256 73cd4c1975905db92122a7c7eebd0c480d046624426800b3bcc5a432e6af27cd SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 WHIRLPOOL ad9e35e7c6097e07386846daf6a546cf16f0ea83c9ab646d6445fdec52f253aa4bdc64dc20a181125ecdbd28d33011cc0ea3376534852bc5968a3017a9cfb9b5
+DIST s6-2.6.1.0.tar.gz 195903 SHA256 f0de303791134302f2630b9fe76a936b064e1e3aa772c8ae1b891155a6ea2c79 SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6 WHIRLPOOL cf5d29fe60c9c857e8896ece9523c0401e236846bf27b4e6b35f107b5eb3058a2c95dd65673e18c631d1b74d5bf572af4996103ae23a5ac6ee3235d7c6861cd8

diff --git a/sys-apps/s6/s6-2.6.1.0.ebuild b/sys-apps/s6/s6-2.6.1.0.ebuild
new file mode 100644
index 00000000000..44dec59c63f
--- /dev/null
+++ b/sys-apps/s6/s6-2.6.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.2[static-libs]
+		>=dev-libs/skalibs-2.6.0.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.2[static=]
+		>=dev-libs/skalibs-2.6.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.2:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[William Hubbs]

commit:     bc974a02f9dfbbcaa20d88656b0dfa153bfa7491
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Sun May 21 15:26:47 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May 21 21:09:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc974a02

sys-apps/s6: Bump to 2.5.1.0, fix #618156

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.5.1.0.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index cbbca8f8053..0d5d10698d1 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -3,3 +3,4 @@ DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b5
 DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c WHIRLPOOL 7052ece89b0bc4174b9583b3dba721322ee89974f9540a243fd9e4f4a5c43710360c31e5fd7596630f539e7204f7cb7bc92569e6a5d11a68cb520379078b5f37
 DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2 WHIRLPOOL 6c6fe574cfdd8d6d97279dac48d4a284941f1e2cce981fecac3fa5083fc3ddc9e960fa38676edf94881e48f7e85ce7875415c12a7f867ca847d2e639716e62d7
 DIST s6-2.5.0.0.tar.gz 190980 SHA256 11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94 WHIRLPOOL 66a98dc92d0b83b3c67c6857d2d4ed2ba9e7abe0af77065430689a276b51088d6287b95fb381a77ee115288fe9ce48a4756aefd5221ccdce3b884fae0a6f4726
+DIST s6-2.5.1.0.tar.gz 191814 SHA256 73cd4c1975905db92122a7c7eebd0c480d046624426800b3bcc5a432e6af27cd SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 WHIRLPOOL ad9e35e7c6097e07386846daf6a546cf16f0ea83c9ab646d6445fdec52f253aa4bdc64dc20a181125ecdbd28d33011cc0ea3376534852bc5968a3017a9cfb9b5

diff --git a/sys-apps/s6/s6-2.5.1.0.ebuild b/sys-apps/s6/s6-2.5.1.0.ebuild
new file mode 100644
index 00000000000..622bd4a4312
--- /dev/null
+++ b/sys-apps/s6/s6-2.5.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.1[static-libs]
+		>=dev-libs/skalibs-2.5.1.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.1[static=]
+		>=dev-libs/skalibs-2.5.1.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.1:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.5.1.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[Markus Meier]

commit:     f2becc0cb616fe14582b7d29a1e99e82db7849b6
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 19:43:33 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri May  5 19:43:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2becc0c

sys-apps/s6: add ~arm, bug #609728

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

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

diff --git a/sys-apps/s6/s6-2.5.0.0.ebuild b/sys-apps/s6/s6-2.5.0.0.ebuild
index 38eb9e1429d..5eddf9e93b0 100644
--- a/sys-apps/s6/s6-2.5.0.0.ebuild
+++ b/sys-apps/s6/s6-2.5.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static static-libs"
 
 DEPEND=">=sys-devel/make-3.81

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

[William Hubbs]

commit:     42f395525f637e7025c7b324bf6653c8b83baa16
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Wed Apr 26 21:11:42 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 21:28:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f39552

sys-apps/s6: 2.5.0.0 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index a951d310725..cbbca8f8053 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -2,3 +2,4 @@ DIST s6-2.1.3.0.tar.gz 181237 SHA256 73057df188f1ac8db186b96298c0cb6081199aa73d3
 DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b56649faa71f3b62da7db3f SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb WHIRLPOOL 5d00db61a036fa5e692892bc72391ad5d74144c57e505da73b708d8a152dc7a620e9bc7f04ef52e51220eb4ac3da15b7e31e35e0998c3c954a0d431593476c0b
 DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c WHIRLPOOL 7052ece89b0bc4174b9583b3dba721322ee89974f9540a243fd9e4f4a5c43710360c31e5fd7596630f539e7204f7cb7bc92569e6a5d11a68cb520379078b5f37
 DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2 WHIRLPOOL 6c6fe574cfdd8d6d97279dac48d4a284941f1e2cce981fecac3fa5083fc3ddc9e960fa38676edf94881e48f7e85ce7875415c12a7f867ca847d2e639716e62d7
+DIST s6-2.5.0.0.tar.gz 190980 SHA256 11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94 WHIRLPOOL 66a98dc92d0b83b3c67c6857d2d4ed2ba9e7abe0af77065430689a276b51088d6287b95fb381a77ee115288fe9ce48a4756aefd5221ccdce3b884fae0a6f4726

diff --git a/sys-apps/s6/s6-2.5.0.0.ebuild b/sys-apps/s6/s6-2.5.0.0.ebuild
new file mode 100644
index 00000000000..38eb9e1429d
--- /dev/null
+++ b/sys-apps/s6/s6-2.5.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.0[static-libs]
+		>=dev-libs/skalibs-2.5.0.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.0[static=]
+		>=dev-libs/skalibs-2.5.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.5.0.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[William Hubbs]

commit:     d7542a80e768cbc73efe1f2dcf446462f29c9755
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Mon Jan  9 21:40:05 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 23:33:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7542a80

sys-apps/s6: 2.4.0.0 version bump

Gentoo-Bug: 601482
Closes: https://github.com/gentoo/gentoo/pull/3407

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index f4585be..a951d31 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,4 @@
 DIST s6-2.1.3.0.tar.gz 181237 SHA256 73057df188f1ac8db186b96298c0cb6081199aa73d3f2f8d5fabdbbe21c3ea04 SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca WHIRLPOOL 03283a6c2a8a9419bf7e27a9e6c46fe2fe9ad0cbb384f4da0efaec56f5066ab36d20b00aae7a81408ca7b94a1325625feb83173e99e9ff9e85f28be69e6ba2c7
 DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b56649faa71f3b62da7db3f SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb WHIRLPOOL 5d00db61a036fa5e692892bc72391ad5d74144c57e505da73b708d8a152dc7a620e9bc7f04ef52e51220eb4ac3da15b7e31e35e0998c3c954a0d431593476c0b
 DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c WHIRLPOOL 7052ece89b0bc4174b9583b3dba721322ee89974f9540a243fd9e4f4a5c43710360c31e5fd7596630f539e7204f7cb7bc92569e6a5d11a68cb520379078b5f37
+DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2 WHIRLPOOL 6c6fe574cfdd8d6d97279dac48d4a284941f1e2cce981fecac3fa5083fc3ddc9e960fa38676edf94881e48f7e85ce7875415c12a7f867ca847d2e639716e62d7

diff --git a/sys-apps/s6/s6-2.4.0.0.ebuild b/sys-apps/s6/s6-2.4.0.0.ebuild
new file mode 100644
index 00000000..629d632
--- /dev/null
+++ b/sys-apps/s6/s6-2.4.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="http://www.skarnet.org/software/s6/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.2.0.0[static-libs]
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.2.0.0[static=]
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.2.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}

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

[William Hubbs]

commit:     e42725f8851c953f3231423b5ba64aa86f05dc0b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 16:50:01 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 17:35:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42725f8

sys-apps/s6: 2.3.0.0 version bump

Package-Manager: portage-2.2.28

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

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index eb9b9dc..f4585be 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1,3 @@
 DIST s6-2.1.3.0.tar.gz 181237 SHA256 73057df188f1ac8db186b96298c0cb6081199aa73d3f2f8d5fabdbbe21c3ea04 SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca WHIRLPOOL 03283a6c2a8a9419bf7e27a9e6c46fe2fe9ad0cbb384f4da0efaec56f5066ab36d20b00aae7a81408ca7b94a1325625feb83173e99e9ff9e85f28be69e6ba2c7
 DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b56649faa71f3b62da7db3f SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb WHIRLPOOL 5d00db61a036fa5e692892bc72391ad5d74144c57e505da73b708d8a152dc7a620e9bc7f04ef52e51220eb4ac3da15b7e31e35e0998c3c954a0d431593476c0b
+DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c WHIRLPOOL 7052ece89b0bc4174b9583b3dba721322ee89974f9540a243fd9e4f4a5c43710360c31e5fd7596630f539e7204f7cb7bc92569e6a5d11a68cb520379078b5f37

diff --git a/sys-apps/s6/s6-2.3.0.0.ebuild b/sys-apps/s6/s6-2.3.0.0.ebuild
new file mode 100644
index 0000000..566ad9d
--- /dev/null
+++ b/sys-apps/s6/s6-2.3.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="http://www.skarnet.org/software/s6/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-4.0
+	static? (
+		>=dev-lang/execline-2.1.5.0[static-libs]
+		>=dev-libs/skalibs-2.3.10.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.1.5.0
+		>=dev-libs/skalibs-2.3.10.0
+	)
+	"
+RDEPEND="
+	!static? (
+		>=dev-lang/execline-2.1.5.0
+		>=dev-libs/skalibs-2.3.10.0
+	)
+	"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare()
+{
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
+
+	eapply_user
+}
+
+src_configure()
+{
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static-libs static) \
+		$(use_enable static allstatic) \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--datadir=/etc \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+}

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

[William Hubbs]

commit:     1d5e60b5e81a3b65f2c273a1c320a9e637c85618
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Sun Mar  6 22:14:03 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 22:32:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5e60b5

sys-apps/s6: Add a static-libs USE flag

libs6 is used by other packages such as s6-rc, so it'd be useful to be
able to control the availability of libs6.a without depending on
USE=static.

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

diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
index 171342f..8aeee3a 100644
--- a/sys-apps/s6/s6-2.2.4.3.ebuild
+++ b/sys-apps/s6/s6-2.2.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static"
+IUSE="static static-libs"
 
 DEPEND=">=sys-devel/make-4.0
 	static? (
@@ -42,8 +42,8 @@ src_configure()
 {
 	econf \
 		$(use_enable !static shared) \
+		$(use_enable static-libs static) \
 		$(use_enable static allstatic) \
-		$(use_enable static) \
 		--bindir=/bin \
 		--sbindir=/sbin \
 		--dynlibdir=/$(get_libdir) \

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

[William Hubbs]

commit:     480552e9e3cdd8458007ed3f694dfff76cace7d1
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Mon Mar  7 11:10:25 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 22:32:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480552e9

sys-apps/s6: Bump to EAPI 6

 sys-apps/s6/s6-2.2.4.3.ebuild | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
index 8aeee3a..51c3fc2 100644
--- a/sys-apps/s6/s6-2.2.4.3.ebuild
+++ b/sys-apps/s6/s6-2.2.4.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
-inherit multilib
+EAPI=6
 
 DESCRIPTION="skarnet.org's small and secure supervision software suite"
 HOMEPAGE="http://www.skarnet.org/software/s6/"
@@ -32,10 +30,15 @@ RDEPEND="
 	)
 	"
 
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
 src_prepare()
 {
 	# Remove QA warning about LDFLAGS addition
 	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
+
+	eapply_user
 }
 
 src_configure()
@@ -53,15 +56,3 @@ src_configure()
 		--with-dynlib=/$(get_libdir) \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs
 }
-
-src_compile()
-{
-	emake DESTDIR="${D}"
-}
-
-src_install()
-{
-	default
-	dodoc -r examples
-	dohtml -r doc/*
-}

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

[William Hubbs]

commit:     1b2ad137e65b890a3f3f572a1e7a968f1145961c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 22:21:47 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 22:22:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2ad137

sys-apps/s6: version bump

 sys-apps/s6/Manifest          |  1 +
 sys-apps/s6/s6-2.2.4.3.ebuild | 67 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 272611d..eb9b9dc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.1.3.0.tar.gz 181237 SHA256 73057df188f1ac8db186b96298c0cb6081199aa73d3f2f8d5fabdbbe21c3ea04 SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca WHIRLPOOL 03283a6c2a8a9419bf7e27a9e6c46fe2fe9ad0cbb384f4da0efaec56f5066ab36d20b00aae7a81408ca7b94a1325625feb83173e99e9ff9e85f28be69e6ba2c7
+DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b56649faa71f3b62da7db3f SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb WHIRLPOOL 5d00db61a036fa5e692892bc72391ad5d74144c57e505da73b708d8a152dc7a620e9bc7f04ef52e51220eb4ac3da15b7e31e35e0998c3c954a0d431593476c0b

diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
new file mode 100644
index 0000000..171342f
--- /dev/null
+++ b/sys-apps/s6/s6-2.2.4.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="http://www.skarnet.org/software/s6/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-4.0
+	static? (
+		>=dev-lang/execline-2.1.4.5[static-libs]
+		>=dev-libs/skalibs-2.3.9.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.1.4.5
+		>=dev-libs/skalibs-2.3.9.0
+	)
+	"
+RDEPEND="
+	!static? (
+		>=dev-lang/execline-2.1.4.5
+		>=dev-libs/skalibs-2.3.9.0
+	)
+	"
+
+src_prepare()
+{
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
+}
+
+src_configure()
+{
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static) \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--datadir=/etc \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+}
+
+src_compile()
+{
+	emake DESTDIR="${D}"
+}
+
+src_install()
+{
+	default
+	dodoc -r examples
+	dohtml -r doc/*
+}

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

[Mikle Kolyada]

commit:     a6b518934583611e28d689ba178bc9f0731340f8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 18:24:36 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 18:25:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b51893

sys-apps/s6: x86 stable wrt bug #553160

Package-Manager: portage-2.2.20

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

diff --git a/sys-apps/s6/s6-2.1.3.0.ebuild b/sys-apps/s6/s6-2.1.3.0.ebuild
index 49d101f..0eea87e 100644
--- a/sys-apps/s6/s6-2.1.3.0.ebuild
+++ b/sys-apps/s6/s6-2.1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static"
 
 DEPEND=">=sys-devel/make-4.0