public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2016-03-19 23:45 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2016-03-19 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     51266289604071773cf19118088c10ac9d58b77e
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Mon Mar  7 14:10:41 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:45:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51266289

sys-apps/s6-linux-init: New package

s6-linux-init is a tool to ease the creation of /sbin/init executables
for s6-based init systems.

 sys-apps/s6-linux-init/Manifest                    |  1 +
 sys-apps/s6-linux-init/metadata.xml                | 13 +++++
 .../s6-linux-init/s6-linux-init-0.0.1.4.ebuild     | 55 ++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
new file mode 100644
index 0000000..a6cca2a
--- /dev/null
+++ b/sys-apps/s6-linux-init/Manifest
@@ -0,0 +1 @@
+DIST s6-linux-init-0.0.1.4.tar.gz 21493 SHA256 80eeb8e3bf3095d69b86aaf8e6f5c28aab53a0eb6473e301a673870b56566b6a SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235 WHIRLPOOL 55f6c6cac544b6c9ffa5b5f16639a20a47b1ba2ae61cdfe5c1446c254a11801cfab4f211c2b55c7381a37ff76509a06b25d2ec8710ec32f1682ee186efc8b805

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
new file mode 100644
index 0000000..7ac867b
--- /dev/null
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild
new file mode 100644
index 0000000..caa1a67
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND="
+	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
+	!static? ( >=dev-libs/skalibs-2.3.8.0 )
+	"
+RDEPEND="
+	!static? ( >=dev-libs/skalibs-2.3.8.0 )
+	"
+
+DOCS=(INSTALL examples/)
+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) \
+		$(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
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2016-06-29 17:45 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2016-06-29 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     1e6fbb1f12400c1d238cddb951be7f9ce26168e1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 17:35: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=1e6fbb1f

sys-apps/s6-linux-init: 0.1.0.0 version bump

Package-Manager: portage-2.2.28

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-0.1.0.0.ebuild     | 55 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index a6cca2a..af73e4d 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-0.0.1.4.tar.gz 21493 SHA256 80eeb8e3bf3095d69b86aaf8e6f5c28aab53a0eb6473e301a673870b56566b6a SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235 WHIRLPOOL 55f6c6cac544b6c9ffa5b5f16639a20a47b1ba2ae61cdfe5c1446c254a11801cfab4f211c2b55c7381a37ff76509a06b25d2ec8710ec32f1682ee186efc8b805
+DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1cb84237e7eadb9eb4b440eececcaffc SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08 WHIRLPOOL 4eed683de5c0846698c1d603e7be72299a425f1f91e3f944da98ed5fb0d9d988db1fb1931ec86ec41f837dab0b51bd61f828b2763c21ac520037021831e47543

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild
new file mode 100644
index 0000000..795f916
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND="
+	static? ( >=dev-libs/skalibs-2.3.10.0[static-libs] )
+	!static? ( >=dev-libs/skalibs-2.3.10.0 )
+	"
+RDEPEND="
+	!static? ( >=dev-libs/skalibs-2.3.10.0 )
+	"
+
+DOCS=(INSTALL examples/)
+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) \
+		$(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
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2017-01-11 23:43 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2017-01-11 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8b4b17e2f32707b7c4a988a883c3642de7adc822
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Mon Jan  9 21:44:04 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=8b4b17e2

sys-apps/s6-linux-init: 0.2.0.0 version bump

Closes: https://github.com/gentoo/gentoo/pull/3407

 sys-apps/s6-linux-init/Manifest                    |  1 +
 sys-apps/s6-linux-init/metadata.xml                |  4 ++
 .../s6-linux-init/s6-linux-init-0.2.0.0.ebuild     | 57 ++++++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index af73e4d..5cc36ef 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1,3 @@
 DIST s6-linux-init-0.0.1.4.tar.gz 21493 SHA256 80eeb8e3bf3095d69b86aaf8e6f5c28aab53a0eb6473e301a673870b56566b6a SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235 WHIRLPOOL 55f6c6cac544b6c9ffa5b5f16639a20a47b1ba2ae61cdfe5c1446c254a11801cfab4f211c2b55c7381a37ff76509a06b25d2ec8710ec32f1682ee186efc8b805
 DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1cb84237e7eadb9eb4b440eececcaffc SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08 WHIRLPOOL 4eed683de5c0846698c1d603e7be72299a425f1f91e3f944da98ed5fb0d9d988db1fb1931ec86ec41f837dab0b51bd61f828b2763c21ac520037021831e47543
+DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 7ac867b..1bf18c1 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -7,6 +7,10 @@
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
new file mode 100644
index 00000000..efab3c1
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	!<sys-apps/s6-linux-utils-2.2.0.0
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+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)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2017-04-26 21:29 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2017-04-26 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     49030f4440447388eaf6964951333bbeac18f474
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Wed Apr 26 21:23:50 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=49030f44

sys-apps/s6-linux-init: 0.3.0.0 version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-0.3.0.0.ebuild     | 59 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 5cc36ef846d..c4d6aef8b68 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,4 @@
 DIST s6-linux-init-0.0.1.4.tar.gz 21493 SHA256 80eeb8e3bf3095d69b86aaf8e6f5c28aab53a0eb6473e301a673870b56566b6a SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235 WHIRLPOOL 55f6c6cac544b6c9ffa5b5f16639a20a47b1ba2ae61cdfe5c1446c254a11801cfab4f211c2b55c7381a37ff76509a06b25d2ec8710ec32f1682ee186efc8b805
 DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1cb84237e7eadb9eb4b440eececcaffc SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08 WHIRLPOOL 4eed683de5c0846698c1d603e7be72299a425f1f91e3f944da98ed5fb0d9d988db1fb1931ec86ec41f837dab0b51bd61f828b2763c21ac520037021831e47543
 DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95
+DIST s6-linux-init-0.3.0.0.tar.gz 24692 SHA256 9376f76ae3ab24cb18a35a6956d0fa5fe88cc4c1dfd19bbafc47dcd4f91c2535 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67 WHIRLPOOL b43e92c48fdc808100276c6b46382c8e1f938ead96e8e5e799cf6a7e17af1f9261e7d0e1ec9b169d9b8a38a2682086ccc5a01cfee5b135c0edc1b3eb20819dfb

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild
new file mode 100644
index 00000000000..791ce6855b6
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.5.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.5.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.0
+	>=sys-apps/s6-2.5.0.0
+	>=sys-apps/s6-linux-utils-2.3.0.0
+	>=sys-apps/s6-portable-utils-2.2.0.0
+	!static? (
+		>=dev-libs/skalibs-2.5.0.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+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)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2017-10-03 18:47 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2017-10-03 18:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5f42be2b79c01107c132e915d8771029e445dd47
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Tue Oct  3 18:40:00 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 18:43:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f42be2b

sys-apps/s6-linux-init: 0.3.1.0 version bump

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-0.3.1.0.ebuild     | 62 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index c4d6aef8b68..f84c4a4b5d5 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -2,3 +2,4 @@ DIST s6-linux-init-0.0.1.4.tar.gz 21493 SHA256 80eeb8e3bf3095d69b86aaf8e6f5c28aa
 DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1cb84237e7eadb9eb4b440eececcaffc SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08 WHIRLPOOL 4eed683de5c0846698c1d603e7be72299a425f1f91e3f944da98ed5fb0d9d988db1fb1931ec86ec41f837dab0b51bd61f828b2763c21ac520037021831e47543
 DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95
 DIST s6-linux-init-0.3.0.0.tar.gz 24692 SHA256 9376f76ae3ab24cb18a35a6956d0fa5fe88cc4c1dfd19bbafc47dcd4f91c2535 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67 WHIRLPOOL b43e92c48fdc808100276c6b46382c8e1f938ead96e8e5e799cf6a7e17af1f9261e7d0e1ec9b169d9b8a38a2682086ccc5a01cfee5b135c0edc1b3eb20819dfb
+DIST s6-linux-init-0.3.1.0.tar.gz 25920 SHA256 d8854a01f41db88250b73bdff3a636ed31810b1c309acb2d724380c8b69aedd6 SHA512 f9c9b35daf8c7322c2146fb14f4df61131fafb6144a71666cfb77f5684e0669abee9689b238d1d1adfea04795a8cd1e88e61920b6c42432cb8a53c0861b776d8 WHIRLPOOL a17d643d17d14d23bbbd2aa995842b1a2b3195d328a5d23a1236591b8eeafe4e5e5d07968c1ab2852e4f1eb60d494a4246116e0fe7cd7fb8480c2c3e8e35ca8c

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild
new file mode 100644
index 00000000000..d94588ab510
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.2
+	>=sys-apps/s6-2.6.1.0
+	>=sys-apps/s6-linux-utils-2.4.0.0
+	>=sys-apps/s6-portable-utils-2.2.1.1
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+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)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2017-11-15 20:15 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2017-11-15 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f25c2a2dcc5b9d137730efbb52fcaff643c9617c
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Wed Nov 15 20:05:24 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 20:07:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25c2a2d

sys-apps/s6-linux-init: Bump to 0.3.1.1

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-0.3.1.1.ebuild     | 62 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index f84c4a4b5d5..1d400798939 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -3,3 +3,4 @@ DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1
 DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95
 DIST s6-linux-init-0.3.0.0.tar.gz 24692 SHA256 9376f76ae3ab24cb18a35a6956d0fa5fe88cc4c1dfd19bbafc47dcd4f91c2535 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67 WHIRLPOOL b43e92c48fdc808100276c6b46382c8e1f938ead96e8e5e799cf6a7e17af1f9261e7d0e1ec9b169d9b8a38a2682086ccc5a01cfee5b135c0edc1b3eb20819dfb
 DIST s6-linux-init-0.3.1.0.tar.gz 25920 SHA256 d8854a01f41db88250b73bdff3a636ed31810b1c309acb2d724380c8b69aedd6 SHA512 f9c9b35daf8c7322c2146fb14f4df61131fafb6144a71666cfb77f5684e0669abee9689b238d1d1adfea04795a8cd1e88e61920b6c42432cb8a53c0861b776d8 WHIRLPOOL a17d643d17d14d23bbbd2aa995842b1a2b3195d328a5d23a1236591b8eeafe4e5e5d07968c1ab2852e4f1eb60d494a4246116e0fe7cd7fb8480c2c3e8e35ca8c
+DIST s6-linux-init-0.3.1.1.tar.gz 25955 SHA256 9ee2e8a5abc250bcb2be7d07566592ba5cbe3abce858f60853d3ac45b1ccdd79 SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648 WHIRLPOOL 728ba81fa833872a2cfea7d9723f526c98921a05e490df3dad16bc306fb0136c479f1b5d3f62423ff86f7e42cd526712420558eff49ea1509f7f5cd4514d0bc5

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
new file mode 100644
index 00000000000..d94588ab510
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.2
+	>=sys-apps/s6-2.6.1.0
+	>=sys-apps/s6-linux-utils-2.4.0.0
+	>=sys-apps/s6-portable-utils-2.2.1.1
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+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)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2018-03-29 13:25 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2018-03-29 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     49a9b29b0b1d0c4ced58e4087c153e905e8dd285
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Thu Nov 16 00:51:52 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 13:24:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a9b29b

sys-apps/s6-linux-init: Clean up old versions

 sys-apps/s6-linux-init/Manifest                    |  5 --
 .../s6-linux-init/s6-linux-init-0.0.1.4.ebuild     | 54 -------------------
 .../s6-linux-init/s6-linux-init-0.1.0.0.ebuild     | 54 -------------------
 .../s6-linux-init/s6-linux-init-0.2.0.0.ebuild     | 56 -------------------
 .../s6-linux-init/s6-linux-init-0.3.0.0.ebuild     | 59 --------------------
 .../s6-linux-init/s6-linux-init-0.3.1.0.ebuild     | 62 ----------------------
 6 files changed, 290 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index ceb9c31f5f4..424974a80e7 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,6 +1 @@
-DIST s6-linux-init-0.0.1.4.tar.gz 21493 BLAKE2B 3dbb9aa93b46f69581be0a32f4d2832536cced31f8fb2dd4aad8ddd22303efc9ef0d1ea44a4e0ba912185a16bfd77397834acb9c6d908971b15b6ac946d3badb SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235
-DIST s6-linux-init-0.1.0.0.tar.gz 22242 BLAKE2B 59e3226dde94f772c2946a07867d1ef96ca0b1f5bcf14d7d7f210eb54f970182865f979f15e7e28662ef7cca05bfa2d25e8dece9581378cc05d8ff7975f11f4c SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08
-DIST s6-linux-init-0.2.0.0.tar.gz 24482 BLAKE2B 00c1e7396f7f6fc7ce1e4aa957330740bcf85c9ba53e4c998b793f373d679a34c060f73515729165537b8e1a4e5113903f84f9229a07033a81562fc179ffb74f SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e
-DIST s6-linux-init-0.3.0.0.tar.gz 24692 BLAKE2B f7074e6f8591fc4339327e428c526b79d847b1358e4e75b691cdde591c91c47f25c09ffbb4215fed1da3425c42bc79916cb83ff45ec5c298f5d55050af21e4a8 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67
-DIST s6-linux-init-0.3.1.0.tar.gz 25920 BLAKE2B 56aa4b4fba0150ba55b097c753fb204812cb0b7abea136702b26e1c1363f8a0450428009c0fd7dfcdd42fd63dae139ce154dfc196cf6024c1fbd0a486243354d SHA512 f9c9b35daf8c7322c2146fb14f4df61131fafb6144a71666cfb77f5684e0669abee9689b238d1d1adfea04795a8cd1e88e61920b6c42432cb8a53c0861b776d8
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild
deleted file mode 100644
index 6aa42b653bd..00000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.0.1.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.8.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.8.0 )
-	"
-
-DOCS=(INSTALL examples/)
-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) \
-		$(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
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild
deleted file mode 100644
index 4dbdf86c2a5..00000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.1.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND="
-	static? ( >=dev-libs/skalibs-2.3.10.0[static-libs] )
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-RDEPEND="
-	!static? ( >=dev-libs/skalibs-2.3.10.0 )
-	"
-
-DOCS=(INSTALL examples/)
-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) \
-		$(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
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
deleted file mode 100644
index 823817826d9..00000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.4.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0
-	)
-"
-RDEPEND="
-	!<sys-apps/s6-linux-utils-2.2.0.0
-	!static? (
-		>=dev-libs/skalibs-2.4.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-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)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild
deleted file mode 100644
index 791ce6855b6..00000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.5.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.0
-	>=sys-apps/s6-2.5.0.0
-	>=sys-apps/s6-linux-utils-2.3.0.0
-	>=sys-apps/s6-portable-utils-2.2.0.0
-	!static? (
-		>=dev-libs/skalibs-2.5.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-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)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild
deleted file mode 100644
index d94588ab510..00000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2
-	>=sys-apps/s6-2.6.1.0
-	>=sys-apps/s6-linux-utils-2.4.0.0
-	>=sys-apps/s6-portable-utils-2.2.1.1
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-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)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst()
-{
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2018-05-31 22:48 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2018-05-31 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     54a87e3337a489cb8254a36e643c0fbea3fda24e
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Fri Mar 30 03:25:17 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=54a87e33

sys-apps/s6-linux-init: 0.4.0.0 version bump

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-0.4.0.0.ebuild     | 62 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 424974a80e7..59d7487f0ef 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
+DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
new file mode 100644
index 00000000000..f1878d4e465
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.4.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4
+	>=sys-apps/s6-2.7.1.0
+	>=sys-apps/s6-linux-utils-2.4.0.2
+	>=sys-apps/s6-portable-utils-2.2.1.1
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+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)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2018-10-02 22:08 Michał Górny
  0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2018-10-02 22:08 UTC (permalink / raw
  To: gentoo-commits

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

sys-apps/s6-linux-init: Add proxy-maint to the maintainer list

Signed-off-by: Luis Ressel <aranea <AT> aixah.de>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

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

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 96c083c9b37..34f39bd4b28 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2019-06-22  7:52 Michał Górny
  0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2019-06-22  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     f9194e285b72c4ac50eb76c5bc60ec9f415e3fad
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Tue May 21 02:00:22 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 07:32:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9194e28

sys-apps/s6-linux-init: Version bump to 1.0.2.0

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

 sys-apps/s6-linux-init/Manifest                    |  1 +
 sys-apps/s6-linux-init/metadata.xml                |  3 ++
 .../s6-linux-init/s6-linux-init-1.0.2.0.ebuild     | 61 ++++++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 59d7487f0ef..3999b506f3e 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1,3 @@
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
+DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 34f39bd4b28..8035da6946e 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -17,4 +17,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="sysv-utils">Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown</flag>
+	</use>
 </pkgmetadata>

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
new file mode 100644
index 00000000000..6651fc87e2a
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
+	>=dev-libs/skalibs-2.8.1.0:=[static-libs?]
+	>=sys-apps/s6-2.8.0.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) \
+		--skeldir=/etc/s6-linux-init/skel \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2019-06-27 14:56 Michał Górny
  0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2019-06-27 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     92ad11511a9e3ac2c1930a3fcbda649cbda84e1b
Author:     Samuel Holland <samuel <AT> sholland <DOT> org>
AuthorDate: Sat Jun 22 15:21:53 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 14:51:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ad1151

sys-apps/s6-linux-init: Fix sysv-utils location and deps

Closes: https://bugs.gentoo.org/688456
Signed-off-by: Samuel Holland <samuel <AT> sholland.org>
Closes: https://github.com/gentoo/gentoo/pull/12305
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
index 6651fc87e2a..935ad1c8e6b 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
@@ -17,6 +17,10 @@ REQUIRED_USE="static? ( static-libs )"
 RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
 	>=dev-libs/skalibs-2.8.1.0:=[static-libs?]
 	>=sys-apps/s6-2.8.0.1:=[static-libs?]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -51,6 +55,7 @@ src_install() {
 
 	if use sysv-utils ; then
 		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
 		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
 	fi
 }


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2019-11-28 21:54 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2019-11-28 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     50ed84a1fe6873a418dc06083caec2c911fc0aeb
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 21:50:06 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 21:54:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ed84a1

sys-apps/s6-linux-init: 1.0.3.1 bump

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

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-1.0.3.1.ebuild     | 66 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 3999b506f3e..489e05faac8 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,4 @@
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
+DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
new file mode 100644
index 00000000000..e8370a33020
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+	>=sys-apps/s6-2.9.0.1:=[static-libs?]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+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) \
+		--skeldir=/etc/s6-linux-init/skel \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2020-05-16  7:09 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-05-16  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     8904701e8b07190ff71d3d8b5713b38bdf780963
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 07:03:47 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 16 07:03:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8904701e

sys-apps/s6-linux-init: remove p-m

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

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

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index e45befd4bc7..8c7e947d892 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>samuel@sholland.org</email>
-		<name>Samuel Holland</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown</flag>
 	</use>


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2020-07-15 12:30 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2020-07-15 12:30 UTC (permalink / raw
  To: gentoo-commits

commit:     431ebe6ebdb987884635aa9353508f4754d5d3d9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 12:28:11 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 12:30:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431ebe6e

sys-apps/s6-linux-init: arm keyworded (bug #705540)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
index e8370a33020..c68f5e1a426 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2020-10-11 17:49 William Hubbs
  0 siblings, 0 replies; 60+ messages in thread
From: William Hubbs @ 2020-10-11 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     50ac5eda2cd53baf765ce4702765e58183cb1292
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 16:48:25 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 17:48:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ac5eda

sys-apps/s6-linux-init: 1.0.4.2 bump

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

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-1.0.4.2.ebuild     | 66 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 489e05faac8..206b4994134 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -2,3 +2,4 @@ DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
 DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242
+DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
new file mode 100644
index 00000000000..fac1fd9f99a
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.6.1.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+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) \
+		--skeldir=/etc/s6-linux-init/skel \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2021-04-21 18:51 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-04-21 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     2a403b312da74ff860badb3bd5b44e0e1b2af499
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 07:10:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 18:49:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a403b31

sys-apps/s6-linux-init: fix function declaration style (braces)

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild | 5 ++---
 sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
index d94588ab510..fe8fbf9cdc5 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,8 +55,7 @@ src_configure() {
 		$(use_enable static static-libc)
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	einfo "The generated init script requires additional packages."
 	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
 }

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
index f1878d4e465..769ec2dd047 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,8 +55,7 @@ src_configure() {
 		$(use_enable static static-libc)
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	einfo "The generated init script requires additional packages."
 	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
 }


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-01-28  8:00 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-01-28  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e4770a68fdbede74d81ba312e71dbc53f419802d
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jan 24 08:14:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:59:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4770a68

sys-apps/s6-linux-init: add myself as a proxy maintainer

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

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

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 84bf60219ce0..1e5f91a033de 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -9,6 +9,14 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</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>
+	</maintainer>
 	<use>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown</flag>
 	</use>


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-01-28  8:00 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-01-28  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     65ecba12b92a5b1df43c97eccaa08813c7e3da2a
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jan 23 14:25:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:59:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ecba12

sys-apps/s6-linux-init: drop 0.3.1.1, 0.4.0.0, 1.0.2.0, 1.0.3.1

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

 sys-apps/s6-linux-init/Manifest                    |  4 --
 .../s6-linux-init/s6-linux-init-0.3.1.1.ebuild     | 61 --------------------
 .../s6-linux-init/s6-linux-init-0.4.0.0.ebuild     | 61 --------------------
 .../s6-linux-init/s6-linux-init-1.0.2.0.ebuild     | 66 ----------------------
 .../s6-linux-init/s6-linux-init-1.0.3.1.ebuild     | 66 ----------------------
 5 files changed, 258 deletions(-)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 206b49941341..521c16d3d02c 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,5 +1 @@
-DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
-DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
-DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
-DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242
 DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
deleted file mode 100644
index fe8fbf9cdc59..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2
-	>=sys-apps/s6-2.6.1.0
-	>=sys-apps/s6-linux-utils-2.4.0.0
-	>=sys-apps/s6-portable-utils-2.2.1.1
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-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)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst() {
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
deleted file mode 100644
index 769ec2dd047d..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.4.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.4.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.4
-	>=sys-apps/s6-2.7.1.0
-	>=sys-apps/s6-linux-utils-2.4.0.2
-	>=sys-apps/s6-portable-utils-2.2.1.1
-	!static? (
-		>=dev-libs/skalibs-2.6.4.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-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)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst() {
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
deleted file mode 100644
index 935ad1c8e6b1..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.8.1.0:=[static-libs?]
-	>=sys-apps/s6-2.8.0.1:=[static-libs?]
-	sysv-utils? (
-		!sys-apps/systemd[sysv-utils]
-		!sys-apps/sysvinit
-	)
-"
-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) \
-		--skeldir=/etc/s6-linux-init/skel \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use sysv-utils ; then
-		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
-		into /
-		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
-}

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
deleted file mode 100644
index c68f5e1a426b..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
-	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
-	>=sys-apps/s6-2.9.0.1:=[static-libs?]
-	sysv-utils? (
-		!sys-apps/systemd[sysv-utils]
-		!sys-apps/sysvinit
-	)
-"
-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) \
-		--skeldir=/etc/s6-linux-init/skel \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use sysv-utils ; then
-		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
-		into /
-		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-01-28  8:00 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-01-28  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     781ebb25b6348acedaafc64f75804fc6e4a87f2e
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jan 23 14:28:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:59:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781ebb25

sys-apps/s6-linux-init: respect AR, CC and RANLIB

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

 sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
index fac1fd9f99a1..05713a2616fc 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Generates an init binary for s6-based init systems"
 HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
@@ -32,9 +34,13 @@ src_prepare() {
 	# 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) \


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-01-28  8:00 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-01-28  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a3b3441098db053eedf2882c45fe9205814caacc
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jan 23 14:34:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:59:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b34410

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

-fno-stack-protector flag was removed from configure script in upstream
in version 1.0.6.0.

Upstream-commit: 5cda6f5fdc8f ("Don't put -fno-stack-protector in default CFLAGS")
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 521c16d3d02c..3d6e31c1b67b 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
+DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-03-10  9:48 Jakov Smolić
  0 siblings, 0 replies; 60+ messages in thread
From: Jakov Smolić @ 2022-03-10  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0571e3521af9af333f1a4dbe87e51865b4be778f
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 09:48:01 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 09:48:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0571e352

sys-apps/s6-linux-init: Stabilize 1.0.7.1 x86, #834437

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

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

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
index 2ce334d05831..13438c848234 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.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="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-03-11  8:31 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-03-11  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ed83c622ada4852db10d5c3d8ff544e090b118ce
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Mar  8 14:55:57 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=ed83c622

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

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/24452
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 3d6e31c1b67b..af604219ee6d 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1,3 @@
 DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
 DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
+DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-04-24  9:49 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-04-24  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a3cd9fec9e862c880214eae9e14bb9b52249f04d
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=a3cd9fec

sys-apps/s6-linux-init: Stabilize 1.0.7.1 amd64, #834437

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

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

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
index 13438c848234..305a8b7a163c 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.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="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-05-22  6:06 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-05-22  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fe789df20f2e2939502d4a0c2671542cc2a3fa3a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 06:05:31 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=fe789df2

sys-apps/s6-linux-init: Stabilize 1.0.7.3 x86, #846683

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

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

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
index cc9f4d58579e..01807f8d704e 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.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="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-05-22  6:06 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-05-22  6:06 UTC (permalink / raw
  To: gentoo-commits

commit:     59b87fc7a94f8643ffd7eab02e47ff05d94f04f4
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=59b87fc7

sys-apps/s6-linux-init: Stabilize 1.0.7.3 amd64, #846683

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

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

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
index 3d6d31aec21b..cc9f4d58579e 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.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="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-05-24  7:01 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-05-24  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bcbf1b6807abd3104a2d7571441e0cb18ea4e011
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri May 20 15:12:34 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=bcbf1b68

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

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

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

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index af604219ee6d..f76db8653e63 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,2 @@
-DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
 DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
deleted file mode 100644
index 63b8c46f64c7..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?]
-	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
-	<sys-apps/s6-2.10.0.0:=[execline,static-libs?]
-	sysv-utils? (
-		!sys-apps/systemd[sysv-utils]
-		!sys-apps/sysvinit
-	)
-"
-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) \
-		--skeldir=/etc/s6-linux-init/skel \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use sysv-utils ; then
-		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
-		into /
-		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-06-13 14:56 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-06-13 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     fabdca544d435e94b79f219fc6a822e5c0ce934b
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jun 12 19:56:18 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=fabdca54

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

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

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

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index f76db8653e63..36dedd33a95a 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1 @@
-DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-06-25  5:36 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-06-25  5:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a8948269150d9b8e1dbd06549a4b98bab8f3e4eb
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jun 16 10:46:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 05:35:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8948269

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

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

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

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 36dedd33a95a..95ec8e071fd8 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
+DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-06-25  5:36 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-06-25  5:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5215a121416234b309030e34673b47a6bc9ce6d4
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jun 16 13:41:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 05:35:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5215a121

sys-apps/s6-linux-init: drop IUSE="static static-libs"

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

 sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
index 4f9d522eb39b..134f021dac5e 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
@@ -12,13 +12,11 @@ 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 +sysv-utils"
+IUSE="+sysv-utils"
 
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="dev-lang/execline:=[static-libs?]
-	dev-libs/skalibs:=[static-libs?]
-	sys-apps/s6:=[execline,static-libs?]
+RDEPEND="dev-lang/execline:=
+	dev-libs/skalibs:=
+	sys-apps/s6:=[execline]
 	sysv-utils? (
 		!sys-apps/systemd[sysv-utils]
 		!sys-apps/sysvinit
@@ -50,9 +48,8 @@ src_configure() {
 		--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)
+		--disable-allstatic
+		--disable-static-libc
 	)
 
 	econf "${myconf[@]}"


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-08-02  5:40 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-08-02  5:40 UTC (permalink / raw
  To: gentoo-commits

commit:     76d3b8199f6fb39944e31e38f4644b6d1f1fe2c2
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=76d3b819

sys-apps/s6-linux-init: Stabilize 1.0.8.0 amd64, #862636

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-08-02  5:40 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-08-02  5:40 UTC (permalink / raw
  To: gentoo-commits

commit:     537840c44e45599c9f6c2e56b8c6d1e9b30e2acc
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=537840c4

sys-apps/s6-linux-init: Stabilize 1.0.8.0 x86, #862636

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-08-16 15:26 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-08-16 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     dfa810c5d023ab59bc3e7f58526381955bd2ddb6
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Aug 16 10:15:03 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=dfa810c5

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

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

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

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 95ec8e071fd8..7dfba1589d75 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,2 +1 @@
-DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-10-10 12:20 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-10-10 12:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2ab35c1fce98e426d0509e5643edd23ac5346703
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Sep 13 13:15:31 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 12:20:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab35c1f

sys-apps/s6-linux-init: add blocker with sys-apps/openrc

s6-linux-init cannot be installed together with sys-apps/openrc in the
same time when both set sysv-utils use flag as they both install same
files.

Bug: https://bugs.gentoo.org/867898
Suggested-by: Hoël Bézier <hoelbezier <AT> riseup.net>
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
index 036ee60e38ea..72efe07127e7 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
@@ -18,6 +18,7 @@ RDEPEND="dev-lang/execline:=
 	dev-libs/skalibs:=
 	sys-apps/s6:=[execline]
 	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
 		!sys-apps/systemd[sysv-utils]
 		!sys-apps/sysvinit
 	)


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2022-10-10 12:20 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-10-10 12:20 UTC (permalink / raw
  To: gentoo-commits

commit:     19f3b9f5987b850fef1ac6ad5270f5f7dadc3041
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 12:17:14 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 12:20:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f3b9f5

sys-apps/s6-linux-init: revbump due to RDEPEND change

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

 .../{s6-linux-init-1.0.8.0.ebuild => s6-linux-init-1.0.8.0-r1.ebuild}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild
similarity index 100%
rename from sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
rename to sys-apps/s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-01-17  1:53 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-01-17  1:53 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-01-17  1:53 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-01-17  1:53 UTC (permalink / raw
  To: gentoo-commits

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

sys-apps/s6-linux-init: 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-linux-init/metadata.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 1e5f91a033de..037cbc9ac75f 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/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" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
@@ -9,10 +13,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</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>


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-02-21  8:01 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-02-21  8:01 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-03-25  5:13 Arthur Zamarin
  0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-03-25  5:13 UTC (permalink / raw
  To: gentoo-commits

commit:     bc54d6e6a4ff50df8ee11d0cad51a5ea5079651e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 05:13:35 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 05:13:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc54d6e6

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-03-30  5:22 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-03-30  5:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4b900b2c416bc1a38e70f7fa6e02b336e17dcbb4
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=4b900b2c

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-04-15 12:23 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-04-15 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9e0faa5c48086b1daea802d27ac3d70d42c87067
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Apr  2 21:41:48 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=9e0faa5c

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-04-15 12:23 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-04-15 12:23 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-05-06  9:49 Arthur Zamarin
  0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-05-06  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     45cb77635c5c7217c49979f6831f83269a1d010d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 09:48:45 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 09:49:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cb7763

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-05-16  5:58 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-05-16  5:58 UTC (permalink / raw
  To: gentoo-commits

commit:     2d34d516c983116b8777829ed4ba782cd31459dd
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 05:56:29 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=2d34d516

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-05-16  5:58 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-05-16  5:58 UTC (permalink / raw
  To: gentoo-commits

commit:     cbbc5b1dba5fed44523fdae84e270cca089c5ca4
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:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbc5b1d

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-05-18  7:39 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-05-18  7:39 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-05-20 12:32 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-05-20 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     efb4ae2f39a42ff0f8e978db06cb85d81f580173
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sat May  6 14:53:30 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=efb4ae2f

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-06-19  5:55 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-06-19  5:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b05e3c2eb2a66b7ca6ae873cd316fb5c92c9c7ce
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 05:54:46 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 05:54:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b05e3c2e

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-06-19  5:55 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-06-19  5:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b4c0ffa53ae524b8d50569b8240be7261f6f1689
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 05:53:44 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 05:53:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c0ffa5

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-07-15  8:01 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-07-15  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1861b352e5e3bb4b017800bf43fb78497bc8526a
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sat Jul 15 07:44:58 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=1861b352

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-11-17 11:09 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-11-17 11:09 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-11-17 11:09 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-11-17 11:09 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-11-20 10:06 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-11-20 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     51ac9080a9f303fd1e6e32760f24bb80f528df77
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Nov 18 18:46:45 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=51ac9080

sys-apps/s6-linux-init: Keyword 1.1.2.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-linux-init/s6-linux-init-1.1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-12-05 15:08 Petr Vaněk
  0 siblings, 0 replies; 60+ messages in thread
From: Petr Vaněk @ 2023-12-05 15:08 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-12-05 15:08 Petr Vaněk
  0 siblings, 0 replies; 60+ messages in thread
From: Petr Vaněk @ 2023-12-05 15:08 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-12-20 12:43 Petr Vaněk
  0 siblings, 0 replies; 60+ messages in thread
From: Petr Vaněk @ 2023-12-20 12:43 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-12-21  6:12 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-12-21  6:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f4a61f1e552202912e58ef91c893537ffdca00fb
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=f4a61f1e

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2023-12-21  6:12 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-12-21  6:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3d86da8c665563a571eaf8cbcebab9b77c501098
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=3d86da8c

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2024-01-17  2:46 Ionen Wolkens
  0 siblings, 0 replies; 60+ messages in thread
From: Ionen Wolkens @ 2024-01-17  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     9d56f25ddff2521c15f3113f4042c255b0978ad0
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:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d56f25d

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

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2024-01-17 10:39 Petr Vaněk
  0 siblings, 0 replies; 60+ messages in thread
From: Petr Vaněk @ 2024-01-17 10:39 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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


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

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/
@ 2024-10-24  9:39 Petr Vaněk
  0 siblings, 0 replies; 60+ messages in thread
From: Petr Vaněk @ 2024-10-24  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     70faac383c13e49dd938cdd468c9cda1acd04a20
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 08:59:57 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 09:38:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70faac38

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

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

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-1.1.2.1.ebuild     | 79 ++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 24a3f01450a8..5ef6ed0249d1 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e SHA512 76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786
+DIST s6-linux-init-1.1.2.1.tar.gz 61073 BLAKE2B ae5d71b3817ef8b2c09d06fb34a8b170a3d63ffd31333bc136f320d31bdcca093915d9711ea018caab85cef0677ef98cd75101671f9a4d72eaba92cbb22c38a8 SHA512 343b6a9bdcf3b1abb544409bb2d7a6c8a1dbcb07d1b941ae74e8800e48ad605c6427f724d7692569b3ade4829948d0e57024c764c18a60c3bb2eb2efefedb622

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


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

end of thread, other threads:[~2024-10-24  9:39 UTC | newest]

Thread overview: 60+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-16  7:09 [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-10-24  9:39 Petr Vaněk
2024-01-17 10:39 Petr Vaněk
2024-01-17  2:46 Ionen Wolkens
2023-12-21  6:12 Joonas Niilola
2023-12-21  6:12 Joonas Niilola
2023-12-20 12:43 Petr Vaněk
2023-12-05 15:08 Petr Vaněk
2023-12-05 15:08 Petr Vaněk
2023-11-20 10:06 Sam James
2023-11-17 11:09 Sam James
2023-11-17 11:09 Sam James
2023-07-15  8:01 Joonas Niilola
2023-06-19  5:55 Joonas Niilola
2023-06-19  5:55 Joonas Niilola
2023-05-20 12:32 Joonas Niilola
2023-05-18  7:39 Joonas Niilola
2023-05-16  5:58 Joonas Niilola
2023-05-16  5:58 Joonas Niilola
2023-05-06  9:49 Arthur Zamarin
2023-04-15 12:23 Joonas Niilola
2023-04-15 12:23 Joonas Niilola
2023-03-30  5:22 Joonas Niilola
2023-03-25  5:13 Arthur Zamarin
2023-02-21  8:01 Sam James
2023-01-17  1:53 Sam James
2023-01-17  1:53 Sam James
2022-10-10 12:20 Joonas Niilola
2022-10-10 12:20 Joonas Niilola
2022-08-16 15:26 Joonas Niilola
2022-08-02  5:40 Joonas Niilola
2022-08-02  5:40 Joonas Niilola
2022-06-25  5:36 Sam James
2022-06-25  5:36 Sam James
2022-06-13 14:56 Joonas Niilola
2022-05-24  7:01 Joonas Niilola
2022-05-22  6:06 Joonas Niilola
2022-05-22  6:06 Joonas Niilola
2022-04-24  9:49 Joonas Niilola
2022-03-11  8:31 Joonas Niilola
2022-03-10  9:48 Jakov Smolić
2022-01-28  8:00 Sam James
2022-01-28  8:00 Sam James
2022-01-28  8:00 Sam James
2022-01-28  8:00 Sam James
2021-04-21 18:51 Sam James
2020-10-11 17:49 William Hubbs
2020-07-15 12:30 Sam James
2019-11-28 21:54 William Hubbs
2019-06-27 14:56 Michał Górny
2019-06-22  7:52 Michał Górny
2018-10-02 22:08 Michał Górny
2018-05-31 22:48 William Hubbs
2018-03-29 13:25 William Hubbs
2017-11-15 20:15 William Hubbs
2017-10-03 18:47 William Hubbs
2017-04-26 21:29 William Hubbs
2017-01-11 23:43 William Hubbs
2016-06-29 17:45 William Hubbs
2016-03-19 23:45 William Hubbs

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